From 02abdb2a7821e1eacc2b8ddc91e398cd9906c8cf Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 13 三月 2025 18:36:54 +0800
Subject: [PATCH] 修改问题

---
 HTML/views/SOSetting/ExportNoticeEditFrom.html |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index 73e2f4d..1182401 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -13,14 +13,7 @@
 
 		<div class="layui-form" style="padding: 20px 0 0 0;">
 			<div class="layui-form-item" style="margin-bottom: 0px;">
-				<!-- <div class="layui-inline">
-					<label class="layui-form-label">鍑哄簱浠撳簱</label>
-					<div class="layui-input-inline">
-						<select name="WarehouseId" id="WarehouseId" lay-filter="WarehouseId" lay-verify="required" lay-search>
-							<option value=""></option>
-						</select>
-					</div>
-				</div> -->
+				
 				<div class="layui-inline">
 					<label class="layui-form-label">鍗曟嵁绫诲瀷</label>
 					<div class="layui-input-inline">
@@ -31,9 +24,16 @@
 							<option value="1">棰嗘枡鍑哄簱</option>
 							<option value="2">鎶芥鍑哄簱</option>
 							<option value="4">涓嶅悎鏍煎搧鍑哄簱</option>
-							<option value="5">涓棿鍝佸嚭搴�</option>
-							<!-- <option value="7">鍏朵粬鍑哄簱</option> -->
-							<option value="9">閲囪喘閫�璐у嚭搴�</option>
+							<option value="7">鍏朵粬鍑哄簱</option>
+							<option value="9">鐢熶骇棰嗘枡鍑哄簱</option>
+						</select>
+					</div>
+				</div>
+				<div class="layui-inline">
+					<label class="layui-form-label">鍑哄簱浠撳簱</label>
+					<div class="layui-input-inline">
+						<select name="WarehouseId" id="WarehouseId" lay-filter="WarehouseId" lay-verify="required" disabled lay-search>
+							<option value=""></option>
 						</select>
 					</div>
 				</div>
@@ -102,7 +102,7 @@
 				var id = getQueryString("id");
 				console.log(soNo);
 				console.log(id);
-				// getWareHouseList();
+				
 				
 				getData();//鑾峰彇鍏ュ簱鍗曠被鍨�
 				var arr = []; 
@@ -259,7 +259,7 @@
 						layer.open({
 							type: 2,
 							title: '閫夋嫨鐗╁搧淇℃伅',
-							content: 'ExportSelectSkuFrom.html?Type='+$("#Type").val(),
+							content: 'ExportSelectSkuFrom.html?houseId='+$("#WarehouseId").val()+'&Type='+$("#Type").val(),
 							maxmin: true,
 							area: ['950px', '90%'],
 							fixed: false,
@@ -428,7 +428,8 @@
 							 
 							form.render('select');
 							refreshTable(res.data.Detail);
-
+							//浠撳簱
+							getWareHouseList(res.data.WareHouseNo)
 							//鑾峰彇瀹㈡埛/璐т富
 							getCustomerList(res.data.CustomerNo);
 							//鑾峰彇渚涘簲鍟�
@@ -459,25 +460,26 @@
 				// 	} 
 				// });
 				//鑾峰彇浠撳簱涓嬫媺妗嗕俊鎭�
-				// function getWareHouseList(){
-				// 	sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
+				function getWareHouseList(houseNo){
+					sendData(IP + "/Sys/GetWarehouseDic", {}, 'get', function(res) {
 						
-				// 		if (res.code == 0) { //鎴愬姛
-				// 			$("#WarehouseId").empty();
-				// 			$("#WarehouseId").append('<option value =""></option>');
-				// 			for (var i = 0; i < res.data.length; i++) {
-				// 				$("#WarehouseId").append('<option value =' + res.data[i].WareHouseNo + '>' + 
-				// 					res.data[i].WareHouseName + '</option>');
-				// 			} 
-				// 			form.render('select');
-				// 		} else { //涓嶆垚鍔�
-				// 			layer.msg(res.msg, {
-				// 				icon: 2,
-				// 				time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
-				// 			}, function() {});
-				// 		}
-				// 	});
-				// }
+						if (res.code == 0) { //鎴愬姛
+							$("#WarehouseId").empty();
+							$("#WarehouseId").append('<option value =""></option>');
+							for (var i = 0; i < res.data.length; i++) {
+								$("#WarehouseId").append('<option value =' + res.data[i].WareHouseNo + '>' + 
+									res.data[i].WareHouseName + '</option>');
+							} 
+							$("#WarehouseId option[value='"+ houseNo +"']").attr("selected", "selected")
+							form.render('select');
+						} else { //涓嶆垚鍔�
+							layer.msg(res.msg, {
+								icon: 2,
+								time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+							}, function() {});
+						}
+					});
+				}
 				//鑾峰彇瀹㈡埛涓嬫媺妗嗕俊鎭�
 				function getCustomerList(customerNo) {
 					sendData(IP + "/Basis/GetCustomerSelect", {}, 'get', function(res) {

--
Gitblit v1.8.0