From 2045b7d31aa63e97d820c72c21cf145adb58960c Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 16 一月 2025 13:11:29 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms

---
 HTML/views/SOSetting/ExportAllot.html |  549 +++++++++++++-----------------------------------------
 1 files changed, 131 insertions(+), 418 deletions(-)

diff --git a/HTML/views/SOSetting/ExportAllot.html b/HTML/views/SOSetting/ExportAllot.html
index 3e3fd25..5c4fe6a 100644
--- a/HTML/views/SOSetting/ExportAllot.html
+++ b/HTML/views/SOSetting/ExportAllot.html
@@ -13,13 +13,13 @@
 
 	<script>
 		// 杩欓噷鏄渶瑕佸湪椤甸潰娓叉煋涔嬪墠鎵ц鐨勪唬鐮�
-		document.addEventListener("DOMContentLoaded", function() {			
+		document.addEventListener("DOMContentLoaded", function () {
 			//鑾峰彇table榛樿鏄剧ず鏁�
 			pageCntFirst();
 			//鍒ゆ柇鏄惁寮�鍚痶able鍒楄〃鍒楀璋冩暣鍔熻兘銆�
 			GetIsSetColW();
 		});
-	  </script>
+	</script>
 	<link rel="stylesheet" href="../../css/public.css" media="all">
 </head>
 
@@ -66,9 +66,9 @@
 						</div>
 					</div>
 					<div class="layui-inline">
-						<label class="layui-form-label" style="width: 60px;">鎵规鍙�</label>
+						<label class="layui-form-label" style="width: 60px;">杩涘巶缂栧彿</label>
 						<div class="layui-input-inline">
-							<input type="text" id="LotNo" name="LotNo" placeholder="鎵规鍙�" autocomplete="off"
+							<input type="text" id="LotNo" name="LotNo" placeholder="杩涘巶缂栧彿" autocomplete="off"
 								class="layui-input">
 						</div>
 					</div>
@@ -217,7 +217,13 @@
 										}}
 										{{ GetBtn7(d) }}
 									</script>
-
+									<script type="text/html" id="templetUpdateTime">
+										{{# function GetBtn71(d){
+												return formatDate(d.UpdateTime);
+											}	
+										}}
+										{{ GetBtn71(d) }}
+									</script>
 									<script type="text/html" id="templetUnstackingMode">
 										{{# function GetBtn8(d){
 												switch (d.UnstackingMode) {
@@ -232,16 +238,17 @@
 										}}
 										{{ GetBtn8(d) }}
 									</script>
-									
+
 									<!-- #endregion -->
-								</div>								
+								</div>
 							</div>
 							<div class="layui-tab-item">
 								<div class="position-relative"><!-- class="position-relative" --><!-- 鑷畾涔夎〃澶村姞涓� -->
 									<table id="LAY-app-content-list2" lay-filter="LAY-app-content-list2"></table>
 									<!-- #region 鑷畾涔夎〃澶� -->
 									<div class="headerSetIcon">
-										<button class="layui-btn layui-btn-primary layui-btn-sm" data-type="customCols2">
+										<button class="layui-btn layui-btn-primary layui-btn-sm"
+											data-type="customCols2">
 											<i class="layui-icon">&#xe610;</i>
 										</button>
 									</div>
@@ -256,7 +263,7 @@
 										{{ GetBtn8(d) }}
 									</script>
 									<!-- #endregion -->
-								</div>								
+								</div>
 							</div>
 						</div>
 					</div>
@@ -277,7 +284,7 @@
 				<script type="text/html" id="table-content-list2">
 					{{# function GetBtn2(d){
 							var html = '';
-							if(d.SkuNo != "100099"){
+							if(d.SkuNo != "100099" && d.BoxNo != ''){
 								html =`<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="sel"> 
 									<i class="layui-icon layui-icon-edit"></i>璇︽儏</a>`;
 							} 
@@ -308,7 +315,7 @@
 				laydate = layui.laydate;
 			var $ = layui.$;
 			var h1 = GetTableTabHeight();
-			
+
 			// var h1 = GetTableTopHeight();
 			// var h2 = GetTableBottomHeight(); 
 			// laydate.render({
@@ -326,235 +333,47 @@
 			//娓叉煋鍑哄簱鍒嗛厤table
 			//#region 鑷畾涔夎〃澶�
 			var TotalColsArr = [[
-						{field: '',title: '搴忓彿',type:'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true},
-						{field: 'SONo',title: '鍑哄簱鍗曞彿',align: 'center',fixed: 'left',width: 180,"disabled": true}, 
-						{field: 'WaveNo',title: '娉㈡鍗曞彿',align: 'center',width: 180}, 
-						{field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 95,}, 
-						{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',minWidth: 120}, 
-						{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center',width: 150}, 
-						{field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 125}, 
-						{field: 'Status',align: 'center',title: '鐘舵��',width: 90,templet: '#templetStatus'},
-						{field: 'Qty',title: '鍑哄簱鏁伴噺',align: 'center',width: 90,}, 
-						{field: 'CompleteQty',title: '鎷h揣鏁伴噺',align: 'center',width: 90}, 
-						{field: 'UnstackingMode',title: '鎷嗗灈鏂瑰紡',align: 'center',width: 90,templet: '#templetUnstackingMode'}, 
-						{field: 'OutMode',title: '鍑哄簱鍙�',align: 'center',width: 90,templet: '#outType',}, 
-						{field: 'LoadingAddre',title: '瑁呰溅鍙�',align: 'center',width: 90,templet: '#outType',}, 
-						{field: 'IsAdvance',title: '鎷h揣绫诲瀷',align: 'center',width: 90,templet: '#templetIsAdvance'}, 
-						{field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 110}, 
-						{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150}, 
-						{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',minWidth: 120,}, 
-						{field: 'IsBale',title: '鏄惁瑁瑰寘',align: 'center',templet: '#templetIsBale',width: 90}, 
-						{field: 'IsBelt',title: '鏄惁鎵撳甫',align: 'center',templet: '#templetIsBelt',width: 90}, 
-						{field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 160,templet: '#templetCreateTime'}, 
-						{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'center',toolbar: '#table-content-list', "disabled": true}
-					]];
-			var TotalColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+				{ field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true },
+				{ field: 'WaveNo', title: '娉㈡鍗曞彿', align: 'center', width: 180 },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95, },
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', minWidth: 120 },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center', width: 150 },
+				{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', width: 125 },
+				{ field: 'Status', align: 'center', title: '鐘舵��', width: 90, templet: '#templetStatus' },
+				{ field: 'Qty', title: '鍑哄簱鏁伴噺', align: 'center', width: 90, },
+				{ field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 90 },
+				{ field: 'UnstackingMode', title: '鎷嗗灈鏂瑰紡', align: 'center', width: 90, templet: '#templetUnstackingMode' },
+				{ field: 'OutMode', title: '鍑哄簱鍙�', align: 'center', width: 90, templet: '#outType', },
+				{ field: 'LoadingAddre', title: '瑁呰溅鍙�', align: 'center', width: 90, templet: '#outType', },
+				{ field: 'IsAdvance', title: '鎷h揣绫诲瀷', align: 'center', width: 90, templet: '#templetIsAdvance' },
+				{ field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', align: 'center', width: 110 },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150 },
+				{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', minWidth: 120, },
+				{ field: 'IsBale', title: '鏄惁瑁瑰寘', align: 'center', templet: '#templetIsBale', width: 90 },
+				{ field: 'IsBelt', title: '鏄惁鎵撳甫', align: 'center', templet: '#templetIsBelt', width: 90 },
+				{ field: 'CreateTime', align: 'center', title: '鍒涘缓鏃堕棿', width: 160, templet: '#templetCreateTime' },
+				{ field: 'UpdateTime', align: 'center', title: '瀹屾垚鏃堕棿', width: 160, templet: '#templetUpdateTime' },
+				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', toolbar: '#table-content-list', "disabled": true }
+			]];
+			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
 			//#endregion
 			function refreshTable() {
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// var param = {
-				// 	SoNo: $("#SoNo").val(),
-				// 	// WaveNo:$("#WaveNo").val(),
-				// 	PalletNo: $("#PalletNo").val(),
-				// 	SkuNo: $("#SkuNo").val(),
-				// 	SkuName: $("#SkuName").val(),
-				// 	LotNo: $("#LotNo").val(),
-				// 	Status: $("#Status").val(),
-				// 	BoxNo: $("#BoxNo").val(),
-				// };
-
-				// table.render({
-				// 	elem: '#LAY-app-content-list',
-				// 	url: IP + "/BllSo/GetExportAllotList",
-				// 	method: 'POST',
-				// 	height: 'full-206',
-				// 	id: 'LAY-app-content-list',
-				// 	where: param,
-				// 	contentType: 'application/json',
-				// 	headers: { ToKen: $.cookie('token') },
-				// 	page: true,
-				// 	limit: pageCnt,
-				// 	limits: pageLimits,
-				// 	cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				// 	done: function(){ 
-				// 		initMenu();
-				// 	}, 
-				// 	cols: [
-				// 		[{
-				// 			title: '搴忓彿',
-				// 			type: 'numbers',
-				// 			width: 60,
-				// 			fixed: 'left'
-				// 		}, {
-				// 			field: 'SONo',
-				// 			title: '鍑哄簱鍗曞彿',
-				// 			align: 'center',
-				// 			fixed: 'left',
-				// 			width: 180,
-				// 		}, {
-				// 			field: 'WaveNo',
-				// 			title: '娉㈡鍗曞彿',
-				// 			align: 'center',
-				// 			width: 180,
-				// 			hide: true
-				// 		}, {
-				// 			field: 'PalletNo',
-				// 			title: '鎵樼洏鍙�',
-				// 			align: 'center',
-				// 			width: 95,
-				// 		}, {
-				// 			field: 'SkuNo',
-				// 			title: '鐗╂枡缂栫爜',
-				// 			align: 'center',
-				// 			minWidth: 120,
-				// 		}, {
-				// 			field: 'SkuName',
-				// 			title: '鐗╂枡鍚嶇О',
-				// 			align: 'center',
-				// 			width: 150,
-				// 		}, {
-				// 			field: 'LotNo',
-				// 			title: '鎵规鍙�',
-				// 			align: 'center',
-				// 			width: 125,
-				// 		}, {
-				// 			field: 'Status',
-				// 			align: 'center',
-				// 			title: '鐘舵��',
-				// 			width: 90,
-				// 			templet: function (d) {
-				// 				switch (d.Status) {
-				// 					case "0":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-xs">寰呬笅鍙�</button>`;
-				// 					case "1":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">浠诲姟涓嬪彂</button>`;
-				// 					case "2":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-normal layui-btn-xs">寰呮嫞璐�</button>`;
-				// 					case "3":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">閮ㄥ垎鎷h揣</button>`;
-				// 					case "4":
-				// 						// return `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寰呭洖搴�</button>`;
-				// 					case "5":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">宸插畬鎴�</button>`;
-				// 					case "6":
-				// 						return `<button class="layui-btn layui-btn-radius layui-btn-danger layui-btn-xs">寮傚父鍙栨秷</button>`;
-				// 					default:
-				// 						return "";
-				// 				}
-				// 			},
-				// 		}, {
-				// 			field: 'Qty',
-				// 			title: '鍑哄簱鏁伴噺',
-				// 			align: 'center',
-				// 			width: 90,
-				// 		}, {
-				// 			field: 'CompleteQty',
-				// 			title: '鎷h揣鏁伴噺',
-				// 			align: 'center',
-				// 			width: 90,
-				// 		}, {
-				// 			field: 'OutMode',
-				// 			title: '鍑哄簱鍙�',
-				// 			align: 'center',
-				// 			width: 90,
-				// 			templet: '#outType',
-				// 		}, {
-				// 			field: 'IsAdvance',
-				// 			title: '鎷h揣绫诲瀷',
-				// 			align: 'center',
-				// 			width: 90,
-				// 			templet: function (d) {
-				// 				switch (d.IsAdvance) {
-				// 					case "0":
-				// 						return "鍑哄簱";
-				// 					case "1":
-				// 						return "棰勬嫞";
-				// 					default:
-				// 						return "";
-				// 				}
-				// 			},
-				// 		}, {
-				// 			field: 'SupplierLot',
-				// 			title: '渚涜揣鎵规',
-				// 			align: 'center',
-				// 			width: 110,
-				// 		}, {
-				// 			field: 'LotText',
-				// 			title: '鎵规鎻忚堪',
-				// 			align: 'center',
-				// 			width: 150,
-				// 		}, {
-				// 			field: 'Standard',
-				// 			title: '鐗╂枡瑙勬牸',
-				// 			align: 'center',
-				// 			minWidth: 120,
-				// 		}, {
-				// 			field: 'IsBale',
-				// 			title: '鏄惁瑁瑰寘',
-				// 			align: 'center',
-				// 			templet: function (d) {
-				// 				switch (d.IsBale) {
-				// 					case "0":
-				// 						return "涓嶈9鍖�";
-				// 					case "1":
-				// 						return "瑁瑰寘";
-				// 					default:
-				// 						return "";
-				// 				}
-
-				// 			},
-				// 			width: 90,
-				// 			hide: true,
-				// 		}, {
-				// 			field: 'IsBelt',
-				// 			title: '鏄惁鎵撳甫',
-				// 			align: 'center',
-				// 			templet: function (d) {
-				// 				switch (d.IsBelt) {
-				// 					case "0":
-				// 						return "涓嶆墦甯�";
-				// 					case "1":
-				// 						return "鎵撳甫";
-				// 					default:
-				// 						return "";
-				// 				}
-
-				// 			},
-				// 			width: 90,
-				// 			hide: true,
-				// 		}, {
-				// 			field: 'CreateTime',
-				// 			align: 'center',
-				// 			title: '鍒涘缓鏃堕棿',
-				// 			width: 160,
-				// 			templet: function (d) {
-				// 				return formatDate(d.CreateTime);
-				// 			},
-				// 		}, {
-				// 			title: '鎿嶄綔',
-				// 			fixed: 'right',
-				// 			width: 100,
-				// 			align: 'center',
-				// 			toolbar: '#table-content-list'
-				// 		}]
-				// 	]
-				// });
-				//#endregion
-
+				
 				//#region 鑷畾涔夎〃澶�
 				var colsJson
-				var param1={
-					Href:'BllSo/GetExportAllotList'
+				var param1 = {
+					Href: 'BllSo/GetExportAllotList'
 				};
-				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
-					if (res.code == 0){							
-						if(res.data=='' || res.data==undefined || res.data==null){
-							colsJson=TotalColsArr
-						}else{
-							colsJson= eval(res.data);
+				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+					if (res.code == 0) {
+						if (res.data == '' || res.data == undefined || res.data == null) {
+							colsJson = TotalColsArr
+						} else {
+							colsJson = eval(res.data);
 						}
-					}else{
-						colsJson=TotalColsArr
+					} else {
+						colsJson = TotalColsArr
 					}
 					var param = {
 						SoNo: $("#SoNo").val(),
@@ -579,11 +398,11 @@
 						limit: pageCnt,
 						limits: pageLimits,
 						cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-						done: function(){ 
+						done: function () {
 							initMenu();
 							//鑷畾涔夊垪瀹�
-							SetTableColW('LAY-app-content-list','BllSo/GetExportAllotList',TotalColsSysArr);
-						}, 
+							SetTableColW('LAY-app-content-list', 'BllSo/GetExportAllotList', TotalColsSysArr);
+						},
 						cols: colsJson
 					});
 				});
@@ -593,159 +412,46 @@
 			//娓叉煋鎷h揣鏄庣粏table
 			//#region 鑷畾涔夎〃澶�
 			var DetailColsArr = [[
-						{field: '',title: '搴忓彿',type:'numbers',width: 60,align: 'center',fixed: 'left', "disabled": true},
-						{field: 'SONo',title: '鍑哄簱鍗曞彿',align: 'center',fixed: 'left',width: 180, "disabled": true}, 
-						{field: 'PalletNo',title: '鎵樼洏鍙�',align: 'center',width: 95}, 
-						{field: 'BoxNo',title: '绠卞彿',align: 'center',width: 220}, 
-						//{field: 'BoxNo2',title: '鐩掑彿',align: 'center',width: 115}, 
-						//{field: 'BoxNo3',title: '鏀彿',align: 'center',width: 115}, 
-						{field: 'SkuNo',title: '鐗╂枡缂栫爜',align: 'center',width: 120,}, 
-						{field: 'SkuName',title: '鐗╂枡鍚嶇О',align: 'center'}, 
-						{field: 'LotNo',title: '鎵规鍙�',align: 'center',width: 125,}, 
-						{field: 'CompleteQty',title: '鎷h揣鏁伴噺',align: 'center',width: 90,}, 
-						{field: 'NowPalletNo',title: '鏂版墭鐩�',align: 'center',width: 95,}, 
-						{field: 'LotText',title: '鎵规鎻忚堪',align: 'center',width: 150,}, 
-						{field: 'SupplierLot',title: '渚涜揣鎵规',align: 'center',width: 110,},
-						{field: 'Standard',title: '鐗╂枡瑙勬牸',align: 'center',width: 120,}, 
-						//{field: 'CreateTime',align: 'center',title: '鍒涘缓鏃堕棿',width: 165,templet: '#templetCreateTime2'}, 
-						{field: 'caozuo',title: '鎿嶄綔',fixed: 'right',width: 100,align: 'left',toolbar: '#table-content-list2', "disabled": true}
-					]];
-			var DetailColsSysArr=encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
+				{ field: '', title: '搴忓彿', type: 'numbers', width: 60, align: 'center', fixed: 'left', "disabled": true },
+				{ field: 'SONo', title: '鍑哄簱鍗曞彿', align: 'center', fixed: 'left', width: 180, "disabled": true },
+				{ field: 'PalletNo', title: '鎵樼洏鍙�', align: 'center', width: 95 },
+				{ field: 'BoxNo', title: '绠卞彿', align: 'center', width: 220 },
+				//{field: 'BoxNo2',title: '鐩掑彿',align: 'center',width: 115}, 
+				//{field: 'BoxNo3',title: '鏀彿',align: 'center',width: 115}, 
+				{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 120, },
+				{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
+				{ field: 'LotNo', title: '杩涘巶缂栧彿', align: 'center', width: 125, },
+				{ field: 'CompleteQty', title: '鎷h揣鏁伴噺', align: 'center', width: 90, },
+				{ field: 'NowPalletNo', title: '鏂版墭鐩�', align: 'center', width: 95, },
+				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
+				{ field: 'SupplierLot', title: '鍘熷巶鎵瑰彿', align: 'center', width: 110, },
+				{ field: 'Standard', title: '鐗╂枡瑙勬牸', align: 'center', width: 120, },
+				//{field: 'CreateTime',align: 'center',title: '鎷h揣鏃堕棿',width: 165,templet: '#templetCreateTime2'}, 
+				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'left', toolbar: '#table-content-list2', "disabled": true }
+			]];
+			var DetailColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(DetailColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
 			//#endregion
 			function refreshTablemx(val) {
-				//#region 鍘熷闈炶嚜瀹氫箟鍒�
-				// var param = {
-				// 	Id: parseInt(val)
-				// };
-
-				// table.render({
-				// 	elem: '#LAY-app-content-list2',
-				// 	url: IP + "/BllSo/GetCompleteDetailList",
-				// 	method: 'POST',
-				// 	height: 'full-206',
-				// 	id: 'LAY-app-content-list2',
-				// 	where: param,
-				// 	contentType: 'application/json',
-				// 	headers: { ToKen: $.cookie('token') },
-				// 	page: true,
-				// 	limit: pageCnt,
-				// 	limits: pageLimits,
-				// 	cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-				// 	done: function(){ 
-				// 		initMenu();
-				// 	}, 
-				// 	cols: [
-				// 		[{
-				// 			title: '搴忓彿',
-				// 			type: 'numbers',
-				// 			width: 60,
-				// 			fixed: 'left'
-				// 		}, {
-				// 			field: 'SONo',
-				// 			title: '鍑哄簱鍗曞彿',
-				// 			align: 'center',
-				// 			fixed: 'left',
-				// 			width: 180,
-				// 		}, {
-				// 			field: 'PalletNo',
-				// 			title: '鎵樼洏鍙�',
-				// 			align: 'center',
-				// 			width: 95,
-				// 		}, {
-				// 			field: 'BoxNo',
-				// 			title: '绠卞彿',
-				// 			align: 'center',
-				// 			width: 220,
-				// 		}, {
-				// 			field: 'BoxNo2',
-				// 			title: '鐩掑彿',
-				// 			align: 'center',
-				// 			width: 115,
-				// 			hide: true,
-				// 		}, {
-				// 			field: 'BoxNo3',
-				// 			title: '鏀彿',
-				// 			align: 'center',
-				// 			width: 115,
-				// 			hide: true,
-				// 		}, {
-				// 			field: 'SkuNo',
-				// 			title: '鐗╂枡缂栫爜',
-				// 			align: 'center',
-				// 			width: 120,
-				// 		}, {
-				// 			field: 'SkuName',
-				// 			title: '鐗╂枡鍚嶇О',
-				// 			align: 'center',
-				// 		}, {
-				// 			field: 'LotNo',
-				// 			title: '鎵规鍙�',
-				// 			align: 'center',
-				// 			width: 125,
-				// 		}, {
-				// 			field: 'CompleteQty',
-				// 			title: '鎷h揣鏁伴噺',
-				// 			align: 'center',
-				// 			width: 90,
-				// 		}, {
-				// 			field: 'NowPalletNo',
-				// 			title: '鏂版墭鐩�',
-				// 			align: 'center',
-				// 			width: 95,
-				// 		}, {
-				// 			field: 'LotText',
-				// 			title: '鎵规鎻忚堪',
-				// 			align: 'center',
-				// 			width: 150,
-				// 		}, {
-				// 			field: 'SupplierLot',
-				// 			title: '渚涜揣鎵规',
-				// 			align: 'center',
-				// 			width: 110,
-				// 		}, {
-				// 			field: 'Standard',
-				// 			title: '鐗╂枡瑙勬牸',
-				// 			align: 'center',
-				// 			width: 120,
-				// 		}, {
-				// 			field: 'CreateTime',
-				// 			align: 'center',
-				// 			title: '鍒涘缓鏃堕棿',
-				// 			width: 165,
-				// 			templet: function (d) {
-				// 				return formatDate(d.CreateTime);
-				// 			},
-				// 			hide: true,
-				// 		}, {
-				// 			title: '鎿嶄綔',
-				// 			fixed: 'right',
-				// 			width: 90,
-				// 			align: 'center',
-				// 			toolbar: '#table-content-list2'
-				// 		}]
-				// 	]
-				// });
-				//#endregion
-
+				
 				//#region 鑷畾涔夎〃澶�
 				var colsJson2
-				var param1={
-					Href:'BllSo/GetCompleteDetailList'
+				var param1 = {
+					Href: 'BllSo/GetCompleteDetailList'
 				};
-				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function(res) {
-				if (res.code == 0){							
-					if(res.data=='' || res.data==undefined || res.data==null){
-						colsJson2=DetailColsArr
-					}else{
-						colsJson2= eval(res.data);
+				sendData(IP + "/Sys/GetTableColsByUserId", param1, 'post', function (res) {
+					if (res.code == 0) {
+						if (res.data == '' || res.data == undefined || res.data == null) {
+							colsJson2 = DetailColsArr
+						} else {
+							colsJson2 = eval(res.data);
+						}
+					} else {
+						colsJson2 = DetailColsArr
 					}
-				}else{
-						colsJson2=DetailColsArr
-				}	
-				var param = {
-					Id: parseInt(val)
-				};
-				table.render({
+					var param = {
+						Id: parseInt(val)
+					};
+					table.render({
 						elem: '#LAY-app-content-list2',
 						url: IP + "/BllSo/GetCompleteDetailList",
 						method: 'POST',
@@ -758,11 +464,11 @@
 						limit: pageCnt,
 						limits: pageLimits,
 						cellMinWidth: 60, //鍏ㄥ眬瀹氫箟甯歌鍗曞厓鏍肩殑鏈�灏忓搴︼紝layui 2.2.1 鏂板
-						done: function(){ 
+						done: function () {
 							initMenu();
 							//鑷畾涔夊垪瀹�
-							SetTableColW('LAY-app-content-list2','BllSo/GetCompleteDetailList',DetailColsSysArr);
-						}, 					
+							SetTableColW('LAY-app-content-list2', 'BllSo/GetCompleteDetailList', DetailColsSysArr);
+						},
 						cols: colsJson2
 					});
 				});
@@ -777,17 +483,16 @@
 			});
 			//鏉冮檺
 			function initMenu() {
-				$(function() {
+				$(function () {
 					$(".chexiaoClass").hide(); //鎾ら攢
 				});
-				sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
+				sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
 					if (res.code == 0) { //鎴愬姛 
 						for (var k = 0; k < res.data.length; k++) {
-							if(res.data[k].ParentNo == "2400")
-							{
+							if (res.data[k].ParentNo == "2400") {
 								if (res.data[k].MenuName == "鎾ら攢") {
 									console.log(res.data[k].MenuName);
-									$(function() {
+									$(function () {
 										$(".chexiaoClass").show();
 									});
 								}
@@ -797,7 +502,7 @@
 						layer.msg('鑾峰彇鏉冮檺淇℃伅澶辫触', {
 							icon: 2,
 							time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-						}, function() {});
+						}, function () { });
 					}
 				});
 			}
@@ -824,30 +529,38 @@
 				yemianid = 1;
 			});
 			var doing = true;
-			//鍒犻櫎
+			//鎾ら攢
 			table.on('tool(LAY-app-content-list)', function (obj) {
 				console.log(obj);
 				if (obj.event === 'del') {
 					layer.confirm('纭畾鎾ら攢閫変腑鐨勫垎閰嶄俊鎭悧锛�', function (index) {
-						var param = {
-							Id: parseInt(obj.data.Id)
-						};
-						sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
-							console.log(res);
-							if (res.code == 0) { //鎴愬姛
-								layer.msg(res.msg, {
-									icon: 1,
-									time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function () {
-									refreshTable();
-								});
-							} else { //涓嶆垚鍔�
-								layer.msg(res.msg, {
-									icon: 2,
-									time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-								}, function () { });
-							}
-						});
+						if (doing) {
+							doing = false;
+
+							var param = {
+								Id: parseInt(obj.data.Id)
+							};
+							sendData(IP + "/BllSo/DelExportAllot", param, 'post', function (res) {
+								console.log(res);
+								if (res.code == 0) { //鎴愬姛
+									layer.msg(res.msg, {
+										icon: 1,
+										time: 1000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+									}, function () {
+										refreshTable();
+										doing = true;
+									});
+								} else { //涓嶆垚鍔�
+									layer.msg(res.msg, {
+										icon: 2,
+										time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+									}, function () {
+										doing = true;
+									 });
+								}
+							});
+						}
+						
 					});
 				}
 			});
@@ -886,21 +599,21 @@
 			//#region 鑷畾涔夎〃澶�
 			//鑷畾涔夎〃澶�			
 			active = {
-				customCols: function(){
+				customCols: function () {
 					layer.open({
 						type: 2,
 						title: '鑷畾涔夊垪',
-						content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetExportAllotList&ColsSysArr='+TotalColsSysArr,
+						content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetExportAllotList&ColsSysArr=' + TotalColsSysArr,
 						maxmin: false,
 						resize: false,
 						area: ['970px', '650px']
 					});
 				},
-				customCols2: function(){
+				customCols2: function () {
 					layer.open({
 						type: 2,
 						title: '鑷畾涔夊垪',
-						content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetCompleteDetailList&ColsSysArr='+DetailColsSysArr,
+						content: '../SystemSettings/HeaderSetting.html?Href=BllSo/GetCompleteDetailList&ColsSysArr=' + DetailColsSysArr,
 						maxmin: false,
 						resize: false,
 						area: ['970px', '650px']
@@ -908,7 +621,7 @@
 				}
 
 			};
-			$('.layui-btn').on('click', function() {
+			$('.layui-btn').on('click', function () {
 				var type = $(this).data('type');
 				active[type] ? active[type].call(this) : '';
 			});

--
Gitblit v1.8.0