From 7f4b5fb7a89052f1fbd2e00b34e60e1b55f73ab3 Mon Sep 17 00:00:00 2001
From: Demo <Demo@DESKTOP-CPA90BF>
Date: 星期六, 16 三月 2024 16:58:40 +0800
Subject: [PATCH] Merge branch 'csc'
---
HTML/views/WareHouseSetting/FlatLibraryLegend.html | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/HTML/views/WareHouseSetting/FlatLibraryLegend.html b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
index f17304d..cab5d59 100644
--- a/HTML/views/WareHouseSetting/FlatLibraryLegend.html
+++ b/HTML/views/WareHouseSetting/FlatLibraryLegend.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>鍌ㄤ綅鍥句緥</title>
+ <title>骞冲簱鍥句緥</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
@@ -160,6 +160,10 @@
<!-- 鍌ㄤ綅鍥句緥 -->
<table style="margin:0 auto;">
<tr>
+ <td><button class="btnShow1 five" disabled></button></td>
+ <td>绉诲嚭涓�</td>
+ <td><button class="btnShow1 four" disabled></button></td>
+ <td>绉诲叆涓�</td>
<td><button class="btnShow1 three" disabled></button></td>
<td>鍑哄簱涓�</td>
<td><button class="btnShow1 two" disabled></button></td>
@@ -488,6 +492,14 @@
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html1 += '<td></td>'
@@ -522,6 +534,14 @@
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html2 += '<td></td>'
@@ -555,6 +575,14 @@
else if (item.Status == 3) {
html3 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html3 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html3 += '<td></td>'
@@ -587,6 +615,14 @@
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html4 += '<td></td>'
@@ -618,6 +654,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -653,6 +697,14 @@
else if (item.Status == 3) {
html6 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html6 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html6 += '<td></td>'
@@ -687,6 +739,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -735,6 +795,14 @@
else if (item.Status == 3) {
html5 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html5 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html5 += '<td></td>'
@@ -769,6 +837,14 @@
else if (item.Status == 3) {
html7 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html7 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html7 += '<td></td>'
@@ -802,13 +878,21 @@
else if (item.Status == 3) {
html2 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html2 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html2 += '<td></td>'
}
if (item.Row == 2) {
- html4 += '<tr></tr>'
+ html2 += '<tr></tr>'
}
}
else if(item.AreaNo == "B14")
@@ -834,6 +918,14 @@
//鍑哄簱涓� 3
else if (item.Status == 3) {
html1 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html1 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
}
} else {
// console.log(i, a);
@@ -867,6 +959,14 @@
else if (item.Status == 3) {
html4 += '<td><button value=' + item.LocatNo + ' class="btnShow three" style="width: 100%;height: 100%;" ></button></td>'
}
+ //绉诲叆涓� 4
+ else if (item.Status == 4) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow four" style="width: 100%;height: 100%;" ></button></td>'
+ }
+ //绉诲嚭涓� 5
+ else if (item.Status == 5) {
+ html4 += '<td><button value=' + item.LocatNo + ' class="btnShow five" style="width: 100%;height: 100%;" ></button></td>'
+ }
} else {
// console.log(i, a);
html4 += '<td></td>'
--
Gitblit v1.8.0