From c4e8e814d2c9e0d03f6449860b70e58657fd7dc2 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 31 十二月 2024 11:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/webapp/static/js/pla/plaDetl.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 549f476..9bea104 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -53,7 +53,7 @@
,{field: 'workshop', align: 'center',title: '鐢熶骇杞﹂棿',hide:true,edit:true}
,{field: 'line', align: 'center',title: '鐢熶骇绾�',hide:true,edit:true}
,{field: 'weightAnfme', align: 'center',title: '鍓╀綑閲嶉噺锛圞G锛�',edit:true,totalRow:true}
- ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true}
+ ,{field: 'qtyAnfme', align: 'center',title: '寰呭嚭搴撻噸閲忥紙KG锛�',hide:true,edit:true}
,{field: 'status', align: 'center',title: '鐘舵��', templet: setState ,edit:true}
,{field: 'stockFreeze', align: 'center',title: '搴撳瓨鍐荤粨', templet: '#stockFreezeTpl'}
,{field: 'stockFreezeBy', align: 'center',title: '鎿嶄綔浜哄憳',hide:true}
@@ -789,7 +789,8 @@
layer.msg("閫変腑鐨勬槑缁嗕腑鍚湁澶氱鐗屽彿锛岃閲嶆柊閫夋嫨");
return;
}
- if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
+ //if (data[i].zpalletType == null && data[i].packageType == null && data[i].massState == null) {
+ if (typeof data[i].massState === 'undefined' || data[i].massState === null || data[i].massState.trim().length === 0){
layer.msg("璐ㄩ噺鎸囨爣鏈笂浼�");
return;
}
--
Gitblit v1.9.1