From fccd9966ddc9d3e1e0f02cc117f634bf3136067e Mon Sep 17 00:00:00 2001
From: bklLiudl <673013083@qq.com>
Date: 星期二, 27 八月 2024 09:01:05 +0800
Subject: [PATCH] Merge branch 'master' into Liudl
---
HTML/views/ASNSetting/PalletBind.html | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 51f9d81..f7761ca 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -331,17 +331,6 @@
{{ GetBtn11(d) }}
</script>
- <script type="text/html" id="WareHouseButton">
- {{#
- switch (d.WareHouseNo) {
- case "W01": return '鍔涜绔嬩綋搴�';
- case "W02": return '鍔涜骞冲簱';
- default: return "";
- }
-
- }}
- </script>
-
<script type="text/html" id="RoadwayButton">
{{#
switch (d.RoadwayNo) {
@@ -466,7 +455,7 @@
{ field: 'PalletNo3', title: '鎵樼洏鍙稬V3', align: 'center' },
{ field: 'LocatNo', title: '鍌ㄤ綅鍦板潃', align: 'center', width: 90 },
{ field: 'RoadwayNo', title: '鎵�灞炲贩閬�', align: 'center', width: 90, templet: '#RoadwayButton' },
- { field: 'WareHouseNo', title: '鎵�灞炰粨搴�', align: 'center', width: 90, templet: '#WareHouseButton' },
+ { field: 'WareHouseName', title: '鎵�灞炰粨搴�', align: 'center', width: 90},
{ field: 'SkuNo', title: '鐗╂枡缂栫爜', align: 'center', width: 110 },
{ field: 'SkuName', title: '鐗╂枡鍚嶇О', align: 'center' },
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 120 },
--
Gitblit v1.8.0