From fe2b27527084667a15c424ffba00052cbf35ef7f Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期一, 15 七月 2024 11:45:30 +0800
Subject: [PATCH] Merge branch 'master' into Liudl

---
 HTML/views/WareHouseSetting/StorageLegend.html |  171 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 169 insertions(+), 2 deletions(-)

diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 8607efe..0280638 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -85,7 +85,7 @@
 
 
 		.btnShow {
-			width: 20px;
+			width: 17px;
 			height: 15px;
 			cursor: pointer;
 		}
@@ -266,7 +266,116 @@
 			});
 			//宸烽亾鍙樻洿
 			form.on('select(getRoadwayNo)', function (data) {
+				if (data.value == "R01")
+				{
+					xianga = "宸烽亾1鎺�"; 
+					xiangb = "宸烽亾2鎺�"; 
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='1']").attr("selected", "selected")
+					$("#Row").append('<option value =1>绗�1鎺�</option>');
+					$("#Row").append('<option value =2>绗�2鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R02")
+				{
+					xianga = "宸烽亾3鎺�"; 
+					xiangb = "宸烽亾4鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='3']").attr("selected", "selected")
+					$("#Row").append('<option value =3>绗�3鎺�</option>');
+					$("#Row").append('<option value =4>绗�4鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R03")
+				{
+					
+					xianga = "宸烽亾5鎺�"; 
+					xiangb = "宸烽亾6鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='5']").attr("selected", "selected")
+					$("#Row").append('<option value =5>绗�5鎺�</option>');
+					$("#Row").append('<option value =6>绗�6鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R04")
+				{
+					
+					xianga = "宸烽亾7鎺�"; 
+					xiangb = "宸烽亾8鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='7']").attr("selected", "selected")
+					$("#Row").append('<option value =7>绗�7鎺�</option>');
+					$("#Row").append('<option value =8>绗�8鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R05")
+				{
+					
+					xianga = "宸烽亾9鎺�"; 
+					xiangb = "宸烽亾10鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='9']").attr("selected", "selected")
+					$("#Row").append('<option value =9>绗�9鎺�</option>');
+					$("#Row").append('<option value =10>绗�10鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R06")
+				{
+					
+					xianga = "宸烽亾11鎺�"; 
+					xiangb = "宸烽亾12鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='11']").attr("selected", "selected")
+					$("#Row").append('<option value =11>绗�11鎺�</option>');
+					$("#Row").append('<option value =12>绗�12鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R07")
+				{
+					
+					xianga = "宸烽亾13鎺�"; 
+					xiangb = "宸烽亾14鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='13']").attr("selected", "selected")
+					$("#Row").append('<option value =13>绗�13鎺�</option>');
+					$("#Row").append('<option value =14>绗�14鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R08")
+				{
+					
+					xianga = "宸烽亾15鎺�"; 
+					xiangb = "宸烽亾16鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='15']").attr("selected", "selected")
+					$("#Row").append('<option value =15>绗�15鎺�</option>');
+					$("#Row").append('<option value =16>绗�16鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R09")
+				{
+					
+					xianga = "宸烽亾17鎺�"; 
+					xiangb = "宸烽亾18鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='17']").attr("selected", "selected")
+					$("#Row").append('<option value =17>绗�17鎺�</option>');
+					$("#Row").append('<option value =18>绗�18鎺�</option>');
+					form.render('select');
+				}
+				else if ($("#RoadwayNo").val() == "R10")
+				{
+					
+					xianga = "宸烽亾19鎺�"; 
+					xiangb = "宸烽亾20鎺�";
+					$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+					$("#Row option[value ='19']").attr("selected", "selected")
+					$("#Row").append('<option value =19>绗�19鎺�</option>');
+					$("#Row").append('<option value =20>绗�20鎺�</option>');
+					form.render('select');
+				}
 				getRow(); //鑾峰彇宸烽亾涓帓
+				GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
 			})
 			//鎺掑彉鏇�
 			form.on('select(SelectRow)', function (data) {
@@ -327,6 +436,64 @@
 						$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
 						$("#Depth option[value ='01']").attr("selected", "selected")
 						form.render('select');
+						if ($("#RoadwayNo").val() == "R01")
+						{
+							xianga = "宸烽亾1鎺�"; 
+							xiangb = "宸烽亾2鎺�"; 
+							$("#Row option[value ='1']").attr("selected", "selected")
+							$("#Row").append('<option value =1>绗�1鎺�</option>');
+							$("#Row").append('<option value =2>绗�2鎺�</option>');
+							form.render('select');
+						}
+						else if ($("#RoadwayNo").val() == "R02")
+						{
+							xianga = "宸烽亾3鎺�"; 
+							xiangb = "宸烽亾4鎺�";
+							$("#Row option[value ='3']").attr("selected", "selected")
+							$("#Row").append('<option value =3>绗�3鎺�</option>');
+							$("#Row").append('<option value =4>绗�4鎺�</option>');
+							form.render('select');
+						}
+						else if ($("#RoadwayNo").val() == "R03")
+						{
+							
+							xianga = "宸烽亾5鎺�"; 
+							xiangb = "宸烽亾6鎺�";
+							$("#Row option[value ='5']").attr("selected", "selected")
+							$("#Row").append('<option value =5>绗�5鎺�</option>');
+							$("#Row").append('<option value =6>绗�6鎺�</option>');
+							form.render('select');
+						}
+						else if ($("#RoadwayNo").val() == "R04")
+						{
+							
+							xianga = "宸烽亾7鎺�"; 
+							xiangb = "宸烽亾8鎺�";
+							$("#Row option[value ='7']").attr("selected", "selected")
+							$("#Row").append('<option value =7>绗�7鎺�</option>');
+							$("#Row").append('<option value =8>绗�8鎺�</option>');
+							form.render('select');
+						}
+						else if ($("#RoadwayNo").val() == "R05")
+						{
+							
+							xianga = "宸烽亾9鎺�"; 
+							xiangb = "宸烽亾10鎺�";
+							$("#Row option[value ='9']").attr("selected", "selected")
+							$("#Row").append('<option value =9>绗�9鎺�</option>');
+							$("#Row").append('<option value =10>绗�10鎺�</option>');
+							form.render('select');
+						}
+						else if ($("#RoadwayNo").val() == "R06")
+						{
+							
+							xianga = "宸烽亾11鎺�"; 
+							xiangb = "宸烽亾12鎺�";
+							$("#Row option[value ='11']").attr("selected", "selected")
+							$("#Row").append('<option value =11>绗�11鎺�</option>');
+							$("#Row").append('<option value =12>绗�12鎺�</option>');
+							form.render('select');
+						}
 						getRow(); //鑾峰彇鎺�
 						GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //鑾峰彇鏌辩姸淇℃伅
 					} else { //涓嶆垚鍔�
@@ -624,7 +791,7 @@
 									type: 'shadow'
 								}
 							},
-							// legend: {
+							// legend: { //椤堕儴鍒楄〃
 							// 	data: ['绌哄偍浣�','鏈夌墿鍝�','鍏ュ簱涓�','鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�']
 							// },
 							xAxis: [

--
Gitblit v1.8.0