From 7e7d83cee352eea6244901d1c46f1748a5820fee Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期三, 28 八月 2024 08:16:53 +0800
Subject: [PATCH] Merge branch 'zwc'
---
HTML/views/ASNSetting/PalletBind.html | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/HTML/views/ASNSetting/PalletBind.html b/HTML/views/ASNSetting/PalletBind.html
index c769367..f7761ca 100644
--- a/HTML/views/ASNSetting/PalletBind.html
+++ b/HTML/views/ASNSetting/PalletBind.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
- <title>鎵樼洏缁戝畾</title>
+ <title>缁勬墭鏀惰揣</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport"
@@ -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,10 +455,10 @@
{ 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: '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 },
@@ -816,7 +805,7 @@
layer.open({
type: 2,
title: '绠辨敮璇︽儏淇℃伅',
- content: 'BindBoxInfo.html?BoxNo=' + BoxNo+'&BindNo='+data.BindNo,
+ content: 'BindBoxInfo.html?BoxNo=' + BoxNo + '&BindNo=' + data.BindNo,
maxmin: true,
area: ['80%', '85%'],
btn: ['鍏抽棴'],
--
Gitblit v1.8.0