From 65ecd34acf0a3d33e6c1e10c93e351716d749e2f Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 06 三月 2024 14:51:29 +0800
Subject: [PATCH] 修改出库单编辑页面

---
 HTML/views/SOSetting/ExportNoticeEditFrom.html |   66 ++++++++++++++++++++++++++++++--
 HTML/views/SOSetting/ExportNotice.html         |   28 ++++++++++++++
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/HTML/views/SOSetting/ExportNotice.html b/HTML/views/SOSetting/ExportNotice.html
index b8e85a1..cbb0614 100644
--- a/HTML/views/SOSetting/ExportNotice.html
+++ b/HTML/views/SOSetting/ExportNotice.html
@@ -1234,6 +1234,7 @@
 						var param = {
 							soNo: SoNo
 						};
+						// 鍒ゆ柇鏄惁闇�瑕佹媶绠憋紝闇�瑕佹媶绠卞氨闇�瑕侀�夋嫨鍑哄簱鍙�
 						sendData(IP + "/BllSo/IsNeedUnpack", param, 'get', function(res) {
 							if (res.code == 0) { //鎴愬姛
 								if(res.data=="1"){
@@ -1273,6 +1274,33 @@
 											icon: 2,
 											time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
 										});
+										return;
+									}
+									if($('#UnstackWay').val()=='0'){
+										if($('#LoadingArea').val()==''){
+											layer.msg("璇烽�夋嫨瑁呰溅鍙�", {
+												icon: 2,
+												time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+											});
+											return;
+										}
+										if(isNeedUnpack=='1'){
+											if(pa==''){
+												layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+													icon: 2,
+													time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+												});
+												return;
+											}
+										}
+									}else{
+										if(pa==''){
+											layer.msg("璇烽�夋嫨鍑哄簱鍙�", {
+												icon: 2,
+												time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+											});
+											return;
+										}
 									}
 									var param = {
 										soNo: data.SONo, 
diff --git a/HTML/views/SOSetting/ExportNoticeEditFrom.html b/HTML/views/SOSetting/ExportNoticeEditFrom.html
index 44ab52e..a0d29de 100644
--- a/HTML/views/SOSetting/ExportNoticeEditFrom.html
+++ b/HTML/views/SOSetting/ExportNoticeEditFrom.html
@@ -26,12 +26,22 @@
 					<div class="layui-input-inline">
 						<select name="Type" id="Type" lay-filter="Type" lay-verify="required" disabled lay-search>
 							<option value=""></option>
-							<!-- 09 -->
+							<!-- 24 -->
 							<option value="0">鎴愬搧鍑哄簱</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>
+							<option value="8">瀵勫瓨鍑哄簱</option>
+							<!-- 09 -->
+							<!-- <option value="0">鎴愬搧鍑哄簱</option>
 							<option value="1">鍘熸枡鍑哄簱</option>
 							<option value="2">鎴愬搧涓嶅悎鏍煎嚭搴�</option>
 							<option value="3">鍘熸枡涓嶅悎鏍煎嚭搴�</option>
-							<option value="4">璐ㄦ鍑哄簱</option>
+							<option value="4">璐ㄦ鍑哄簱</option> -->
 							<!-- 08 -->
 							<!-- <option value="0">鎴愬搧鍑哄簱</option>
 							<option value="1">鍘熻緟鏂欏嚭搴�</option>
@@ -484,9 +494,55 @@
 							$("#CustomerNo").empty();
 							$("#CustomerNo").append('<option value =""></option>');
 							for (var i = 0; i < res.data.length; i++) {
-								$("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' + 
-									res.data[i].CustomerName + '</option>');
-							} 
+								var TypeNum = 0;
+								
+								switch($("#Type").val())
+								{									
+									case "0": //鎴愬搧鍑哄簱
+										TypeNum = 0;
+										console.log(TypeNum)
+										break;
+									case "1": //棰嗘枡鍑哄簱
+									case "2": //鎶芥鍑哄簱
+									case "3": //鐗╂枡鍙栨牱鍑哄簱
+									case "4": //涓嶅悎鏍煎搧鍑哄簱
+									case "5": //涓棿鍝佸嚭搴�
+									case "6": //浠e偍鍑哄簱
+									case "7": //鍏朵粬鍑哄簱
+									case "8": //瀵勫瓨鍑哄簱
+										TypeNum = 2;
+										console.log(TypeNum)
+										break;
+								}
+								//鍒ゆ柇鍗曟嵁绫诲瀷
+								if (TypeNum == 0)
+								{
+									if (res.data[i].Type == 0)
+									{
+										$("#CustomerNamep").html("瀹㈡埛");
+										$("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+										res.data[i].CustomerName + '</option>');
+									}
+								}
+								else if (TypeNum == 1)
+								{
+									if (res.data[i].Type == 1)
+									{
+										$("#CustomerNamep").html("渚涘簲鍟�");
+										$("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+										res.data[i].CustomerName + '</option>');
+									}
+								}
+								else if (TypeNum == 2)
+								{
+									if (res.data[i].Type == 2)
+									{
+										$("#CustomerNamep").html("璐т富");
+										$("#CustomerNo").append('<option value =' + res.data[i].CustomerNo + '>' +
+										res.data[i].CustomerName + '</option>');
+									}
+								}
+							}
 							form.render('select');
 						} else { //涓嶆垚鍔�
 							layer.msg(res.msg, {

--
Gitblit v1.8.0