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

chenhaozhe

2026-03-13 b7b47130b76637898f76197a2d0eaa29f5f73ff3

 pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue

@@ -295,8 +295,8 @@

            hform: {
               HBarCode: "",
               HBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
               HEndDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
               HBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
               HEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
               HQty: 0,
               HErrNote: "",
               HBigSafeNote: "",
@@ -304,7 +304,7 @@
               HShiftsID: 0,
               HBillNo: "",
               HInterID: 0,
               HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
               HDate: dayjs(new Date()).format("YYYY-MM-DD"),
               HDeptName: getUserInfo().HDeptName,
               HDeptID: getUserInfo().HDeptID,
               HRemark: "",
@@ -395,7 +395,7 @@

                  this.HCheckFileList = Array.from(data).map(item => {
                     return {
                        "HMaintainResult": item.默认结论 == 1 ? true : false,
                        "HMaintainResult": item.默认保养结果 == 'OK' ? true : false,
                        "HMaintainItemID": item.HMaintainItemID,
                        "HMaintainNumber": item.保养项目代码,
                        "HMaintainItem": item.保养项目,
@@ -580,7 +580,7 @@
         },
         toScanCode() {
            MpaasScan.scanCode(cb => {
               this.hfrom.HBarCode = cb
               this.hform.HBarCode = cb
               this.GetMessageByBarCode(cb)
            })
         },
@@ -662,7 +662,7 @@

                  this.HCheckFileList = Array.from(data).map(item => {
                     return {
                        "HMaintainResult": item.默认结论 == 1 ? true : false,
                        // "HMaintainResult": item.默认结论 == 1 ? true : false,
                        "HMaintainItemID": item.保养项目ID,
                        "HMaintainNumber": item.保养项目代码,
                        "HMaintainItem": item.保养项目名称,
@@ -674,8 +674,9 @@
                        "HRemark": "",
                        "HSourceInterID": item.保养计划ID,
                        "HSourceEntryID": item.保养计划子ID,
                        "HSourceBillNo": item.保养计划单
                     }
                        "HSourceBillNo": item.保养计划单,
                                "HMaintainResult": item.默认保养结果 == 'OK' ? true : false
                            }
                  })

                  this.enableEdit = false
@@ -803,8 +804,10 @@
            // 编辑

         } else if (this.operationType == 4) {
            // 浏览

            // 下推
                let HBarCode = e.HBarCode
                this.getMaxNum()
                this.GetMessageByBarCode(HBarCode)
         }

         this.getHDeptList()