From fe1a4ed8d3a161bc555d4b3fbbce3a7e10a5fbcd Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期四, 21 八月 2025 11:12:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/条码明细/Kf_BarCodeDetailQuery.html | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html" "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
index 837a00d..ce27d72 100644
--- "a/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
+++ "b/WebTM/views/\346\235\241\347\240\201\346\230\216\347\273\206/Kf_BarCodeDetailQuery.html"
@@ -335,13 +335,13 @@
col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: data1.list[key].ColmCols, width: 200, align: 'center', hide: true };
}
else if (data1.list[key].ColmCols == "HMaterialJQty") {
- col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "閲嶉噺_缁存姢", width: 200, align: 'center',edit:true};
+ col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "閲嶉噺缁存姢", width: 200, align: 'center',edit:true};
}
else if (data1.list[key].ColmCols == "HWeight_TL") {
- col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "鎶曟枡鍏嬮噸_缁存姢", width: 200, align: 'center',edit: true };
+ col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "鎶曟枡鍏嬮噸缁存姢", width: 200, align: 'center',edit: true };
}
else if (data1.list[key].ColmCols == "HWeight_CP") {
- col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "瀹為檯鍏嬮噸_缁存姢", width: 200, align: 'center',edit: true };
+ col[1 + parseInt(key)] = { field: data1.list[key].ColmCols, title: "瀹為檯鍏嬮噸缁存姢", width: 200, align: 'center',edit: true };
}
else {
switch (data1.list[key].ColmCols) {
@@ -593,10 +593,11 @@
}
//鎶曟枡鍏嬮噸鏍煎紡鏍￠獙
temp = option.data[i]["HWeight_TL"] + "";
- if (temp == "0") {
- layer.msg("绗�" + (i + 1) + "琛岋細鎶曟枡鍏嬮噸_缁存姢 涓嶈兘涓�0锛�");
- return false;
- } else if (!ref.test(temp)) {
+ //if (temp == "0") {
+ // layer.msg("绗�" + (i + 1) + "琛岋細鎶曟枡鍏嬮噸_缁存姢 涓嶈兘涓�0锛�");
+ // return false;
+ //} else
+ if (!ref.test(temp)) {
layer.msg("绗�" + (i + 1) + "琛岋細鎶曟枡鍏嬮噸_缁存姢 璇疯緭鍏ュぇ浜�0鐨勬暟瀛楋紒");
return false;
}
--
Gitblit v1.9.1