From bdd84cc48ba7b2527584c44d174da8e7d20c5375 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 18 九月 2024 16:37:13 +0800
Subject: [PATCH] 增加对申请入库时对平库库位的校验

---
 HTML/views/ASNSetting/ArrivalNoticeDetail.html |   83 ++++++++++++++---------------------------
 1 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/HTML/views/ASNSetting/ArrivalNoticeDetail.html b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
index 3c7406f..d0e3685 100644
--- a/HTML/views/ASNSetting/ArrivalNoticeDetail.html
+++ b/HTML/views/ASNSetting/ArrivalNoticeDetail.html
@@ -25,14 +25,22 @@
 		.layui-table-mend {
 			position: relative;
 		}
+
 		.input-dis {
-			position: absolute; /* 璁剧疆涓虹粷瀵瑰畾浣� */
-			top: -25%; /* 椤堕儴瀵归綈 */
-			right: 0; /* 鍙充晶瀵归綈 */
-			bottom: 0; /* 搴曢儴瀵归綈 */
-			left: 0; /* 宸︿晶瀵归綈 */
-			width: 100%; /* 瀹藉害璁剧疆涓�100% */
-			height: 150%; /* 楂樺害璁剧疆涓�100% */
+			position: absolute;
+			/* 璁剧疆涓虹粷瀵瑰畾浣� */
+			top: -25%;
+			/* 椤堕儴瀵归綈 */
+			right: 0;
+			/* 鍙充晶瀵归綈 */
+			bottom: 0;
+			/* 搴曢儴瀵归綈 */
+			left: 0;
+			/* 宸︿晶瀵归綈 */
+			width: 100%;
+			/* 瀹藉害璁剧疆涓�100% */
+			height: 150%;
+			/* 楂樺害璁剧疆涓�100% */
 			background-color: transparent;
 			border: none;
 			text-align: center;
@@ -59,26 +67,11 @@
 			<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
 			<div class="layui-input-inline">
 				<select name="Type" id="Type" lay-filter="Type" lay-search>
-					<!-- JC23 -->
 					<option value="0">鎴愬搧鍏ュ簱</option>
 					<option value="1">閲囪喘鍏ュ簱</option>
-					<option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
-					<option value="5">鍏跺畠鍏ュ簱</option>
-					<option value="6">浠e偍鍏ュ簱</option>
-					<!-- <option value=""></option> -->
-					<!-- JC24 -->
-					<!-- <option value="0" selected>鎴愬搧鍏ュ簱</option>
-					<option value="1">閲囪喘鍏ュ簱</option>
-					<option value="2">涓棿鍝佸叆搴�</option> -->
-					<!-- <option value="3">閫�璐у叆搴�</option> -->
-					<!-- <option value="4">杞﹂棿浣欐枡閫�鍥炲叆搴�</option>
-					<option value="5">鍏跺畠鍏ュ簱</option>
-					<option value="6">浠e偍鍏ュ簱</option>
-					<option value="7">瀵勫瓨鍏ュ簱</option> -->
-					<!-- JC08 -->
-					<!-- <option value="0">鎴愬搧鍏ュ簱</option>
-					<option value="1">鍘熸枡鍏ュ簱</option>
-					<option value="2">閫�璐у叆搴�</option> -->
+					<option value="2">涓棿鍝佸叆搴�</option>
+					<option value="3">閫�璐у叆搴�</option>
+					<option value="4">浣欐枡閫�鍥炲叆搴�</option>
 				</select>
 			</div>
 
@@ -216,13 +209,16 @@
 				{ field: 'Standard', title: '瑙勬牸', width: 160, align: 'center' },
 				{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', edit: 'text', width: 160 },
 				{ field: 'PackagNo', title: '鍖呰鍚嶇О', width: 160, templet: "#table-content-Packlist" },
+				{ field: 'Lot1', title: '鐢熶骇鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+				{ field: 'Lot2', title: '杩囨湡鏃ユ湡', align: 'center', edit: 'text', width: 140 },
+
 				// { field: 'Price', title: '鍗曚环', align: 'center', width: 80 },
 				// { field: 'Money', title: '閲戦', align: 'center', width: 100 },
-				{ field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
-				{ field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
-				{ field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
-				{ field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
-				{ field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
+				// { field: 'UDF1', title: '鑷畾涔夊垪1', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF2', title: '鑷畾涔夊垪2', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF3', title: '鑷畾涔夊垪3', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF4', title: '鑷畾涔夊垪4', align: 'center', edit: 'text', width: 140 },
+				// { field: 'UDF5', title: '鑷畾涔夊垪5', align: 'center', width: 140, templet: '#templetUDF5' },
 				{ field: 'caozuo', title: '鎿嶄綔', fixed: 'right', width: 100, align: 'center', templet: '#table-content-list', "disabled": true }
 			]];
 			var TotalColsSysArr = encodeURIComponent(encodeURIComponent(JSON.stringify(TotalColsArr)))//灏嗚〃澶存暟鎹繘琛寀rl缂栫爜
@@ -259,7 +255,7 @@
 							if (elem.data('value') != '' && elem.data('value') != undefined) {
 								elem.val(elem.data('value')).parents('table.layui-table-cell').css('overflow', 'visible');
 							}
-						});						
+						});
 						form.render();
 						//鑷畾涔夊垪瀹�
 						SetTableColW('LAY-app-content-list', 'BllAsn/GetArrivalNoticeDetailList2', TotalColsSysArr);
@@ -409,29 +405,6 @@
 					}
 				}
 			})
-
-			// var IsBaleValue = "";
-			// form.on('switch(IsBaleDemo)', function (obj) {
-			// 	layer.tips(this.value + ' ' + this.name + '锛�' + obj.elem.checked, obj.othis);
-			// 	if (obj.elem.checked) {
-			// 		IsBaleValue = "1";
-			// 	} else {
-			// 		IsBaleValue = "0";
-			// 	}
-			// });
-
-			// table.on('row(LAY-app-content-list)', function (obj) {
-			// 	if (IsBaleValue != "") {
-			// 		for (var j in arr) {
-			// 			if (obj.data.SkuNo == arr[j].SkuNo) {
-			// 				arr[j].IsBale = IsBaleValue;
-			// 				IsBaleValue = ""
-			// 				break;
-			// 			}
-			// 		}
-			// 	}
-
-			// })
 
 			// 鍒犻櫎鍏ュ簱鍗曟槑缁�
 			table.on('tool(LAY-app-content-list)', function (obj) {
@@ -733,6 +706,8 @@
 						IsBale: arr[i].IsBale,
 						IsBelt: arr[i].IsBelt,
 						SupplierLot: arr[i].SupplierLot,
+						Lot1: arr[i].Lot1,
+						Lot2: arr[i].Lot2,
 						UDF1: arr[i].UDF1,
 						UDF2: arr[i].UDF2,
 						UDF3: arr[i].UDF3,

--
Gitblit v1.8.0