From 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:24:28 +0800
Subject: [PATCH] 合并代码

---
 HTML/views/ASNSetting/LabelPrintSelect.html |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/HTML/views/ASNSetting/LabelPrintSelect.html b/HTML/views/ASNSetting/LabelPrintSelect.html
index 8e9281d..7e1d8e8 100644
--- a/HTML/views/ASNSetting/LabelPrintSelect.html
+++ b/HTML/views/ASNSetting/LabelPrintSelect.html
@@ -11,6 +11,12 @@
 	<body>
 		<div class="layui-form" lay-filter="layuiadmin-app-form-list" id="layuiadmin-app-form-list" style="padding: 20px 30px 0 0;">
            
+			<div class="layui-form-item">
+				<label class="layui-form-label">渚涜揣鎵规</label>
+				<div class="layui-input-block">
+					<input type="text" name="SupplierLot" id="SupplierLot" placeholder="璇疯緭鍏ヤ緵璐ф壒娆�" autocomplete="off" class="layui-input">
+				</div>
+			</div>
             <div class="layui-form-item">
 				<label class="layui-form-label">鐢熶骇鏃ユ湡</label>
 				<div class="layui-input-block">
@@ -32,7 +38,7 @@
             <div class="layui-form-item">
 				<label class="layui-form-label">閲嶇疆鎵瑰彿</label>
 				<div class="layui-input-block">
-					<select name="reset" id="reset" lay-verify="required">
+					<select name="reset" id="reset" lay-filter="reset" lay-verify="required">
 						<option value="1">鏄�</option>
                         <option value="0">鍚�</option>
 					</select>
@@ -116,7 +122,18 @@
                     });
 
 					var id = getQueryString('Id');
-					
+					var SupplierLot=getQueryString('SupplierLot');//渚涜揣鎵规
+					$('#SupplierLot').val(SupplierLot);
+					var asnType = getQueryString('Type');
+					console.log(asnType);
+					console.log(asnType == 4);
+					if(asnType == 4){
+
+						$("#reset option[value='0']").attr("selected","selected"); //鎬у埆
+						$("#reset").attr("disabled","disabled"); 
+						form.render('select');
+					}
+
 					var param = {
 						id: parseInt(id),
 					};

--
Gitblit v1.8.0