From b9f7560cbe0e562a40e9515a0559a3e951f0fee6 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 07 四月 2025 09:16:01 +0800
Subject: [PATCH] 问题修改
---
HTML/views/WareHouseSetting/StorageLegend.html | 162 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 103 insertions(+), 59 deletions(-)
diff --git a/HTML/views/WareHouseSetting/StorageLegend.html b/HTML/views/WareHouseSetting/StorageLegend.html
index 9b6c659..801da55 100644
--- a/HTML/views/WareHouseSetting/StorageLegend.html
+++ b/HTML/views/WareHouseSetting/StorageLegend.html
@@ -55,21 +55,21 @@
}
.one {
- background-color: #91cc75;
+ background-color: #75bfcc;
Opacity: .8;
}
.two {
- background-color: #ffdc60;
+ background-color: #89a297;
}
.three {
- background-color: #ee6666;
+ background-color: #8ef0f0;
Opacity: .8;
}
.four {
- background-color: #ffff7f;
+ background-color: #f0b9f9;
Opacity: .8;
}
@@ -152,14 +152,18 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
- <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>
@@ -365,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());
})
@@ -393,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() {
@@ -402,7 +424,7 @@
if (res.code == 0) { //鎴愬姛
for (var i = 0; i < res.data.length; i++) {
- $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].WareHouseNo + '-' +
+ $("#RoadwayNo").append('<option value =' + res.data[i].RoadwayNo + '>' + res.data[i].RoadwayNo + '-' +
res.data[i].RoadwayName + '</option>');
}
$("#RoadwayNo option[value='" + res.data[0].RoadwayNo + "']").attr("selected", "selected")
@@ -503,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,
@@ -569,13 +594,13 @@
}
//绉诲叆涓� 4
- // if (statu.Status == 4) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow four" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 4) {
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow four"></button></td>'
+ }
//绉诲嚭涓� 5
- // if (statu.Status == 5) {
- // html += '<td style="height:auto;width:auto"><button value=' + statu.LocatNo + ' class="btnShow five" style="height:' + height3 + 'px;width:' + svmwidth + 'px"></button></td>'
- // }
+ if (statu.Status == 5) {
+ html += '<td><button value=' + statu.LocatNo + ' class="btnShow five"></button></td>'
+ }
} else {
// console.log(i, a);
@@ -624,7 +649,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6: 鎹熷潖\灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�', '鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�', '鎹熷潖\灞忚斀'];
var value = [0,0,0,0,0,0,0];
list.forEach(item => {
value[item.Status] = item.StatusNum;
@@ -634,11 +659,11 @@
var option2 = {
color: [
'#5470c6',
- '#91cc75',
- '#ffdc60',
- '#ee6666',
- // '#ffff7f',
- // '#ee23ee',
+ '#75bfcc',
+ '#89a297',
+ '#8ef0f0',
+ '#f0b9f9',
+ '#ee23ee',
'#808080',
],
title: {
@@ -665,9 +690,9 @@
{ value: value[1], name: key[1] }, //鏈夌墿鍝�
{ value: value[2], name: key[2] }, //鍏ュ簱涓�
{ 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[4], name: key[4] }, //绉诲叆涓�
+ { value: value[5], name: key[5] }, //绉诲嚭涓�
+ { value: value[6], name: key[6] }, //鎹熷潖\灞忚斀
],
// emphasis: {
// itemStyle: {
@@ -698,7 +723,7 @@
var list = res.data;
//0锛氱┖鍌ㄤ綅 1锛氭湁鐗╁搧 2锛氬叆搴撲腑 3锛氬嚭搴撲腑 4锛氱Щ鍏ヤ腑 5锛氱Щ鍑轰腑 6锛氭崯鍧廫灞忚斀
- var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','鎹熷潖\灞忚斀'];
+ var key = ['绌哄偍浣�', '鏈夌墿鍝�', '鍏ュ簱涓�', '鍑哄簱涓�','绉诲叆涓�','绉诲嚭涓�','鎹熷潖\灞忚斀'];
this.chartLine2 = echarts.init(document.getElementById("zhu"));
//宸烽亾
var roarylist = [xianga, xiangb];
@@ -707,8 +732,8 @@
var status1 = [];
var status2 = [];
var status3 = [];
- // var status4 = [];
- // var status5 = [];
+ var status4 = [];
+ var status5 = [];
var status6 = [];
//鑾峰彇
//鎬�
@@ -725,12 +750,12 @@
if (list[i].Status == '3') {
status3.push(list[i].StatusNum)
}
- // if (list[i].Status == '4') {
- // status4.push(list[i].StatusNum)
- // }
- // if (list[i].Status == '5') {
- // status5.push(list[i].StatusNum)
- // }
+ if (list[i].Status == '4') {
+ status4.push(list[i].StatusNum)
+ }
+ if (list[i].Status == '5') {
+ status5.push(list[i].StatusNum)
+ }
if (list[i].Status == '6') {
status6.push(list[i].StatusNum)
}
@@ -770,6 +795,24 @@
else
{
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)
{
@@ -845,26 +888,26 @@
},
data: status3
},
- // {
- // name: '绉诲叆涓�',
- // type: 'bar',
- // color: '#ffff7f',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status4
- // },
- // {
- // name: '绉诲嚭涓�',
- // type: 'bar',
- // color: '#ee23ee',
- // //label: labelOption,
- // emphasis: {
- // focus: 'series'
- // },
- // data: status5
- // },
+ {
+ name: '绉诲叆涓�',
+ type: 'bar',
+ color: '#ffff7f',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status4
+ },
+ {
+ name: '绉诲嚭涓�',
+ type: 'bar',
+ color: '#ee23ee',
+ //label: labelOption,
+ emphasis: {
+ focus: 'series'
+ },
+ data: status5
+ },
{
name: '鎹熷潖\灞忚斀',
type: 'bar',
@@ -919,6 +962,7 @@
html += "<br/>鐗╂枡鍚嶇О锛�"+res.data.GoodsInfoList[i].SkuName;
html += "<br/>鎵规鍙凤細 "+res.data.GoodsInfoList[i].LotNo;
html += "<br/>鏁伴噺锛� "+res.data.GoodsInfoList[i].Qty;
+ html += "<br/>妫�楠岀姸鎬侊細"+res.data.GoodsInfoList[i].InspectStatus;
}
html += "</p>"
}
--
Gitblit v1.8.0