chenhaozhe
2026-01-28 44dbd6e411c82830e029143e0340edd6f7f1b2b8
修复 器具点检 保养 设备点检 保养 无法扫描条码的问题
10个文件已修改
9987 ■■■■ 已修改文件
manifest.json 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 4982 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shoujianjianyan/firstCheckBill.vue 4871 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue 88 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanrukushengdan/Kf_ProductInBill.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,9 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.0.63",
    "versionCode" : 263,
    "versionName" : "2.0.64",
    "versionCode" : 264,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -533,7 +533,7 @@
            },
            toScanCode() {
                MpaasScan.scanCode(cb => {
                    this.hfrom.HBarCode = cb
                    this.hform.HBarCode = cb
                    this.GetMessageByBarCode(cb)
                })
            },
@@ -624,7 +624,8 @@
                                "HDotCheckItemClassName": "",
                                "HDotCheckItemMethodID": 0,
                                "HDotCheckItemMethodName": "",
                                "HDotCheckResult": item.默认结论 == 1 ? true : false
                                //"HDotCheckResult": item.默认结论 == 1 ? true : false
                                "HDotCheckResult": item.默认点检结果 == 'OK' ? true : false
                            }
                        })
            
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -580,7 +580,7 @@
            },
            toScanCode() {
                MpaasScan.scanCode(cb => {
                    this.hfrom.HBarCode = cb
                    this.hform.HBarCode = cb
                    this.GetMessageByBarCode(cb)
                })
            },
@@ -674,8 +674,9 @@
                                "HRemark": "",
                                "HSourceInterID": item.保养计划ID,
                                "HSourceEntryID": item.保养计划子ID,
                                "HSourceBillNo": item.保养计划单
                            }
                                "HSourceBillNo": item.保养计划单,
                                "HMaintainResult": item.默认保养结果 == 'OK' ? true : false
                            }
                        })
                        this.enableEdit = false
pages/MJGL/mujubaoyangjiludan/Sc_MouldMaintainBill.vue
@@ -346,6 +346,11 @@
            }
        },
        methods: {
            addNew() {
              uni.redirectTo({
                  url: "./Sc_MouldMaintainBill?operationType=1"
              })
            },
            goBack() {
                uni.navigateBack()
            },
@@ -443,7 +448,7 @@
            },
            toScanCode() {
                MpaasScan.scanCode(cb => {
                    this.hfrom.HBarCode = cb
                    this.hform.HBarCode = cb
                    this.GetMessageByBarCode(cb)
                })
            },
@@ -513,8 +518,8 @@
                                "HManagerName": item.负责人名称,
                                "HSourceInterID": item.hmainid == null ? 0 : item.hmainid, // 需确认是否正确
                                "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID, // 需确认是否正确
                                "HSourceBillNo": item.单据号 // 需确认是否正确
                                "HSourceBillNo": item.单据号, // 需确认是否正确
                                "HMaintainResult": item.默认保养结果 == 'OK' ? true : false
                            }
                        })
@@ -608,7 +613,7 @@
                                    "HManagerCode": item.负责人代码 || "",
                                    "HManagerName": item.负责人名称 || "",
                                    "HMaintainResult": item.默认结论 == 1 ? true : false,
                                    "HRemark": item.表体备注 || ""
                                    "HRemark": item.表体备注 || "",
                                };
                            });
                        } else {
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -380,6 +380,11 @@
            }
        },
        methods: {
            addNew() {
              uni.redirectTo({
                  url: "./Sc_MouldDotCheckBill?operationType=1"
              })
            },
            goBack() {
                uni.navigateBack()
            },
@@ -509,7 +514,7 @@
            },
            toScanCode() {
                MpaasScan.scanCode(cb => {
                    this.hfrom.HBarCode = cb
                    this.hform.HBarCode = cb
                    this.GetMessageByBarCode(cb)
                })
            },
@@ -583,7 +588,8 @@
                                "HDotCheckItemClassName": item.点检项目分类名称 || "",
                                "HDotCheckItemMethodID": item.点检方法id || 0,
                                "HDotCheckItemMethodName": item.点检方法 || "",
                                "HDotCheckResult": item.默认结论 == 1 ? true : false
                                // "HDotCheckResult": item.默认结论 == 1 ? true : false
                                "HDotCheckResult": item.默认点检结果 == 'OK' ? true : false
                            }
                        })
                        this.tabs = 1
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
Diff too large
pages/ZLGL/shoujianjianyan/firstCheckBill.vue
Diff too large
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -1707,6 +1707,22 @@
                return true;
            },
            async auditBill() {
                let res = await CommonUtils.doRequest2Async({
                    url: "/QC_PatrolProcCheckOtherBill/AuditQC_PatrolProcCheckOtherBill",
                    data: {
                        HInterID: this.hform.HInterID,
                        type: 1,
                        user: getUserInfo()['Czymc']
                    }
                })
                if (res.data.count == 1) {
                    return true
                } else {
                    return false
                }
            },
            async submit() {
                if (!this.checkSubmitValidate()) {
                    return;
@@ -1757,26 +1773,58 @@
                    let {
                        count,
                        Message,
                        data
                        data,
                        Verify = 'N'
                    } = res.data;
                    if (count == 1) {
                        uni.showModal({
                            title: "提示",
                            content: res.data.Message + "。是否继续新增?",
                            success: (res) => {
                                if (res.confirm) {
                                    console.log("用户点击确定");
                                    uni.redirectTo({
                                        url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
                                    });
                                } else if (res.cancel) {
                                    console.log("用户点击取消");
                                    setTimeout(() => {
                                        uni.navigateBack();
                                    }, 50)
                                }
                            },
                        });
                        if (Verify == 'Y') {
                            let AuditSuccess = await this.auditBill()
                            if (AuditSuccess) {
                                console.log("审核成功");
                                uni.showModal({
                                    title: "提示",
                                    content: res.data.Message + "。是否继续新增?",
                                    success: (res) => {
                                        if (res.confirm) {
                                            console.log("用户点击确定");
                                            uni.redirectTo({
                                                url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
                                            });
                                        } else if (res.cancel) {
                                            console.log("用户点击取消");
                                            setTimeout(() => {
                                                uni.navigateBack();
                                            }, 50)
                                        }
                                    },
                                });
                            } else {
                                uni.showToast({
                                    icon: 'none',
                                    title: '审核失败'
                                })
                            }
                        } else {
                            uni.showModal({
                                title: "提示",
                                content: res.data.Message + "。是否继续新增?",
                                success: (res) => {
                                    if (res.confirm) {
                                        console.log("用户点击确定");
                                        uni.redirectTo({
                                            url: "/pages/ZLGL/xunjianjianyan/PatrolProcCheckBill?operationType=1",
                                        });
                                    } else if (res.cancel) {
                                        console.log("用户点击取消");
                                        setTimeout(() => {
                                            uni.navigateBack();
                                        }, 50)
                                    }
                                },
                            });
                        }
                    } else {
                        CommonUtils.showTips({
                            title: "温馨提示",
@@ -2027,11 +2075,11 @@
                if (e.HSouceBillType == "7521") {
                    await this.LoadingInformation_TakeSampleCheckBill(e.linterid);
                    await this.$nextTick()
                    if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                    // if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                        this.HSourceBillType = "取样单"; // 显示名称
                        this.hform.HSourceBillType = "7521"; // 对应的值
                        this.hform.HSourceBillNo = e.HBillNo
                    }
                    // }
                    this.hform.HTakeSampleCheckBillNo = e.HBillNo;
                    this.hform.HTakeSampleCheckBillID = e.linterid;
pages/index/login.vue
@@ -127,7 +127,7 @@
                    "宁波华舟包装2": "http://192.168.88.167:8082/API_NW/",
                    "宁波华舟包装": "http://61.164.64.222:8082/API_WW/",
                },
                serverUrlName: uni.getStorageSync('serverUrlName') || '宁波华舟包装',
                serverUrlName: uni.getStorageSync('serverUrlName') || '宁波四维尔-外网',
                arrayOrganization: [],
                Organization: '',
pages/shengchanrukushengdan/Kf_ProductInBill.vue
@@ -368,9 +368,9 @@
                    HBillNo: '',
                    HInterID: '',
                    HKeeperName: getUserInfo().HKeeper,
                    HKeeperName: getUserInfo().HKeeperName,
                    HKeeperID: getUserInfo().HKeeperID,
                    HSecManagerName: getUserInfo().HSecManager,
                    HSecManagerName: getUserInfo().HSecManagerName,
                    HSecManagerID: getUserInfo().HSecManagerID,
                    HDeptName: getUserInfo().HDept,
                    HDeptID: getUserInfo().HDeptID,