Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

chenhaozhe

2026-04-03 94ef041d8aabf252b019bf8de8d02b55b5e0d4ac

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

 .hbuilderx/launch.json

@@ -18,7 +18,7 @@
        },
        {
            "openVueDevtools" : true,
            "playground" : "custom",
            "playground" : "standard",
            "type" : "uni-app:app-ios"
        },
        {

 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"]
                            }
                        })

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast.vue

@@ -590,6 +590,13 @@
                        count
                    } = res.data
                    if (count == 1) {
                        if (data[0].HCheckDate == null){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: `该单据未审核`
                            })
                            return
                        }
                        this.materialManifest = data
                        this.tabs = 1
                    } else {

 pages/ZLGL/lailiaojianyan_fast/Kf_QCStockInCheckBill_Fast2.vue

@@ -518,6 +518,13 @@
                        count
                    } = res.data
                    if (count == 1) {
                        if (data[0].HCheckDate == null){
                            CommonUtils.showTips({
                                title: '温馨提示',
                                message: `该单据未审核`
                            })
                            return
                        }
                        this.sourceBillInfo.HSourceInterID = data[0].HSourceInterID
                        this.sourceBillInfo.HSourceBillType = '1103'
                        this.materialManifest = data