From c77b53b6abb018cd4a9653e64d213e7caed4b8b4 Mon Sep 17 00:00:00 2001
From: DESKTOP-9BNTV8O <DESKTOP-9BNTV8O@163.com>
Date: 星期五, 13 十二月 2024 10:32:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/JC23WMS-2

---
 HTML/views/ASNSetting/ArrivalNotice.html |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNotice.html b/HTML/views/ASNSetting/ArrivalNotice.html
index 9013e63..7171368 100644
--- a/HTML/views/ASNSetting/ArrivalNotice.html
+++ b/HTML/views/ASNSetting/ArrivalNotice.html
@@ -309,11 +309,11 @@
 					</div>
 					<!-- #endregion -->
 
-					<!-- <script type="text/html" id="toolbarDemo">
+					<script type="text/html" id="toolbarDemo">
 						<button style="margin-right: 5px;" class="layui-btn layui-btn-sm layuiadmin-btn-list addClass" lay-event="add" >
 							<i class="layui-icon">&#xe654;</i>娣诲姞
 						</button>
-					</script> -->
+					</script>
  
 					<script type="text/html" id="toolbarDemoList">
 						{{# function GetBtn2(d){ 
@@ -546,18 +546,18 @@
 						{field: 'CompleteTime',title: '瀹屾垚鏃堕棿',align: 'center', width: 160,templet: '#templetCompleteTime2'},
 						{field: 'IsSampling',title: '鏄惁鍙栨牱',align: 'center',width: 90,templet: '#templetIsSampling'},
 						{field: 'InspectStatus',title: '璐ㄦ鐘舵��',align: 'center',width: 90,templet: '#templetInspectStatus'},
-						{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
+						//{field: 'UnitName',title: '璁￠噺鍗曚綅',align: 'center',width: 90},
 						// {field: 'Price',title: '鍗曚环',align: 'center',width: 65},
 						// {field: 'Money',title: '閲戦',align: 'center',width: 65},
 						{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 120},
-						{field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,}, 
-						{field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150}, 
-						{field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
-						{field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140}, 
-						{field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140}, 
-						{field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140}, 
-						{field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140}, 
-						{field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'}, 
+						// {field: 'PackagName',title: '鍖呰鍚嶇О',align: 'center',width: 110,}, 
+						// {field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',width: 150}, 
+						// {field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',width: 150},
+						// {field: 'UDF1',title: '鑷畾涔夊垪1',align: 'center',width: 140}, 
+						// {field: 'UDF2',title: '鑷畾涔夊垪2',align: 'center',width: 140}, 
+						// {field: 'UDF3',title: '鑷畾涔夊垪3',align: 'center',width: 140}, 
+						// {field: 'UDF4',title: '鑷畾涔夊垪4',align: 'center',width: 140}, 
+						// {field: 'UDF5',title: '鑷畾涔夊垪5',align: 'center',width: 140,templet:'#templetUDF5'}, 
 						{field: 'CreateUserName',title: '鍒涘缓浜�',align: 'center',width: 100},
 						{field: 'CreateTime',title: '鍒涘缓鏃堕棿',align: 'center',width: 160,templet: '#templetCreateTime2'},
 						{field: 'UpdateUserName',title: '淇敼浜�',align: 'center',width: 150,},

--
Gitblit v1.8.0