From e6d5b88ce459fe8414aa7a96678820cc0246326c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 01 三月 2024 16:19:30 +0800
Subject: [PATCH] Merge branch 'wxw'
---
HTML/views/ASNSetting/ArrivalNoticeDetail.html | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index ea64c3a..068f453 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -63,7 +63,7 @@
</select>
</div>
- <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">瀹㈡埛鍚嶇О</p></label>
+ <label class="layui-form-label" style="width: 70px;"><p id="CustomerNamep">瀹㈡埛</p></label>
<div class="layui-input-inline">
<select name="CustomerName" id="CustomerName" lay-verify="" lay-search>
<option value=""></option>
@@ -116,7 +116,15 @@
</script>
<script type="text/html" id="table-content-list">
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> <i class="layui-icon layui-icon-delete"></i>鍒犻櫎</a>
- </script>
+ </script>
+ <script type="text/html" id="table-content-Packlist">
+ {{#
+ function GetPack(d){
+ return d.PackagNo + '-' + d.PackagName;
+ }
+ }}
+ {{ GetPack(d) }}
+ </script>
</div>
</div>
</div>
@@ -161,7 +169,7 @@
{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 70},
{field: 'Standard',title: '瑙勬牸',width: 160,align: 'center'},
{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',edit: 'text',width: 160},
- {field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160},
+ {field: 'PackagNo',title: '鍖呰鍚嶇О',width: 160, templet: "#table-content-Packlist"},
{field: 'Price',title: '鍗曚环',align: 'center',width: 80},
{field: 'Money',title: '閲戦',align: 'center',width: 100},
{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',edit: 'text',width: 140},
@@ -558,6 +566,19 @@
});
return;
}
+ var type= $("#Type").val();
+ if(type=='6'){
+ var customerName=$("#CustomerName").val();
+ if(customerName==''){
+ layer.msg("浠ｅ偍鍗曟嵁璇烽�夋嫨璐т富锛�", {
+ icon: 2,
+ time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ }, function () {
+
+ });
+ return;
+ }
+ }
SetArrivalNotice();
});
@@ -629,7 +650,7 @@
{
if (res.data[i].Type == 0)
{
- $("#CustomerNamep").html("瀹㈡埛閫夋嫨");
+ $("#CustomerNamep").html("瀹㈡埛");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
res.data[i].CustomerName + '</option>');
}
@@ -638,7 +659,7 @@
{
if (res.data[i].Type == 1)
{
- $("#CustomerNamep").html("渚涘簲鍟嗛�夋嫨");
+ $("#CustomerNamep").html("渚涘簲鍟�");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
res.data[i].CustomerName + '</option>');
}
@@ -647,7 +668,7 @@
{
if (res.data[i].Type == 2)
{
- $("#CustomerNamep").html("璐т富閫夋嫨");
+ $("#CustomerNamep").html("璐т富");
$("#CustomerName").append('<option value =' + res.data[i].CustomerNo + '>' +
res.data[i].CustomerName + '</option>');
}
@@ -681,12 +702,14 @@
}
arr.push(data[i]); //灞炴��
}
+
$.extend(infoOptions, {
data: arr
});
infoOptions.page = {
curr: 1
}
+ console.log(infoOptions)
table.render(infoOptions);
}
--
Gitblit v1.8.0