From 2a9bf520f65e85777fff0f20f4c84ba9a810eef5 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 29 八月 2024 13:54:46 +0800
Subject: [PATCH] Merge branch 'yyk'
---
HTML/views/ASNSetting/PalletBind.html | 17 +++--------------
1 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index 51f9d81..87964db 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,13 +455,13 @@
{ 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 },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 90 },
{ field: 'FullQty', title: '鏁存墭鏁伴噺', align: 'center', width: 90 },
- { field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 },
+ //{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 90 }, // 鍙栨牱鏁伴噺鏀惧埌璇烽獙澶勬樉绀�
{ field: 'InspectMark', title: '鎶芥鏍囪', align: 'center', width: 90, templet: '#templetInspectMark' },
//{ field: 'Status', title: '鎵ц鐘舵��', align: 'center', width: 90, templet: '#templetStatus' }, // 閮芥槸鍏ュ簱瀹屾垚
{ field: 'BitPalletMark', title: '闆舵墭鏍囪', align: 'center', width: 90, templet: '#templetBitPalletMark' },
@@ -555,7 +544,7 @@
{ field: 'LotNo', title: '鎵规鍙�', align: 'center', width: 150, },
{ field: 'Qty', title: '鏁伴噺', align: 'center', width: 105, },
{ field: 'FullQty', title: '鏁寸鏁伴噺', align: 'center', width: 105, },
- { field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, },
+ //{ field: 'SamplingQty', title: '鍙栨牱鏁伴噺', align: 'center', width: 105, }, // 鍙栨牱鏁伴噺鏀惧埌璇烽獙椤甸潰鏄剧ず銆�
{ field: 'ProductionTime', title: '鐢熶骇鏃ユ湡', align: 'center', width: 160, templet: '#templetProductionTime' },
{ field: 'ExpirationTime', title: '杩囨湡鏃ユ湡', align: 'center', width: 180, templet: '#templetExpirationTime' },
{ field: 'LotText', title: '鎵规鎻忚堪', align: 'center', width: 150, },
--
Gitblit v1.8.0