From 94ef041d8aabf252b019bf8de8d02b55b5e0d4ac Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 03 四月 2026 09:05:32 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
index 454e164..7549121 100644
--- a/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
+++ b/pages/MJGL/SB_EquipICMOTechParamBill/SB_EquipICMOTechParamBillEdit.vue
@@ -1040,8 +1040,15 @@
"HMax": item["涓婇檺鍊�"],
"HMin": item["涓嬮檺鍊�"],
"HRemark": item["閲囬泦鏉ユ簮"],
- "HResult": (item["鏁伴噰鍊�"] <= item["涓婇檺鍊�"] && item["鏁伴噰鍊�"] >= item["涓嬮檺鍊�"]) ?
- "OK" : "NG",
+ HResult: (() => {
+ const val = Number(item["鏁伴噰鍊�"])
+ const min = Number(item["涓嬮檺鍊�"])
+ const max = Number(item["涓婇檺鍊�"])
+ if (isNaN(val) || isNaN(min) || isNaN(max)) {
+ return ""
+ }
+ return val >= min && val <= max ? "OK" : "NG"
+ })(),
"HIsRequired": item["HIsRequired"]
}
})
--
Gitblit v1.9.1