From f512b0475560ed449f936e0b7a27ba197e6bafe5 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 26 九月 2024 15:16:08 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
HTML/views/WareHouseSetting/StorageLegend.html | 69 +++++++++++++++++++++++++++-------
1 files changed, 54 insertions(+), 15 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 1baef7c..298542f 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -152,18 +152,18 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
- <td><button class="btnShow five" disabled></button></td>
- <td>绉诲嚭涓�</td>
- <td><button class="btnShow four" disabled></button></td>
- <td>绉诲叆涓�</td>
- <td><button class="btnShow three" disabled></button></td>
- <td>鍑哄簱涓�</td>
- <td><button class="btnShow two" disabled></button></td>
- <td>鍏ュ簱涓�</td>
- <td><button class="btnShow one" disabled></button></td>
- <td>鏈夌墿鍝�</td>
<td><button class="btnShow zero" disabled></button></td>
<td>绌哄簱浣�</td>
+ <td><button class="btnShow one" disabled></button></td>
+ <td>鏈夌墿鍝�</td>
+ <td><button class="btnShow two" disabled></button></td>
+ <td>鍏ュ簱涓�</td>
+ <td><button class="btnShow three" disabled></button></td>
+ <td>鍑哄簱涓�</td>
+ <td><button class="btnShow four" disabled></button></td>
+ <td>绉诲叆涓�</td>
+ <td><button class="btnShow five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
<td><button class="btnShow filg" disabled></button></td>
<td>鎹熷潖\灞忚斀</td>
</tr>
@@ -369,11 +369,11 @@
$("#Row").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
$("#Row option[value ='19']").attr("selected", "selected")
$("#Row").append('<option value =19>绗�19鎺�</option>');
- $("#Row").append('<option value =>绗�20鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
form.render('select');
}
- GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val())
-
+ funLayer();
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
})
@@ -397,6 +397,24 @@
form.on('select(SelectDepth)', function (data) {
GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
});
+ function funLayer()
+ {
+ if($("#Row").val() == "2" || $("#Row").val() == "5" || $("#Row").val() == "9" || $("#Row").val() == "13" || $("#Row").val() == "17")
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ }
+ else
+ {
+ $("#Depth").empty();//娓呯┖涓婁竴涓煡璇笅鎷夊��
+ $("#Depth option[value ='01']").attr("selected", "selected")
+ $("#Depth").append('<option value =01>娣卞害1</option>');
+ $("#Depth").append('<option value =02>娣卞害2</option>');
+ }
+ form.render('select');
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
+ }
//鑾峰彇浠撳簱宸烽亾
function getRoadway() {
@@ -507,9 +525,12 @@
xiangb = "宸烽亾20鎺�";
$("#Row option[value ='19']").attr("selected", "selected")
$("#Row").append('<option value =19>绗�19鎺�</option>');
- $("#Row").append('<option value =>绗�20鎺�</option>');
+ $("#Row").append('<option value =20>绗�20鎺�</option>');
form.render('select');
}
+ funLayer();
+ GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val());
+ GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
} else { //涓嶆垚鍔�
layer.msg(res.msg, {
icon: 2,
@@ -671,7 +692,7 @@
{ value: value[3], name: key[3] }, //鍑哄簱涓�
{ value: value[4], name: key[4] }, //绉诲叆涓�
{ value: value[5], name: key[5] }, //绉诲嚭涓�
- { value: value[6], name: key[4] }, //鎹熷潖\灞忚斀
+ { value: value[6], name: key[6] }, //鎹熷潖\灞忚斀
],
// emphasis: {
// itemStyle: {
@@ -775,6 +796,24 @@
{
status3.push(0)
}
+ if (status4.length == 0)
+ {
+ status4.push(0)
+ status4.push(0)
+ }
+ else
+ {
+ status4.push(0)
+ }
+ if (status5.length == 0)
+ {
+ status5.push(0)
+ status5.push(0)
+ }
+ else
+ {
+ status5.push(0)
+ }
if (status6.length == 0)
{
status6.push(0)
--
Gitblit v1.8.0