chenhaozhe
2026-01-21 975e5fdae1f4ce0a4bd7cb1c1544a025540618aa
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
# pages/index/tab3.vue
30个文件已修改
4 文件已重命名
1597 ■■■■ 已修改文件
pages.json 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue 156 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue 117 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue 193 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue 58 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue 53 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/shangmudan/MouldUpperBill.vue 157 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/MJGL/xiamodan/MouldLowerBill.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue 68 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/shoujianjianyan/firstCheckBill.vue 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/baogong/OA_ErrMsgBackBill.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/login.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab2.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab3.vue 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/index/tab4.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages.json
@@ -230,13 +230,13 @@
                "enablePullDownRefresh": true
            }
        },
        // {
        //     "path": "pages/baogong/OA_ErrMsgBackBill",
        //     "style": {
        //         "navigationBarTitleText": "异常反馈单",
        //         "enablePullDownRefresh": false
        //     }
        // },
        {
            "path": "pages/baogong/OA_ErrMsgBackBill",
            "style": {
                "navigationBarTitleText": "异常反馈单",
                "enablePullDownRefresh": false
            }
        },
        {
            "path": "pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBillList",
            "style": {
@@ -1248,29 +1248,29 @@
            }
        },
        {
            "path": "pages/weixiujilu/mouldRepairRecordBillList",
            "path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
            "style": {
                "navigationBarTitleText": "模具维修记录",
                "navigationBarTitleText": "模具维修记录单列表",
                "enablePullDownRefresh": true
            }
        },
        {
            "path": "pages/weixiujilu/mouldRepairRecordBill",
            "path": "pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill",
            "style": {
                "navigationBarTitleText": "模具维修记录单"
            }
        },
        {
            "path": "pages/qijvguzhangdengji/mouldMistake",
            "path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill",
            "style": {
                "navigationBarTitleText": "模具故障登记"
                "navigationBarTitleText": "模具故障登记单"
            }
        },
        {
            "path": "pages/qijvguzhangdengji/mouldMistakeBill",
            "path": "pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
            "style": {
                "navigationBarTitleText": "模具故障登记单"
                "navigationBarTitleText": "模具故障登记单列表"
            }
        },
        {
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill.vue
@@ -251,14 +251,14 @@
                    "HMainSourceInterID": 0,
                    "HMainSourceEntryID": 0,
                    "HCheckResult": "OK",
                    "HEmpName": "",
                    "HEmpID": 0,
                    "HEmpName": getUserInfo().HEmpName,
                    "HEmpID": getUserInfo().HEmpID,
                    "HCheckBeginDate": dayjs(new Date()).format("YYYY-MM-DD"),
                    "HDeptName": "",
                    "HDeptID": 0,
                    "HDeptName": getUserInfo().HDeptName,
                    "HDeptID": getUserInfo().HDeptID,
                    "HMainSourceBillNo": "",
                    "HManagerName": "",
                    "HManagerID": 0,
                    "HManagerName": getUserInfo().HManagerName,
                    "HManagerID": getUserInfo().HManagerID,
                    "HMouldRepairWorkName": "",
                    "HMouldRepairWorkID": 0,
                    "HExplanation": "",
@@ -338,7 +338,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: './Sb_MouldRepairCheckBill?operationType=1'
                    url: './Sc_MouldRepairCheckBill?operationType=1'
                })
            },
            goBack() {
@@ -350,89 +350,6 @@
                    this.HCheckFileList[index]["HDotCheckResult"] = false
                } else {
                    this.HCheckFileList[index]["HDotCheckResult"] = true
                }
            },
            uploadFile(index) {
                console.log('filePath: ', this.attachmentInfo[index].filePath);
                // 通过临时路径读取文件
                uni.uploadFile({
                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
                    filePath: this.attachmentInfo[index].filePath,
                    name: 'file',
                    formData: {
                        HBillNo: this.hform.HBillNo,
                        HRemark: "",
                        HUserName: getUserInfo()["Czymc"]
                    },
                    success: (uploadRes) => {
                        CommonUtils.showTips({
                            message: "上传成功"
                        })
                        this.attachmentInfo[index].status = "上传成功"
                    },
                    fail: (err) => {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `上传失败: ${err}`
                        })
                    }
                })
            },
            delFile(index) {
                console.log('attachmentInfo: ', this.attachmentInfo[index]);
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 " ' + this.attachmentInfo[index].fileName + ' " 删除后将不可恢复!',
                    success: (res) => {
                        if (res.confirm) {
                            this.attachmentInfo.splice(index, 1)
                        }
                    },
                })
            },
            handleUploadCallback(res) { // 文件上传回调
                console.log('file: ', res);
                let fileInfo = res.data[0]
                this.attachmentInfo.push({
                    fileName: fileInfo.name,
                    size: fileInfo.size,
                    status: '等待上传',
                    filePath: fileInfo.tempFilePath
                })
            },
            // 上传文件
            fileUpload() {
                this.$refs.XeUpload.upload('file', {});
            },
            //获取班次数据
            async getShiftList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetGy_ShiftsList_Json',
                        data: {
                            Shifts: "",
                        }
                    })
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count == 1) {
                        this.HShiftsList = data
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: Message
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: err
                    })
                }
            },
            //获取使用部门数据
@@ -574,65 +491,6 @@
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: err
                    })
                }
            },
            async GetItemByEquipFile() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Web/GetItemByEquipFile",
                        data: {
                            "EquipProjectID": this.hform.HEquipID,
                            "Type": "DJ",
                            "HDate": this.hform.HBeginDate
                        }
                    })
                    let {
                        data,
                        Message,
                        count
                    } = res.data
                    if (count == 1) {
                        this.hform.HEquipDotCheckRuleInterID = data[0].点检规程ID
                        this.hform.HEquipDotCheckRuleInterNo = data[0].点检规程单号
                        this.hform.HPlanNo = data[0].点检计划单
                        this.hform.HPlanInterID = (data[0].点检计划ID == null ? 0 : data[0].点检计划ID) == "" ? 0 : data[0]
                            .点检计划ID
                        this.hform.HPlanEntryID = (data[0].点检计划子ID == null ? 0 : data[0].点检计划子ID) == "" ? 0 : data[
                            0].点检计划子ID
                        this.HCheckFileList = Array.from(data).map(item => {
                            return {
                                "HDotCheckItemID": item.HDotCheckItemID,
                                "HDotCheckCode": item.点检项目代码,
                                "HDotCheckItem": item.点检项目,
                                "HDotCheckPart": item.点检部位,
                                "HClaim": item.具体要求,
                                "HManagerID": item.负责人ID,
                                "HManagerCode": item.负责人代码,
                                "HManagerName": item.负责人名称,
                                "HSourceInterID": item.点检计划ID == null ? 0 : item.点检计划ID,
                                "HSourceEntryID": item.点检计划子ID == null ? 0 : item.点检计划子ID,
                                "HSourceBillNo": item.点检计划单,
                                "HDotCheckItemClassID": 0,
                                "HDotCheckItemClassName": "",
                                "HDotCheckItemMethodID": 0,
                                "HDotCheckItemMethodName": "",
                                "HDotCheckResult": item.默认结论 == 1 ? true : false
                            }
                        })
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `获取点检规程错误: ${Message}`
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `获取点检规程错误: ${err}`
                    })
                }
            },
pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBillList.vue
@@ -148,7 +148,7 @@
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/Web/GetMouldBillsList',
                MvarReportTitle: '模具维修检验单缓存',
                MvarReportTitle: '模具维修检验单列表',
                hform: {
                    HBillNo: '',
                    HSourceBillNo: '',
@@ -182,8 +182,7 @@
            }
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)
            console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
@@ -224,30 +223,7 @@
                await this.$nextTick()
                this.$refs.barcodePopup.open()
            },
            CheckModRight() {
                uni.request({
                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
                    data: {
                        ModRightName: 'CE_OtherOut',
                        HUserName: uni.getStorageSync('HUserName')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {} else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            onPaginationChangeHandler({
                current
            }) {
@@ -268,9 +244,7 @@
                if (this.tabs == 0) {
                    this.urls = '/Web/GetMouldBillsList'
                }
                // if (this.tabs == 1) {
                //     this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
                // }
                this.search()
            },
            async getList() {
@@ -297,13 +271,13 @@
                    } else {
                        CommonUtils.showTips({
                            title: "温馨提示",
                            message: `获取设备点检记录单失败: ${Message}`
                            message: `获取模具维修验收单失败: ${Message}`
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: `获取设备点检记录单失败: ${err}`
                        message: `获取模具维修验收单失败: ${err}`
                    })
                }
@@ -345,43 +319,10 @@
            },
            add() {
                uni.navigateTo({
                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
                    url: '/pages/MJGL/SC_MouldRepairCheck/Sc_MouldRepairCheckBill?operationType=1'
                })
            },
            //编辑
            edit(item) {
                console.log(item)
                uni.request({
                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
                    data: {
                        "HInterID": item.HInterID,
                        "HBillNo": item.单据号,
                        "HBillType": this.hform.HBillType
                    },
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            uni.navigateTo({
                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
                            })
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.hideLoading()
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                })
            },
            //删除
            del(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
@@ -422,51 +363,7 @@
                        }
                    }
                });
            },
            //撤销
            revoke(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '是否确认撤销',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    HBillNo: item.单据号,
                                    HBillType: this.hform.HBillType,
                                    HMaker: uni.getStorageSync('HUserName'),
                                    MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
        }
    }
</script>
pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue
@@ -216,12 +216,12 @@
                    HBillNo: "",
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HDeptName: "",
                    HDeptID: 0,
                    HEmpName: "",
                    HEmpID: 0,
                    HManagerName: "",
                    HManagerID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HEmpName: getUserInfo().HEmpName,
                    HEmpID: getUserInfo().HEmpID,
                    HManagerName: getUserInfo().HManagerName,
                    HManagerID: getUserInfo().HManagerID,
                    HBarName: "",
                    HEquipID: 0,
                    HBarSpec: "",
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill.vue
@@ -332,8 +332,8 @@
                    HBillNo: "",
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HDeptName: "",
                    HDeptID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HRemark: "",
                    HBarName: "",
                    HEquipID: 0,
@@ -472,10 +472,11 @@
            async getShiftList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetGy_ShiftsList_Json',
                        url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                        data: {
                            Shifts: "",
                        }
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        },
                    })
                    let {
@@ -670,7 +671,7 @@
                            return {
                                "HDotCheckItemID": item.HDotCheckItemID,
                                "HDotCheckCode": item.点检项目代码,
                                "HDotCheckItem": item.点检项目,
                                "HDotCheckItem": item.点检项目名称,
                                "HDotCheckPart": item.点检部位,
                                "HClaim": item.具体要求,
                                "HManagerID": item.负责人ID,
pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBillList.vue
@@ -145,7 +145,7 @@
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/Web/GetEquipmentBillsList',
                MvarReportTitle: '设备点检记录单缓存',
                MvarReportTitle: '设备点检记录单列表',
                showmore: false,
                hform: {
                    HBillNo: '',
@@ -172,8 +172,6 @@
            }
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)
            console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
@@ -188,12 +186,6 @@
            }
        },
        // onPullDownRefresh: function() {
        //     this.clear()
        //     setTimeout(() => {
        //         uni.stopPullDownRefresh();
        //     }, 1000);
        // },
        onReady() {
            this.getCalcHeight()
        },
@@ -224,30 +216,6 @@
                await this.$nextTick()
                this.$refs.barcodePopup.open()
            },
            CheckModRight() {
                uni.request({
                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
                    data: {
                        ModRightName: 'CE_OtherOut',
                        HUserName: uni.getStorageSync('HUserName')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {} else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            onPaginationChangeHandler({
                current
            }) {
@@ -268,9 +236,6 @@
                if (this.tabs == 0) {
                    this.urls = '/Web/GetEquipmentBillsList'
                }
                // if (this.tabs == 1) {
                //     this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
                // }
                this.search()
            },
            async getList() {
@@ -343,43 +308,9 @@
                }
                this.search()
            },
            add() {
            creat() {
                uni.navigateTo({
                    url: '/pages/MJGL/Sb_EquipDotCheckBill/Sb_EquipDotCheckBill?operationType=1'
                })
            },
            //编辑
            edit(item) {
                console.log(item)
                uni.request({
                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
                    data: {
                        "HInterID": item.HInterID,
                        "HBillNo": item.单据号,
                        "HBillType": this.hform.HBillType
                    },
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            uni.navigateTo({
                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
                            })
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.hideLoading()
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                })
            },
            //删除
@@ -422,51 +353,7 @@
                        }
                    }
                });
            },
            //撤销
            revoke(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '是否确认撤销',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    HBillNo: item.单据号,
                                    HBillType: this.hform.HBillType,
                                    HMaker: uni.getStorageSync('HUserName'),
                                    MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
        }
    }
</script>
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill.vue
@@ -305,8 +305,8 @@
                    HBillNo: "",
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HDeptName: "",
                    HDeptID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HRemark: "",
                    HBarName: "",
                    HEquipID: 0,
@@ -519,9 +519,10 @@
            async getShiftList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetGy_ShiftsList_Json',
                        url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                        data: {
                            Shifts: "",
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        }
                    })
pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBillList.vue
@@ -144,7 +144,7 @@
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/Web/GetEquipmentBillsList',
                MvarReportTitle: '设备点检记录单缓存',
                MvarReportTitle: '设备点检记录单列表',
                hform: {
                    HBillNo: '',
                    HSourceBillNo: '',
@@ -178,8 +178,6 @@
            }
        },
        onShow() {
            //用户模块权限判断
            this.CheckModRight()
            this.changeTab(0)
            console.log(this.userInfo, uni.getStorageSync('HUserName'))
        },
@@ -220,30 +218,6 @@
                await this.$nextTick()
                this.$refs.barcodePopup.open()
            },
            CheckModRight() {
                uni.request({
                    url: this.serverUrl + '/WEBSController/CheckModRight_Json',
                    data: {
                        ModRightName: 'CE_OtherOut',
                        HUserName: uni.getStorageSync('HUserName')
                    },
                    success: (res) => {
                        if (res.data.count == 1) {} else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            onPaginationChangeHandler({
                current
            }) {
@@ -264,9 +238,6 @@
                if (this.tabs == 0) {
                    this.urls = '/Web/GetEquipmentBillsList'
                }
                // if (this.tabs == 1) {
                //     this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
                // }
                this.search()
            },
            async getList() {
@@ -344,40 +315,6 @@
                    url: '/pages/MJGL/Sb_EquipMaintainBill/Sb_EquipMaintainBill?operationType=1'
                })
            },
            //编辑
            edit(item) {
                console.log(item)
                uni.request({
                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
                    data: {
                        "HInterID": item.HInterID,
                        "HBillNo": item.单据号,
                        "HBillType": this.hform.HBillType
                    },
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            uni.navigateTo({
                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
                            })
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.hideLoading()
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                })
            },
            //删除
            del(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
@@ -418,51 +355,7 @@
                        }
                    }
                });
            },
            //撤销
            revoke(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '是否确认撤销',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    HBillNo: item.单据号,
                                    HBillType: this.hform.HBillType,
                                    HMaker: uni.getStorageSync('HUserName'),
                                    MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
        }
    }
</script>
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue
@@ -216,14 +216,14 @@
                    "HBillNo": "",
                    "HInterID": 0,
                    "HDate": dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    "HDeptName": "",
                    "HDeptID": 0,
                    "HEmpName": "",
                    "HEmpID": 0,
                    "HDeptName": getUserInfo().HDeptName,
                    "HDeptID": getUserInfo().HDeptID,
                    "HEmpName": getUserInfo().HEmpName,
                    "HEmpID": getUserInfo().HEmpID,
                    "HManagerName": getUserInfo().HManagerName,
                    "HManagerID": getUserInfo().HManagerID,
                    "HRepairCheckMainName": "",
                    "HRepairCheckMainID": 0,
                    "HManagerName": "",
                    "HManagerID": 0,
                    "HBarName": "",
                    "HEquipID": 0,
                    "HBarSpec": "",
pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBillList.vue
@@ -144,7 +144,7 @@
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/Web/GetEquipmentBillsList',
                MvarReportTitle: '设备点检记录单缓存',
                MvarReportTitle: '设备维修验收单列表',
                hform: {
                    HBillNo: '',
                    HSourceBillNo: '',
@@ -264,9 +264,6 @@
                if (this.tabs == 0) {
                    this.urls = '/Web/GetEquipmentBillsList'
                }
                // if (this.tabs == 1) {
                //     this.urls = '/WEBSController/GetKf_ICStockBillQueryList_User_Json'
                // }
                this.search()
            },
            async getList() {
@@ -293,13 +290,13 @@
                    } else {
                        CommonUtils.showTips({
                            title: "温馨提示",
                            message: `获取设备点检记录单失败: ${Message}`
                            message: `获取设备维修验收单失败: ${Message}`
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: `获取设备点检记录单失败: ${err}`
                        message: `获取设备维修验收单失败: ${err}`
                    })
                }
@@ -341,41 +338,7 @@
            },
            add() {
                uni.navigateTo({
                    url: '/pages/MJGL/Sb_EquipRepariCheckBill/Sb_EquipRepariCheckBill?operationType=1'
                })
            },
            //编辑
            edit(item) {
                console.log(item)
                uni.request({
                    url: this.serverUrl + '/WEBSController/TempList_Modify_Json',
                    data: {
                        "HInterID": item.HInterID,
                        "HBillNo": item.单据号,
                        "HBillType": this.hform.HBillType
                    },
                    success: (res) => {
                        console.log(1, res);
                        if (res.data.count == 1) {
                            uni.navigateTo({
                                url: './OtherOutBill?OperationType=2&HInterID=' + item.HInterID
                            })
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.hideLoading()
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                    url: '/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill?operationType=1'
                })
            },
            //删除
@@ -418,51 +381,7 @@
                        }
                    }
                });
            },
            //撤销
            revoke(item) {
                // console.log(item.hmainid,uni.getStorageSync('HUserName'))
                uni.showModal({
                    title: '提示',
                    content: '是否确认撤销',
                    success: (res) => {
                        if (res.confirm) {
                            console.log('用户点击确定');
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DeleteICStockBillAndWMS_Json',
                                data: {
                                    HInterID: item.HInterID,
                                    HBillNo: item.单据号,
                                    HBillType: this.hform.HBillType,
                                    HMaker: uni.getStorageSync('HUserName'),
                                    MvarReportTitle: this.MvarReportTitle,
                                },
                                success: (res) => {
                                    console.log(1, res);
                                    if (res.data.count == 1) {
                                        this.clear()
                                    }
                                    uni.showToast({
                                        title: res.data.Message,
                                        icon: 'none'
                                    })
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.hideLoading()
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        } else if (res.cancel) {
                            console.log('用户点击取消');
                        }
                    }
                });
            },
        }
    }
</script>
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -242,12 +242,12 @@
                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HInnerBillNo: '',
                    HRepairContent: '',
                    HDeptIDName: '',
                    HDeptID: 0,
                    HEmpIDName: '',
                    HEmpID: 0,
                    HManagerIDName: '',
                    HManagerID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HEmpName: getUserInfo().HEmpName,
                    HEmpID: getUserInfo().HEmpID,
                    HManagerName: getUserInfo().HManagerName,
                    HManagerID: getUserInfo().HManagerID,
                    HEquipIDName: '',
                    HEquipID: 0,
                    HRepairIDName: '',
@@ -255,7 +255,7 @@
                    HRepairPlanBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HRepairPlanEndDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HCycleUnit: '小时',
                    HPlanTimes: '',
                    HPlanTimes: '0',
                    HExplanation: '',
                    HRemark: '',
                    HMaker: getUserInfo()["Czymc"],
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBillList.vue
@@ -150,7 +150,7 @@
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                tabs: 0,
                urls: '/Web/GetEquipmentBillsList',
                MvarReportTitle: '设备维修派工单缓存',
                MvarReportTitle: '设备维修派工单列表',
                hform: {
                    HBillNo: '',
                    HSourceBillNo: '',
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill.vue
File was renamed from pages/qijvguzhangdengji/mouldMistakeBill.vue
@@ -169,8 +169,6 @@
                <button class="btn-c" size="mini" @tap="goBack">退出</button>
            </view>
        </view>
        <BarCodePopupVue ref="barcodePopup"></BarCodePopupVue>
        <BillListPopupMouldVue @BillSelectComplete="MouldBillHandler" ref="billListMould"></BillListPopupMouldVue>
    </view>
</template>
<script>
@@ -180,24 +178,10 @@
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '../../utils/common';
    import {
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import BillSelectPopupXiaoWeiVue from '../../components/BillSelectPopupXiaoWei/BillSelectPopupXiaoWei.vue';
    import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
    } from '../../../utils/common';
    import dayjs from 'dayjs';
    import { MpaasScan } from '../../utils/mpaasScan';
    import { MpaasScan } from '../../../utils/mpaasScan';
    export default {
        components: {
            BillListPopupVue,
            BarCodePopupVue,
            BillSelectPopupXiaoWeiVue,
            BillListPopupMouldVue,
        },
        data() {
            return {
                HSourceBillNoFocus: false,
@@ -288,7 +272,6 @@
            this.OperationType = e.OperationType
            if (e.HInterID) {
                this.HInterID_Temp = e.HInterID
                // this.btnType = 1
                this.RoadBillMain(e.HInterID)
                this.barCodeFocus = true
            } else {
@@ -599,109 +582,11 @@
                }
            },
            //物料信息
            DisBillEntryList() {
                uni.request({
                    url: this.serverUrl + '/WEBSController/GetBillEntryTmpList_Json',
                    data: {
                        HInterID: this.hform.HInterID,
                        HBillNo: this.hform.HBillNo,
                        HBillType: this.hform.HBillType,
                        HStockOrgID: this.hform.HStockOrgID
                    },
                    success: (res) => {
                        console.log('物料', res.data)
                        if (res.data.count == 1) {
                            var data = res.data.data
                            this.materMeta = data.BarCodeDetailslist
                            this.Materlist = data.Materlist
                            if (/兴达/.test(uni.getStorageSync("Organization"))) {
                                // 兴达客户 带出 仓库
                                console.log("兴达带出默认仓库")
                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
                            }
                            if (!data.BarCodeDetailslist[0].HBarCode) {
                                this.hform.HMaterName_B = ''
                                this.hform.HMaterModel_B = ''
                                this.hform.HBatchNo_B = ''
                                this.hform.HUnitName_B = ''
                                this.hform.HQty_B = ''
                                this.hform.HTMQty_B = ''
                                this.hform.HWHName_B = ''
                                this.hform.HSPName_B = ''
                            } else {
                                this.hform.HMaterName_B = data.BarCodeDetailslist[0].HMaterName
                                this.hform.HMaterModel_B = data.BarCodeDetailslist[0].HMaterModel
                                this.hform.HBatchNo_B = data.BarCodeDetailslist[0].HBatchNo
                                this.hform.HUnitName_B = data.BarCodeDetailslist[0].HUnitName
                                this.hform.HQty_B = data.BarCodeDetailslist[0].HQty
                                this.hform.HTMQty_B = data.BarCodeDetailslist[0].HTMQty
                                this.hform.HWHName_B = data.BarCodeDetailslist[0].HWHName
                                this.hform.HSPName_B = data.BarCodeDetailslist[0].HSPName
                            }
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            //删除物料码
            delMater(item) {
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 " ' + item.物料名称 + ' " 所有扫码记录?删除后将不可恢复!',
                    success: (res) => {
                        if (res.confirm) {
                            uni.request({
                                url: this.serverUrl +
                                    '/WEBSController/set_DelPonderationBillMain_Temp_InterIDAndSource_Json',
                                data: {
                                    HInterID: this.hform.HInterID,
                                    HMaterID: item.HMaterID,
                                    HAuxPropID: item.HAuxPropID,
                                    HMTONo: item.HMTONo,
                                    HSourceInterID: item.HSourceInterID,
                                    HSourceEntryID: item.HSourceEntryID,
                                    HBillType: this.hform.HBillType
                                },
                                success: (res) => {
                                    if (res.data.count == 1) {
                                        this.DisBillEntryList()
                                    } else {
                                        uni.showToast({
                                            title: res.data.Message,
                                            icon: 'none'
                                        })
                                    }
                                },
                                fail: (res) => {
                                    console.log(res);
                                    uni.showToast({
                                        title: '接口请求失败',
                                        icon: 'none'
                                    })
                                },
                            });
                        }
                    }
                });
            },
            // 新增回调
            addNew() {
                uni.redirectTo({
                    url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
                    url: '/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill?OperationType=1'
                })
            },
            //新增
@@ -732,66 +617,6 @@
                    },
                });
            },
            //修改回填数据
            RoadBillMain(HInterID) {
                uni.request({
                    url: this.serverUrl + '/WEBSController/GetSourceBill_Temp_Json',
                    data: {
                        HInterID: HInterID,
                        HBillType: this.hform.HBillType
                    },
                    success: (res) => {
                        console.log(33, res.data.data[0]);
                        if (res.data.count == 1) {
                            var data = res.data.data[0]
                            this.hform.HInterID = data.HInterID
                            this.hform.HBillNo = data.HBillNo
                            this.hform.HMainSourceBillType = data.HSourceBillType
                            this.hform.HSourceBillNo = data.HSourceBillNo
                            if (data.HSourceBillType == 1105) {
                                this.hform.HMainSourceBillType = 1105
                                this.HMainSourceBillType = '退料通知单'
                                this.showHSupName = false
                            } else if (data.HSourceBillType == 1102) {
                                this.hform.HMainSourceBillType = 1102
                                this.HMainSourceBillType = '采购订单'
                                this.showHSupName = false
                            } else if (data.HSourceBillType == 1201) {
                                this.hform.HMainSourceBillType = 1201
                                this.HMainSourceBillType = '采购入库单'
                                this.showHSupName = false
                            } else {
                                this.hform.HMainSourceBillType = -1
                                this.HMainSourceBillType = '手工录入'
                            }
                            this.showHMainSourceBillType = false
                            //非多源单模式
                            if (data.HMulSourceBill == 0) {
                                this.showHSourceBillNo = false
                            }
                            this.hform.HDeptID = data.HDeptID
                            this.hform.HDeptName = data.HDeptName
                            this.hform.HSupID = data.HCusID
                            this.hform.HSupName = data.HSupName
                            this.DisBillEntryList()
                            this.tabs = 2
                        } else {
                            uni.showToast({
                                title: '获取数据回填失败',
                                icon: 'none'
                            })
                        }
                    },
                    fail: (res) => {
                        console.log(res);
                        uni.showToast({
                            title: '接口请求失败',
                            icon: 'none'
                        })
                    },
                });
            },
            checkBillValidate() {
                let message = ''
@@ -804,10 +629,6 @@
                } else if (!this.hform.HEmpName) {
                    message = '未填写发现人'
                } 
                // else if (!this.hform.HManagerName) {
    //                 message = '未填写负责人'
    //             }
                if (!message) {
                    return true
                }
@@ -859,13 +680,13 @@
                                if (res.confirm) {
                                    console.log('用户点击确定');
                                    uni.redirectTo({
                                        url: '/pages/qijvguzhangdengji/mouldMistakeBill?OperationType=1'
                                        url: '/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?OperationType=1'
                                    })
                                } else if (res.cancel) {
                                    console.log('用户点击取消');
                                    // setTimeout(() => {
                                    //     uni.navigateBack();
                                    // }, 50)
                                    setTimeout(() => {
                                        uni.navigateBack();
                                    }, 50)
                                }
                            }
                        });
pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList.vue
File was renamed from pages/qijvguzhangdengji/mouldMistake.vue
@@ -203,10 +203,10 @@
<script>
    import {
        CommonUtils
    } from '../../utils/common'
    } from '../../../utils/common'
    import {
        getUserInfo
    } from '../../utils/auth'
    } from '../../../utils/auth'
    import dayjs, {
        Dayjs
    } from 'dayjs'
@@ -256,7 +256,7 @@
            },
            cmdAdd() {
                uni.navigateTo({
                    url: "/pages/qijvguzhangdengji/mouldMistakeBill?operationType=1"
                    url: "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBill?operationType=1"
                })
            },
            async cmdSearch() {
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -251,7 +251,6 @@
            <button class="btn-a" size="mini" @tap="addNew">新增</button>
            <button class="btn-c" size="mini" @tap="goBack">退出</button>
        </view>
        <!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
    </view>
</template>
@@ -299,12 +298,12 @@
                    "HCycleUnit": "小时",
                    "MouldHName": "",
                    "MouldHModel": "",
                    "HDeptIDName": "",
                    "HDeptID": "0",
                    "HManagerIDName": "",
                    "HManagerID": "0",
                    "HEmpIDName": "",
                    "HEmpID": "0",
                    "HDeptName": getUserInfo()["HDeptName"],
                    "HDeptID": getUserInfo()["HDeptID"],
                    "HEmpName": getUserInfo().HEmpName,
                    "HEmpID": getUserInfo().HEmpID,
                    "HManagerName": getUserInfo().HSecManager,
                    "HManagerID": getUserInfo().HSecManagerID,
                    "HRepairBeginDate": dayjs(new Date()).format('YYYY-MM-DD'),
                    "HMainSourceBillType": "",
                    "HMainSourceInterID": "0",
@@ -447,7 +446,7 @@
            },
            addNew() {
                uni.redirectTo({
                    url: './Sb_EquipRepairSendWorkBill?operationType=1'
                    url: './Sc_MouldRepairSendWorkBill?operationType=1'
                })
            },
            goBack() {
@@ -459,89 +458,6 @@
                    this.HCheckFileList[index]["HDotCheckResult"] = false
                } else {
                    this.HCheckFileList[index]["HDotCheckResult"] = true
                }
            },
            uploadFile(index) {
                console.log('filePath: ', this.attachmentInfo[index].filePath);
                // 通过临时路径读取文件
                uni.uploadFile({
                    url: CommonUtils.getServerUrl() + "/Sb_EquipDotCheckBill/UploadFile",
                    filePath: this.attachmentInfo[index].filePath,
                    name: 'file',
                    formData: {
                        HBillNo: this.hform.HBillNo,
                        HRemark: "",
                        HUserName: getUserInfo()["Czymc"]
                    },
                    success: (uploadRes) => {
                        CommonUtils.showTips({
                            message: "上传成功"
                        })
                        this.attachmentInfo[index].status = "上传成功"
                    },
                    fail: (err) => {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `上传失败: ${err}`
                        })
                    }
                })
            },
            delFile(index) {
                console.log('attachmentInfo: ', this.attachmentInfo[index]);
                uni.showModal({
                    title: '提示',
                    content: '确认要删除 " ' + this.attachmentInfo[index].fileName + ' " 删除后将不可恢复!',
                    success: (res) => {
                        if (res.confirm) {
                            this.attachmentInfo.splice(index, 1)
                        }
                    },
                })
            },
            handleUploadCallback(res) { // 文件上传回调
                console.log('file: ', res);
                let fileInfo = res.data[0]
                this.attachmentInfo.push({
                    fileName: fileInfo.name,
                    size: fileInfo.size,
                    status: '等待上传',
                    filePath: fileInfo.tempFilePath
                })
            },
            // 上传文件
            fileUpload() {
                this.$refs.XeUpload.upload('file', {});
            },
            //获取班次数据
            async getShiftList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetGy_ShiftsList_Json',
                        data: {
                            Shifts: "",
                        }
                    })
                    let {
                        data,
                        count,
                        Message
                    } = res.data
                    if (count == 1) {
                        this.HShiftsList = data
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: Message
                        })
                    }
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: err
                    })
                }
            },
            //获取使用部门数据
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill.vue
File was renamed from pages/weixiujilu/mouldRepairRecordBill.vue
@@ -271,13 +271,13 @@
    } from "@/utils/auth.js";
    import {
        CommonUtils
    } from '../../utils/common';
    } from '../../../utils/common';
    import {
        getUserStockRelation
    } from '../../utils/userRelationManager';
    import BillListPopupMouldConkBookBillVue from '../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
    import BarCodePopupVue from "../../components/BarCodePopup/BarCodePopup.vue";
    import BillListPopupMouldVue from '../../components/BillListPopup/BillListPopup_Mould.vue';
    } from '../../../utils/userRelationManager';
    import BillListPopupMouldConkBookBillVue from '../../../components/BillListPopup/BillListPopupMouldConkBookBill.vue';
    import BarCodePopupVue from "../../../components/BarCodePopup/BarCodePopup.vue";
    import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
    import dayjs from 'dayjs';
    export default {
        components: {
pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList.vue
File was renamed from pages/weixiujilu/mouldRepairRecordBillList.vue
@@ -195,10 +195,10 @@
<script>
    import {
        CommonUtils
    } from '../../utils/common'
    } from '../../../utils/common'
    import {
        getUserInfo
    } from '../../utils/auth'
    } from '../../../utils/auth'
    import dayjs, {
        Dayjs
    } from 'dayjs'
@@ -247,7 +247,7 @@
            },
            cmdAdd() {
                uni.navigateTo({
                    url: "/pages/weixiujilu/mouldRepairRecordBill?operationType=1"
                    url: "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBill?operationType=1"
                })
            },
            async cmdSearch() {
@@ -361,12 +361,6 @@
            },
            edit(item) {
                console.log("editItem:", item)
                uni.navigateTo({
                    url: `/pages/weixiujilu/mouldRepairRecordBill?operationType=2&linterid=${item.hmainid}&hsubid=${item.hsubid}`
                })
            }
        },
        onLoad() {
pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue
@@ -346,8 +346,8 @@
                    HBillNo: "",
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HDeptName: "",
                    HDeptID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HRemark: "",
                    HBarName: "",
                    HMouldID: 0,
@@ -448,10 +448,11 @@
            async getShiftList() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: '/Web/GetGy_ShiftsList_Json',
                        url: '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                        data: {
                            Shifts: "",
                        }
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        },
                    })
                    let {
@@ -558,16 +559,16 @@
                        count
                    } = res.data
                    if (count == 1) {
                        this.hform.HMouldDotCheckRuleID = data[0].HMouldDotCheckRuleID
                        this.hform.HMouldDotCheckRuleNo = data[0].HMouldDotCheckRuleNo
                        this.hform.HMouldDotCheckRuleNo = data[0].HBillNo
                        this.hform.HMouldDotCheckRuleID = data[0].HInterID
                        this.hform.HPlanNo = data[0].单据号
                        this.hform.HPlanInterID = (data[0].hmainid == null ? 0 : data[0].hmainid) == "" ? 0 : data[0].hmainid
                        this.hform.HPlanEntryID = (data[0].HEntryID == null ? 0 : data[0].HEntryID) == "" ? 0 : data[0].HEntryID
                        this.HCheckFileList = Array.from(data).map(item => {
                            return {
                                "HDotCheckItemID": item.点检项目ID,
                                "HDotCheckItem": item.点检项目名称,
                                "HDotCheckItemID": item.HDotCheckItemID,
                                "HDotCheckItem": item.点检项目,
                                "HDotCheckPart": item.点检部位,
                                "HClaim": item.具体要求,
                                "HManagerID": item.负责人ID,
@@ -575,8 +576,8 @@
                                "HSourceInterID": item.hmainid == null ? 0 : item.hmainid,
                                "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID,
                                "HSourceBillNo": item.单据号,
                                "HDotCheckItemClassID": item.点检项目分类id || 0,
                                "HDotCheckItemClassName": item.点检项目分类 || "",
                                "HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
                                "HDotCheckItemClassName": item.点检项目分类名称 || "",
                                "HDotCheckItemMethodID": item.点检方法id || 0,
                                "HDotCheckItemMethodName": item.点检方法 || "",
                                "HDotCheckResult": item.默认结论 == 1 ? true : false
pages/MJGL/mujulingliaochukudan/MouldProdOutBill.vue
@@ -4,7 +4,8 @@
            <view class="form-item">
                <view class="title">条码</view>
                <view class="right" style="width: 350rpx;">
                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="请扫描(或输入)条码" @confirm="getCode(hform.HBarCode)"/>
                    <input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="请扫描(或输入)条码"
                        @confirm="getCode(hform.HBarCode)" />
                </view>
                <uni-icons type="scan"
                    style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;"
@@ -33,8 +34,8 @@
                        v-model="hform.HStockPlaceName" @input="HStockPlaceNameChange"></uni-combox>
                </view>
                <view class="righton" v-show="!showHStockPlaceName">
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName"
                        placeholder="不可操作" /></view>
                    <input v-model="hform.HStockPlaceName" :disabled="!showHStockPlaceName" placeholder="不可操作" />
                </view>
            </view>
            <view class="form-item">
                <view class="title">发料:</view>
@@ -94,8 +95,7 @@
                <view class="form-item">
                    <view class="title">源单类型:</view>
                    <view class="right" v-show="showHMainSourceBillType">
                        <picker :range="arrayHMainSourceBillType"
                            @change="HMainSourceBillTypeChange">
                        <picker :range="arrayHMainSourceBillType" @change="HMainSourceBillTypeChange">
                            <input name="HMainSourceBillType" disabled v-model="HMainSourceBillType"
                                placeholder="请选择源单类型" />
                            <view class="picker-overlay"></view>
@@ -189,7 +189,9 @@
    import {
        getUserInfo
    } from "@/utils/auth.js";
    import { CommonUtils } from '@/utils/common';
    import {
        CommonUtils
    } from '@/utils/common';
    import BillListPopupVue from '../../../components/BillListPopup/BillListPopup.vue';
    import BillListPopupMouldVue from '../../../components/BillListPopup/BillListPopup_Mould.vue';
    export default {
@@ -224,7 +226,8 @@
                
                showHMainSourceBillType: true,
                showHSourceBillNo: true,
                HMainSourceBillType: uni.getStorageSync('billTypeName_3802') ? uni.getStorageSync('billTypeName_3802'):'领用申请单',
                HMainSourceBillType: uni.getStorageSync('billTypeName_3802') ? uni.getStorageSync('billTypeName_3802') :
                    '领用申请单',
                arrayHMainSourceBillType: ['领用申请单', '手工录入'],
                arrayHMainSourceBillValue: ['3849', '-1'],
                
@@ -240,7 +243,7 @@
                    HKeeperID: getUserInfo().HKeeperID,//发料人
                    HSecManagerName: getUserInfo().HEmpName,
                    HSecManagerID: getUserInfo().HEmpID,//领料人
                    HDeptName: getUserInfo().HDept,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    //源单信息
                    HMainSourceBillType: uni.getStorageSync('billType_3802') ? uni.getStorageSync('billType_3802'):3849,
@@ -410,8 +413,7 @@
                            })
                        }
                    }
                }else
                {
                } else {
                    var sBarCode = this.hform.HBarCode
                    try {
                        let res = await CommonUtils.doRequest2Sync({
@@ -445,8 +447,7 @@
                            this.DisBillEntryList()
                            this.showHMainSourceBillType = false
                            this.showHSourceBillNo = false
                        }
                        else {
                        } else {
                            uni.showToast({
                                title: res.data.Message,
                                icon: 'none'
@@ -633,8 +634,7 @@
                    }
                )
            },
            getHSupList()
            {
            getHSupList() {
                CommonUtils.doRequest(
                    "/Gy_Supplier/list", {
                        sWhere: "",
@@ -675,20 +675,17 @@
                console.log(e.detail.value)
                this.hform.HDate = e.detail.value
            },
            HSelectTypeChange(e)
            {
            HSelectTypeChange(e) {
                this.hform.TypeName=e;
                this.hform.HSupName = ''; // 清空往来单位选择
                this.hform.HSupID = '';
                uni.setStorageSync("typeName_3802",e);
                if(e=='部门')
                {
                if (e == '部门') {
                    this.hform.HSupTypeID=3;
                    uni.setStorageSync("typeID_3802",3);
                    this.arrayHSelectType = this.arrayHDeptName;
                    this.HSelectTypeList = this.HDeptNameList;
                }
                else if(e === '供应商') {
                } else if (e === '供应商') {
                    this.hform.HSupTypeID=1;
                    uni.setStorageSync("typeID_3802",1);
                    this.arrayHSelectType = this.arrayHSupplierName;
@@ -759,11 +756,13 @@
                var sWhere = " and hmainid='" + linterid + "'";
                uni.request({
                    url: this.serverUrl + '/Sc_MouldProdOutBill/list_byPage', 
                    data: { sWhere: this.sWhere,
                    data: {
                        sWhere: this.sWhere,
                        user: uni.getStorageSync('HUserName'),
                        Organization: uni.getStorageSync('Organization'),
                        page:1,
                        size:100 },
                        size: 100
                    },
                    success: (res) => {
                        console.log(1,res.data.data[0]);
                        if(res.data.code == 1){
@@ -911,10 +910,6 @@
                                    }
                                });
                            } else {
                                // uni.showToast({
                                //     title: res.data.Message,
                                //     icon: 'none'
                                // })
                                uni.showModal({
                                    content: res.data.Message,
                                    showCancel: false,
@@ -1063,7 +1058,10 @@
                }else{
                    this.getNewData()
                }
                if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                    this.HSourceBillType = "手工录入"; // 显示名称
                    this.hform.HSourceBillType = "-1"; // 对应的值
                }
                this.getHBaseList()
                this.getHCusList()
                this.getHEmpList()
@@ -1073,12 +1071,10 @@
                setTimeout(() => {
                  this.HSelectTypeChange(this.hform.TypeName)
                  //初始化往来单位
                  if(this.hform.TypeName=='部门')
                  {
                    if (this.hform.TypeName == '部门') {
                      this.hform.HSupName = getUserInfo().HDept; // 清空往来单位选择
                      this.hform.HSupID = getUserInfo().HDeptID;
                  }
                  else if(this.hform.TypeName === '供应商') {
                    } else if (this.hform.TypeName === '供应商') {
                      this.hform.HSupName = getUserInfo().HSupName; // 清空往来单位选择
                      this.hform.HSupID = getUserInfo().HSupID;
                  } else if(this.hform.TypeName === '客户') {
pages/MJGL/mujulingliaotuikudan/Sc_MouldProdBackBill.vue
@@ -136,33 +136,6 @@
                        <input name="HInterID" disabled v-model="hform.HInterID" />
                    </view>
                </view>
                <!-- <view class="form-item">
                    <view class="title">日期:</view>
                    <view class="right">
                        <picker mode="date" v-model="hform.HDate" @change="HDateChange">
                            <view class="picker-overlay"></view>
                            <input disabled v-model="hform.HDate" placeholder="请选择日期" />
                        </picker>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">制单人:</view>
                    <view class="righton">
                        <input name="HMaker" disabled v-model="hform.HMaker" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据号:</view>
                    <view class="righton">
                        <input name="HBillNo" disabled v-model="hform.HBillNo" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">单据ID:</view>
                    <view class="righton">
                        <input name="HInterID" disabled v-model="hform.HInterID" />
                    </view>
                </view> -->
            </view>
            <view v-if="tabs==1">
                <view class="list" v-for="(item,index) in HMouldList" :key="index">
@@ -183,30 +156,6 @@
                    </uni-card>
                </view>
                <view class="over" v-if="HMouldList.length == 0">暂无数据</view>
                <!-- <view class="form-item">
                    <view class="title">器具条码:</view>
                    <view class="righton">
                        <input name="HBarCode_B" disabled v-model="hform.HBarCode_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">器具名称:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HMouldName_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">器具号:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HMouldID_B" />
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">数量:</view>
                    <view class="righton">
                        <input disabled v-model="hform.HMouldCount_B" />
                    </view>
                </view> -->
            </view>
            <view class="bottom-btn">
                <button class="btn-a" size="mini" @tap="submit">提交</button>
@@ -278,7 +227,7 @@
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
                    
                    HDeptName: getUserInfo().HDept,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HSecManagerID: getUserInfo().HEmpID,
                    HSecManagerName:  getUserInfo().HEmpName,
pages/MJGL/shangmudan/MouldUpperBill.vue
@@ -248,8 +248,8 @@
                    HDeptID: uni.getStorageSync('HDeptID'),
                    HEmpName: uni.getStorageSync('HEmpName'),
                    HEmpID: uni.getStorageSync('HEmpID'),
                    HMangerName: uni.getStorageSync('HEmpName'),
                    HMangerID: uni.getStorageSync('HEmpID'),
                    HMangerName: uni.getStorageSync('HMangerName'),
                    HMangerID: uni.getStorageSync('HMangerID'),
                    HSourceName: '',
@@ -445,12 +445,9 @@
                        HBillType: HBillType
                    },
                    success: (res) => {
                        console.log(2, res.data);
                        if (res.data.code == 1) {
                            var data = res.data.data[0];
                            console.log(3, data);
                            var num = data.Num;
                            console.log(4, num);
                            switch (num) {
                                case 1:
                                    this.hform.HSourceID = data.HItemID;
@@ -479,74 +476,15 @@
                                        });
                                        return;
                                    }
                                    // 根据组织条件决定是否进行校验
                                    const isSpecialOrg = uni.getStorageSync('OrganizationID') == "100007" &&
                                        uni.getStorageSync('Organization') == "事业一处";
                                    // 先调用模具档案检查,校验通过后才添加数据
                                    if (isSpecialOrg) {
                                        // 特殊组织:需要调用模具档案检查
                                    this.getMould_FC().then(isValid => {
                                        if (isValid) {
                                            this.tabs = 1;
                                            // 检查模具是否已存在于表格中
                                            const existingIndex = this.listData.findIndex(item =>
                                                item.HMouldID === data.hmainid
                                            );
                                            if (uni.getStorageSync('OrganizationID') == "100007" && uni
                                                .getStorageSync('Organization') == "事业一处") {
                                                if (existingIndex === -1) {
                                                    // 如果不存在,添加到表格
                                                    uni.showToast({
                                                        title: '当前检具不在当前物料的检具清单中',
                                                        icon: 'none',
                                                        duration: 1500
                                                    });
                                                    this.refreshBarCodeState();
                                                } else {
                                                    // 如果已存在,检查器具数量
                                                    if (this.listData[existingIndex].器具数量 === 0) {
                                                        // 器具数量为0,更新条码并将数量变为1
                                                        this.listData[existingIndex].器具条码 = this.hform
                                                            .HBarCode;
                                                        this.listData[existingIndex].器具数量 = 1;
                                                        uni.showToast({
                                                            title: '扫描成功',
                                                            icon: 'success',
                                                            duration: 1500
                                                        });
                                                        this.refreshBarCodeState();
                                                    } else {
                                                        // 器具数量已为1,提示不允许重复扫描
                                                        uni.showToast({
                                                            title: '该模具已扫描,不允许重复扫描',
                                                            icon: 'none',
                                                            duration: 1500
                                                        });
                                                        this.refreshBarCodeState();
                                                    }
                                                }
                                            } else {
                                                if (existingIndex === -1) {
                                                    // 如果不存在,添加到表格
                                                    const newRow = {
                                                        index: this.listData.length + 1,
                                                        HMouldID: data.hmainid,
                                                        器具编码: data.模具编号,
                                                        器具名称: data.模具名称,
                                                        器具型号: data.模具型号,
                                                        器具条码: this.hform.HBarCode,
                                                        器具数量: 1,
                                                        checked: false // 默认不选中
                                                    };
                                                    this.listData.push(newRow);
                                                    this.refreshBarCodeState();
                                                } else {
                                                    // 如果已存在,提示用户
                                                    uni.showToast({
                                                        title: '该模具已扫描',
                                                        icon: 'none',
                                                        duration: 1500
                                                    });
                                                    this.refreshBarCodeState();
                                                }
                                            }
                                                this.handleMouldData(data);
                                        } else {
                                            // 校验不通过,清空条码但不添加数据
                                            this.refreshBarCodeState();
@@ -555,8 +493,11 @@
                                        console.log('校验失败:', error);
                                        this.refreshBarCodeState();
                                    });
                                    } else {
                                        // 其他组织:直接处理模具数据
                                        this.handleMouldData(data);
                                    }
                                    break;
                                case 4:
                                    this.hform.HProcExchBillNo = data.单据号;
                                    this.hform.HProcExchInterID = data.hmainid;
@@ -596,6 +537,80 @@
                    },
                });
            },
            handleMouldData(data) {
                this.tabs = 1;
                // 检查模具是否已存在于表格中
                const existingIndex = this.listData.findIndex(item =>
                    item.HMouldID === data.hmainid
                );
                const isSpecialOrg = uni.getStorageSync('OrganizationID') == "100007" &&
                    uni.getStorageSync('Organization') == "事业一处";
                if (isSpecialOrg) {
                    // 特殊组织:检查物料器具清单
                    if (existingIndex === -1) {
                        // 如果不存在,说明不在当前物料的检具清单中
                        uni.showToast({
                            title: '当前检具不在当前物料的检具清单中',
                            icon: 'none',
                            duration: 1500
                        });
                        this.refreshBarCodeState();
                    } else {
                        // 如果已存在,检查器具数量
                        if (this.listData[existingIndex].器具数量 === 0) {
                            // 器具数量为0,更新条码并将数量变为1
                            this.listData[existingIndex].器具条码 = this.hform.HBarCode;
                            this.listData[existingIndex].器具数量 = 1;
                            uni.showToast({
                                title: '扫描成功',
                                icon: 'success',
                                duration: 1500
                            });
                            this.refreshBarCodeState();
                        } else {
                            // 器具数量已为1,提示不允许重复扫描
                            uni.showToast({
                                title: '该模具已扫描,不允许重复扫描',
                                icon: 'none',
                                duration: 1500
                            });
                            this.refreshBarCodeState();
                        }
                    }
                } else {
                    // 其他组织:直接处理
                    if (existingIndex === -1) {
                        // 如果不存在,添加到表格
                        const newRow = {
                            index: this.listData.length + 1,
                            HMouldID: data.hmainid,
                            器具编码: data.模具编号,
                            器具名称: data.模具名称,
                            器具型号: data.模具型号,
                            器具条码: this.hform.HBarCode,
                            器具数量: 1,
                            checked: false // 默认不选中
                        };
                        this.listData.push(newRow);
                        uni.showToast({
                            title: '扫描成功',
                            icon: 'success',
                            duration: 1500
                        });
                        this.refreshBarCodeState();
                    } else {
                        // 如果已存在,提示用户
                        uni.showToast({
                            title: '该模具已扫描',
                            icon: 'none',
                            duration: 1500
                        });
                        this.refreshBarCodeState();
                    }
                }
            },
            //获取使用部门数据
            getHDeptList() {
                uni.request({
pages/MJGL/xiamodan/MouldLowerBill.vue
@@ -4,7 +4,7 @@
            <view class="form-item">
                <view class="title"><text>*</text>条形码:</view>
                <view class="right" style="width: 380rpx;">
                    <input v-model="hform.HBarCode" disabled  placeholder="请扫描条码" @blur="getHBarCodeData(hform.HBarCode)"/>
                    <input v-model="hform.HBarCode" placeholder="请扫描条码" @blur="getHBarCodeData(hform.HBarCode)"/>
                </view>
                <uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
            </view>
@@ -189,12 +189,12 @@
                    HBillNo:'',
                    HDate:getDateTime.dateTimeStr('y-m-d'),
                    HBarCode:'',
                    HDeptName:'',
                    HDeptID:'',
                    HEmpName:'',
                    HEmpID:'',
                    HMangerName:'',
                    HMangerID:'',
                    HDeptName: uni.getStorageSync('HDeptName'),
                    HDeptID: uni.getStorageSync('HDeptID'),
                    HEmpName: uni.getStorageSync('HEmpName'),
                    HEmpID: uni.getStorageSync('HEmpID'),
                    HMangerName: uni.getStorageSync('HMangerName'),
                    HMangerID: uni.getStorageSync('HMangerID'),
                    
                    
                    HSourceName:'',
pages/ZLGL/AanDengHujiao/OA_ErrMsgBackBill/OA_ErrMsgBackBill.vue
@@ -753,9 +753,10 @@
            getShiftsList() {
                return new Promise((resolve, reject) => {
                    uni.request({
                        url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
                        url:  this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                        data: {
                            Shifts: ""
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        },
                        success: (res) => {
                            if (res.data.count == 1) {
pages/ZLGL/AanDengHujiao/OA_MyErrMsgBanck/OA_ErrMsgBackMyList.vue
@@ -274,6 +274,13 @@
        onPullDownRefresh() {
            this.onSearchClickHandler()
        },
        onShow() {
            // 每次页面显示时检查是否需要刷新
            if (this.needRefresh) {
                this.onSearchClickHandler()
                this.needRefresh = false
            }
        },
        async onReady() {
            // #ifndef MP-WEIXIN
            let query = uni.createSelectorQuery().in(this)
@@ -448,6 +455,7 @@
                }
                console.log('下推签到单:', item)
                this.needRefresh = true // 设置刷新标记
                uni.navigateTo({
                    url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackSignBill/OA_ErrMsgBackSignBill?OperationType=2&linterid=' +
                        item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
@@ -469,6 +477,7 @@
                }
                console.log('下推处理单:', item)
                this.needRefresh = true // 设置刷新标记
                uni.navigateTo({
                    url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackHandleBill/OA_ErrMsgBackHandleBill?OperationType=2&linterid=' +
                        item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
@@ -488,8 +497,16 @@
                    })
                    return
                }
                const currentUser = getUserInfo()["Czymc"];
                if (item.发送人 !== currentUser) {
                    uni.showToast({
                        title: '当前单据发送人与登录用户不一致,不允许下推验收单',
                        icon: 'none'
                    })
                    return
                }
                console.log('下推验收单:', item)
                this.needRefresh = true // 设置刷新标记
                uni.navigateTo({
                    url: '/pages/ZLGL/AanDengHujiao/OA_ErrMsgBackCheckBill/OA_ErrMsgBackCheckBill?OperationType=2&linterid=' +
                        item.HInterID + '&HEntryID=' + (item.HEntryID || 0) + '&HSouceBillType=4502',
pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill.vue
@@ -199,17 +199,17 @@
                    HSampleDamageQty: 0,
                    TestType: '首检',
                    HBadNote: '',
                    HDeptName: '',
                    HDeptID: 0,
                    HCenterID: 0,
                    HDeptName: getUserInfo().HDeptName,
                    HDeptID: getUserInfo().HDeptID,
                    HCenterID: getUserInfo().HWorkCenterID,
                    HShiftsName: '',
                    HShiftsID: 0,
                    HGroupName: '',
                    HGroupID: 0,
                    HCheckEmpName: '',
                    HCheckEmp: '',
                    HSourceName: '',
                    HSourceID: 0,
                    HGroupName: getUserInfo().HGroupName,
                    HGroupID: getUserInfo().HGroupID,
                    HCheckEmpName: getUserInfo().HEmpName,
                    HCheckEmp: getUserInfo().HEmpID,
                    HSourceName: getUserInfo().HSourceName,
                    HSourceID: getUserInfo().HSourceID,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HBillNo: '',
                    HInterID: 0,
@@ -281,6 +281,7 @@
            this.GetEmployeeList()
            this.getSourceList()
            this.GetDepartmentList()
            this.get_HWorkShift()
        },
        methods: {
            HDeptNameChangeHandler() {
@@ -367,7 +368,7 @@
                    url: '/Web/GetEmployeeList_Json',
                    data: {
                        Employee: '',
                        HGroupID: this.hform.HGroupID
                        HGroupID:0
                    },
                    resFunction: (res) => {
                        let {
@@ -625,6 +626,7 @@
                                "HICMOBillNo": data1[0].任务单号, //生产订单
                                "HDeptID": data1[0].HWorkShopID, //车间ID
                                "HDeptName": data1[0].生产车间, //车间
                            })
                            uni.showToast({
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -715,6 +715,32 @@
                        })
                        return;
                    }
                    if(this.hform.HSourceBillType=="3791"){  //出站单
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
                        this.hform.HMainSourceBillNo = data[0]['单据号']
                        this.hform.HSourceBillNo = data[0]['单据号']
                        this.hform.HMainSourceInterID = data[0].HInterID
                        this.hform.HMainSourceEntryID = data[0].HEntryID
                        this.hform.HQCSchemeName = data[0].检验方案名称
                        this.hform.HQCSchemeID = data[0].检验方案ID
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hasSourceBill = true
                        this.hform.HICMOBillNo= data[0].任务单号
                        this.hform.HICMOInterID= data[0].HICMOInterID
                        this.hform.HICMOEntryID= data[0].HICMOEntryID
                        this.hform.HICMOQty= data[0].生产数量
                        this.hform.HProcExchBillNo= data[0].HProcExchBillNo
                        this.hform.HProcExchInterID= data[0].HProcExchInterID
                        this.hform.HProcExchEntryID= data[0].HProcExchEntryID
                        this.hform.HProcExchQty= data[0].流转卡数量
                        this.hform.HSourceName= data[0].生产资源
                        this.hform.HSourceID= data[0].HSourceID
                        this.hform.HProcID= data[0].HProcID
                        this.hform.HProcName= data[0].工序名称
                        this.hform.HCheckQty=data[0].出站数量
                    }else{
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['产品代码']
@@ -738,7 +764,7 @@
                    this.hform.HSourceID= data[0].HSourceID
                    this.hform.HProcID= data[0].HProcID
                    this.hform.HProcName= data[0].当前工序
                    }
                    this.get_CheckItem();
                } else {
                    CommonUtils.showTips({
@@ -776,6 +802,32 @@
                            })
                            return;
                        }
                        if(this.hform.HSourceBillType=="3791"){
                            this.hform.HMaterID = data[0]['HMaterID']
                            this.hform.HMaterName = data[0]['产品名称']
                            this.hform.HMaterNumber = data[0]['产品代码']
                            this.hform.HMainSourceBillNo = data[0]['单据号']
                            this.hform.HSourceBillNo = data[0]['单据号']
                            this.hform.HMainSourceInterID = data[0].HInterID
                            this.hform.HMainSourceEntryID = data[0].HEntryID
                            this.hform.HQCSchemeName = data[0].检验方案名称
                            this.hform.HQCSchemeID = data[0].检验方案ID
                            this.hform.HSourceBillQty = data[0].HSourceBillQty
                            this.hasSourceBill = true
                            this.hform.HICMOBillNo= data[0].任务单号
                            this.hform.HICMOInterID= data[0].HICMOInterID
                            this.hform.HICMOEntryID= data[0].HICMOEntryID
                            this.hform.HICMOQty= data[0].生产数量
                            this.hform.HProcExchBillNo= data[0].HProcExchBillNo
                            this.hform.HProcExchInterID= data[0].HProcExchInterID
                            this.hform.HProcExchEntryID= data[0].HProcExchEntryID
                            this.hform.HProcExchQty= data[0].流转卡数量
                            this.hform.HSourceName= data[0].生产资源
                            this.hform.HSourceID= data[0].HSourceID
                            this.hform.HProcID= data[0].HProcID
                            this.hform.HProcName= data[0].工序名称
                            this.hform.HCheckQty=data[0].出站数量
                        }else{
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -798,6 +850,7 @@
                        this.hform.HSourceID= data[0].HSourceID
                        this.hform.HProcID= data[0].HProcID
                        this.hform.HProcName= data[0].当前工序
                        }
            
                        this.get_CheckItem();
                        this.hasSourceBill = true
@@ -1708,7 +1761,7 @@
                            CheckProjectID: this.hform.HQCSchemeID || 0,
                            HBatchQty: this.hform.HProcExchQty || 0,
                            HMaterID: this.hform.HMaterID,
                            HBillType: '生产入库检方案'
                            HBillType: '末件检方案'
                        },
                    });
@@ -1731,7 +1784,7 @@
                                HUnit: data[i]["单位名称"],
                                HQCNote: "",
                                HAnalysisMethod: data[i]["分析方法"],
                                HResult: data[i]["默认结论"],
                                HResult: data[i]["HResult"],
                                HMax: "",
                                HMin: "",
                                HAvg: "",
@@ -1917,9 +1970,7 @@
                        checkItemsArray.push(checkItem);
                    }
                    console.log('checkItemsArray: ', checkItemsArray);
                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(
          checkItemsArray
        )};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
                    let sMainSub = `${JSON.stringify(this.hform)};${JSON.stringify(checkItemsArray)};${this.operationType};${getUserInfo()["Czymc"]};${InspectValuesTrans[0]}`;
                    console.log("this.checkItems: ", this.checkItems);
                    let res = await CommonUtils.doRequest2Sync({
@@ -2147,7 +2198,10 @@
            } else if (this.operationType == 3) {
                await this.RoadBillMain();
            }
            if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                this.HSourceBillType = "工序出站汇报单"; // 显示名称
                this.hform.HSourceBillType = "3791"; // 对应的值
            }
            await this.InitHSource();
            await this.InitHWorkShift();
            await this.InitHEmp();
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -647,9 +647,9 @@
                // 源单类型
                HSourceBillType: "生产汇报单",
                HSourceBillTypeValueList: ["3711", "3772"],
                HSourceBillTypeValueList: ["3711", "3772", "3791"],
                HSourceBillTypeNameList: [
                    "生产汇报单", '工序流转卡'
                    "生产汇报单", '工序流转卡', '工序出站汇报单'
                ],
                // 主表属性
                hform: {
@@ -801,6 +801,32 @@
                            })
                            return;
                        }
                        if (this.hform.HSourceBillType == "3791") { //出站单
                            this.hform.HMaterID = data[0]['HMaterID']
                            this.hform.HMaterName = data[0]['产品名称']
                            this.hform.HMaterNumber = data[0]['产品代码']
                            this.hform.HMainSourceBillNo = data[0]['单据号']
                            this.hform.HSourceBillNo = data[0]['单据号']
                            this.hform.HMainSourceInterID = data[0].HInterID
                            this.hform.HMainSourceEntryID = data[0].HEntryID
                            this.hform.HQCSchemeName = data[0].检验方案名称
                            this.hform.HQCSchemeID = data[0].检验方案ID
                            this.hform.HSourceBillQty = data[0].HSourceBillQty
                            this.hasSourceBill = true
                            this.hform.HICMOBillNo = data[0].任务单号
                            this.hform.HICMOInterID = data[0].HICMOInterID
                            this.hform.HICMOEntryID = data[0].HICMOEntryID
                            this.hform.HICMOQty = data[0].生产数量
                            this.hform.HProcExchBillNo = data[0].HProcExchBillNo
                            this.hform.HProcExchInterID = data[0].HProcExchInterID
                            this.hform.HProcExchEntryID = data[0].HProcExchEntryID
                            this.hform.HProcExchQty = data[0].流转卡数量
                            this.hform.HSourceName = data[0].生产资源
                            this.hform.HSourceID = data[0].HSourceID
                            this.hform.HProcID = data[0].HProcID
                            this.hform.HProcName = data[0].工序名称
                            this.hform.HCheckQty = data[0].出站数量
                        } else {
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -815,6 +841,7 @@
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hasSourceBill = true
                        this.hform.HProcExchQty = data[0]['流转卡数量']
                        }
                        this.get_CheckItem();
                        this.$refs['billList'].exit()
                    } else {
@@ -902,6 +929,32 @@
                        })
                        return;
                    }
                    if (this.hform.HSourceBillType == "3791") { //出站单
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
                        this.hform.HMainSourceBillNo = data[0]['单据号']
                        this.hform.HSourceBillNo = data[0]['单据号']
                        this.hform.HMainSourceInterID = data[0].HInterID
                        this.hform.HMainSourceEntryID = data[0].HEntryID
                        this.hform.HQCSchemeName = data[0].检验方案名称
                        this.hform.HQCSchemeID = data[0].检验方案ID
                        this.hform.HSourceBillQty = data[0].HSourceBillQty
                        this.hasSourceBill = true
                        this.hform.HICMOBillNo = data[0].任务单号
                        this.hform.HICMOInterID = data[0].HICMOInterID
                        this.hform.HICMOEntryID = data[0].HICMOEntryID
                        this.hform.HICMOQty = data[0].生产数量
                        this.hform.HProcExchBillNo = data[0].HProcExchBillNo
                        this.hform.HProcExchInterID = data[0].HProcExchInterID
                        this.hform.HProcExchEntryID = data[0].HProcExchEntryID
                        this.hform.HProcExchQty = data[0].流转卡数量
                        this.hform.HSourceName = data[0].生产资源
                        this.hform.HSourceID = data[0].HSourceID
                        this.hform.HProcID = data[0].HProcID
                        this.hform.HProcName = data[0].工序名称
                        this.hform.HCheckQty = data[0].出站数量
                    } else {
                    this.hform.HMaterID = data[0]['HMaterID']
                    this.hform.HMaterName = data[0]['产品名称']
                    this.hform.HMaterNumber = data[0]['产品代码']
@@ -916,6 +969,8 @@
                    this.hform.HSourceBillQty = data[0].HSourceBillQty
                    this.hform.HProcExchQty = data[0]['流转卡数量']
                    this.hasSourceBill = true
                    }
                    this.get_CheckItem();
                } else {
                    CommonUtils.showTips({
@@ -2273,7 +2328,10 @@
            } else if (this.operationType == 3) {
                await this.RoadBillMain();
            }
            if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                this.HSourceBillType = "工序出站汇报单"; // 显示名称
                this.hform.HSourceBillType = "3791"; // 对应的值
            }
            await this.InitHSource();
            await this.InitHWorkShift();
            await this.InitHEmp();
pages/ZLGL/shoujianjianyan/firstCheckBill.vue
@@ -733,7 +733,7 @@
                    count
                } = res.data
                if (count == 1) {
                    if(HSourceBillType=3772){
                    if(this.hform.HSourceBillType=="3772"){
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -757,18 +757,18 @@
                        this.hform.HSourceID = data[0].HSourceID
                        this.hform.HProcID = data[0].HProcID
                        this.hform.HProcName = data[0].当前工序
                    }else if(HSourceBillType=7521){
                    }
                    else if(this.hform.HSourceBillType=="7521"){
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
                        this.hform.HMainSourceBillNo = data[0]['HBillNo']
                        this.hform.HSourceBillNo = data[0]['HBillNo']
                        this.hform.HMainSourceBillNo = data[0].单据号
                        this.hform.HSourceBillNo = data[0].单据号
                        this.hform.HMainSourceInterID = data[0].HInterID
                        this.hform.HMainSourceEntryID = data[0].HEntryID
                        this.hform.HQCSchemeName = data[0].检验方案名称
                        this.hform.HQCSchemeID = data[0].检验方案ID
                        this.hform.HSourceBillQty = data[0].检验数量
                        this.hasSourceBill = true
                        this.hform.HICMOBillNo = data[0].任务单号
                        this.hform.HICMOInterID = data[0].HICMOInterID
                        this.hform.HICMOEntryID = data[0].HICMOEntryID
@@ -781,7 +781,10 @@
                        this.hform.HSourceID = data[0].HSourceID
                        this.hform.HProcID = data[0].HProcID
                        this.hform.HProcName = data[0].当前工序
                    }else{
                        this.hform.HTakeSampleCheckBillNo = data[0].单据号
                        this.hform.HTakeSampleCheckBillID = data[0].HInterID
                    }
                    else{
                        this.hform.HMaterID = data[0]['HMaterID']
                        this.hform.HMaterName = data[0]['产品名称']
                        this.hform.HMaterNumber = data[0]['产品代码']
@@ -864,8 +867,8 @@
                            this.hform.HMaterID = data[0]['HMaterID']
                            this.hform.HMaterName = data[0]['产品名称']
                            this.hform.HMaterNumber = data[0]['产品代码']
                            this.hform.HMainSourceBillNo = data[0]['HBillNo']
                            this.hform.HSourceBillNo = data[0]['HBillNo']
                            this.hform.HMainSourceBillNo = data[0].单据号
                            this.hform.HSourceBillNo = data[0].单据号
                            this.hform.HMainSourceInterID = data[0].HInterID
                            this.hform.HMainSourceEntryID = data[0].HEntryID
                            this.hform.HQCSchemeName = data[0].检验方案名称
@@ -883,6 +886,8 @@
                            this.hform.HSourceID = data[0].HSourceID
                            this.hform.HProcID = data[0].HProcID
                            this.hform.HProcName = data[0].当前工序
                            this.hform.HTakeSampleCheckBillNo = data[0].单据号
                            this.hform.HTakeSampleCheckBillID = data[0].HInterID
                        }else{
                            this.hform.HMaterID = data[0]['HMaterID']
                            this.hform.HMaterName = data[0]['产品名称']
@@ -1803,7 +1808,7 @@
                            CheckProjectID: this.hform.HQCSchemeID || 0,
                            HBatchQty: this.hform.HProcExchQty || 0,
                            HMaterID: this.hform.HMaterID,
                            HBillType: '生产入库检方案'
                            HBillType: '首件检方案'
                        },
                    });
@@ -1826,7 +1831,7 @@
                                HUnit: data[i]["单位名称"],
                                HQCNote: "",
                                HAnalysisMethod: data[i]["分析方法"],
                                HResult: data[i]["默认结论"],
                                HResult: data[i]["HResult"],
                                HMax: "",
                                HMin: "",
                                HAvg: "",
@@ -2234,7 +2239,10 @@
                await this.getMaxBillNo();
                
                if(e.HSouceBillType=="7521"){
                    this.hform.HSourceBillType="7521";
                    if (uni.getStorageSync('Organization')  == "宁波市华舟包装有限公司") {
                        this.HSourceBillType = "取样单"; // 显示名称
                        this.hform.HSourceBillType = "7521"; // 对应的值
                    }
                    this.hform.HTakeSampleCheckBillNo=e.HBillNo;
                    this.hform.HTakeSampleCheckBillID=e.linterid;
                    //取样单查询数据
pages/ZLGL/xunjianjianyan/PatrolProcCheckBill.vue
@@ -27,7 +27,6 @@
                            </uni-datetime-picker>
                        </view>
                    </view>
                    <view class="form-item">
                        <view class="left">源单单号</view>
                        <view class="right" :class="!hasSourceBill?'':'disabled'">
@@ -35,12 +34,9 @@
                                v-model="hform.HSourceBillNo" @confirm="getSourceBillInfo(hform.HSourceBillNo)" />
                        </view>
                        <view class="icon-wrapper-big">
                            <uni-icons class="right-icon" type="scan" style="
                  background-color: #3a78ff;
                  padding: 6rpx;
                  color: #fff;
                  border-radius: 100%;
                " size="20" @click="toScanCode"></uni-icons>
                            <uni-icons class="right-icon" type="scan"
                                style="background-color: #3a78ff;padding: 6rpx; color: #fff;border-radius: 100%;"
                                size="20" @click="toScanCode"></uni-icons>
                        </view>
                    </view>
@@ -79,7 +75,7 @@
                        <view class="left">检验员</view>
                        <view class="right">
                            <uni-combox :candidates="GyFirstCheckEmpNameList" placeholder="请选择检验员"
                                :v-model="hform.HFirstCheckEmpName"
                                v-model="hform.HFirstCheckEmpName"
                                @update:modelValue="HFirstCheckEmpChange"></uni-combox>
                        </view>
                    </view>
@@ -137,13 +133,6 @@
                                @update:modelValue="HSourceChange"></uni-combox>
                        </view>
                    </view>
                    <!-- <view class="form-item">
                            <view class="left">生产班次</view>
                            <view class="right">
                                <uni-combox :candidates="GyWorkShiftNameList" placeholder="请选择生产班次"
                                    v-model="hform.HShiftsName" @update:modelValue="HWorkShiftChange"></uni-combox>
                            </view>
                        </view>        -->
                    <view class="form-item">
                        <view class="left">生产班次</view>
                        <view class="right">
@@ -590,8 +579,8 @@
                    HMaterNumber: "",
                    HMaterID: "0",
                    HMaterName: "",
                    HFirstCheckEmpName: "",
                    HFirstCheckEmp: 0,
                    HFirstCheckEmpName: getUserInfo().HEmpName,
                    HFirstCheckEmp: getUserInfo().HEmpID,
                    HQCSchemeName: "",
                    HQCSchemeID: "0",
                    HBatchNo: "",
@@ -762,7 +751,7 @@
                        });
                        return;
                    }
                    this.hform.HProcExchBillNo = data[0].流转卡号;
                    this.hform.HProcExchBillNo = data[0].单据号;
                    this.hform.HProcExchInterID = data[0].HProcExchInterID;
                    this.hform.HProcExchEntryID = data[0].HProcExchEntryID || 0;
                    this.hform.HProcExchQty = data[0].流转卡数量 || 0;
@@ -772,6 +761,7 @@
                    this.hform.HSourceName = data[0].生产资源;
                    this.hform.HSourceID = data[0].HSourceID || 0;
                    this.hform.HMaterID = data[0].HMaterID;
                    this.hform.HMaterNumber = data[0].产品代码;
                    this.hform.HMaterName = data[0].产品名称;
                    this.hform.HMainSourceBillNo = data[0].单据号;
                    this.hform.HMainSourceBillType = data[0].HBillType;
@@ -952,9 +942,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_Employee/list",
                        data: {
                            sWhere: `  and 组织名称 = '${uni.getStorageSync(
              "Organization"
            )}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`,
                            sWhere: `  and 组织名称 = '${uni.getStorageSync("Organization")}' and 禁用标记 = ''and 审核人 !='' order by 部门代码`,
                            user: getUserInfo()["Czymc"],
                            Organization: uni.getStorageSync("Organization"),
                        },
@@ -967,7 +955,6 @@
                    } = res.data;
                    if (count == 1) {
                        console.log("data: ", data);
                        this.GyFirstCheckEmpList = data;
                        this.GyFirstCheckEmpNameList = Array.from(data).map((e) => e["职员名称"]);
                    } else {
@@ -1001,9 +988,7 @@
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_ShiftsController/Get_Gy_WorkShiftList",
                        data: {
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync(
              "Organization"
            )}'`,
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        },
                    });
@@ -1043,7 +1028,6 @@
                this.hform.HWorkShiftID = this.GySourceList[index]["HInterID"];
                this.hform.HWorkShiftName = this.GySourceList[index]["班次名称"];
            },
            // 生产资源更新
            // 生产资源初始化
            async InitHSource() {
                try {
@@ -1528,6 +1512,8 @@
                        data: {
                            CheckProjectID: this.hform.HQCSchemeID || 0,
                            HBatchQty: this.hform.HProcExchQty || 0,
                            HMaterID: this.hform.HMaterID,
                            HBillType: '巡检方案    '
                        },
                    });
@@ -1550,7 +1536,7 @@
                                HUnit: data[i]["单位名称"],
                                HQCNote: "",
                                HAnalysisMethod: data[i]["分析方法"],
                                HResult: data[i]["默认结论"],
                                HResult: data[i]["HResult"],
                                HMax: "",
                                HMin: "",
                                HAvg: "",
@@ -1966,7 +1952,10 @@
            } else if (this.operationType == 3) {
                await this.RoadBillMain();
            }
            if (uni.getStorageSync('Organization') == "宁波市华舟包装有限公司") {
                this.HSourceBillType = "工序流转卡"; // 显示名称
                this.hform.HSourceBillType = "3772"; // 对应的值
            }
            await this.InitHSource();
            await this.InitHWorkShift();
            await this.InitHEmp();
pages/baogong/OA_ErrMsgBackBill.vue
@@ -367,7 +367,7 @@
                    HReTransmitMan: '', // 转发至
                    HSourceName: '', // 生产资源
                    HSourceID: '0', // 生产资源ID
                    HCenterName: getUserInfo().HWorkCenter, // 车间
                    HCenterName: getUserInfo().HWorkCenterName, // 车间
                    HCenterID: getUserInfo().HWorkCenterID, // 车间ID
                    HQty: 0, // 数量
                    HDeleteMan: '', // 作废人
@@ -770,9 +770,10 @@
            getShiftsList() {
                return new Promise((resolve, reject) => {
                    uni.request({
                        url: this.serverUrl + '/Web/GetGy_ShiftsList_Json',
                        url:  this.serverUrl + '/Gy_ShiftsController/Get_Gy_WorkShiftList',
                        data: {
                            Shifts: ""
                            sWhere: ` and 禁用标记 = '' and ISNULL(审核人,'')  != '' and 使用组织名称 = '${uni.getStorageSync("Organization")}'`,
                            HMaker: getUserInfo()["Czymc"],
                        },
                        success: (res) => {
                            if (res.data.count == 1) {
pages/index/login.vue
@@ -338,6 +338,12 @@
                                uni.setStorageSync('HWorkCenterName', res.data.data[0].HWorkCenterName);
                                uni.setStorageSync('HSecManagerID', res.data.data[0].HSecManagerID); //对应验收
                                uni.setStorageSync('HSecManagerName', res.data.data[0].HSecManagerName);
                                uni.setStorageSync('HGroupID', res.data.data[0].HGroupID); //对应班组
                                uni.setStorageSync('HGroupName', res.data.data[0].HGroup);
                                uni.setStorageSync('HProcID', res.data.data[0].HProcID); //对应工序
                                uni.setStorageSync('HProcName', res.data.data[0].HProcName);
                                uni.setStorageSync('HSourceID', res.data.data[0].HSourceID); //对应生产资源
                                uni.setStorageSync('HSourceName', res.data.data[0].HSource);
                                this.CommonUtils.setServerUrl(this.serverUrl)
                                // this.WebSocketServices.createConnect(res.data.data[0].Czybm,res.data.data[0].Czymc);
                                // getuiUtils.getClientID()
pages/index/tab2.vue
@@ -314,7 +314,7 @@
                    {
                        "img": "../../static/icon/icon13.png",
                        "text": "模具故障登记列表",
                        "url": "/pages/qijvguzhangdengji/mouldMistake",
                        "url": "/pages/MJGL/Sc_MouldConkBookBill/Sc_MouldConkBookBillList",
                        "id": 37,
                        "hidden": false
                    },
@@ -329,7 +329,7 @@
                    {
                        "img": "../../static/icon/icon13.png",
                        "text": "模具维修记录列表",
                        "url": "/pages/weixiujilu/mouldRepairRecordBillList",
                        "url": "/pages/MJGL/Sc_MouldRepairWorkBill/Sc_MouldRepairWorkBillList",
                        "id": 39,
                        "hidden": false
                    },
pages/index/tab3.vue
@@ -44,6 +44,14 @@
                canEdit: false,
                serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
                itemData: [{
                        img: '../../static/icon/icon8.png',
                        text: '模具档案查询',
                        url: `/pages/MJGL/Gy_MouldFile/Gy_MouldFileList`,
                        id: 1,
                        hidden: false,
                    },
                    {
                        img: '../../static/icon/icon6.png',
                        text: '模具状态分析',
                        tip: '查看详情',
@@ -190,6 +198,13 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
   "text": "设备故障登记单",
                        "url": "/pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill?operationType=1",
                        "id": 20,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "设备维修派工单",
                        "url": "/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill",
                        "id": 21,
@@ -197,6 +212,11 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
  "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
                        "id": 23,
                        "hidden": false
                    },
                    {
                        "text": "设备维修验收单",
                        "url": "/pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill",
                        "id": 23,
@@ -232,6 +252,7 @@
                    },
                    {
                        "img": "../../static/icon/icon8.png",
                        "text": "设备维修记录单",
                        "url": "/pages/MJGL/Sb_EqpMaintenance/Sb_EqpMaintenanceBill",
                        "id": 28,
pages/index/tab4.vue
@@ -164,14 +164,14 @@
                    {
                        "img": "../../static/icon/icon15.png",
                        "text": "取样单",
                        "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
                        "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
                        "id": 17,
                        "hidden": false
                    },
                    {
                        "img": "../../static/icon/icon15.png",
                        "text": "还样单",
                        "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill",
                        "url": "/pages/ZLGL/QuYangHuangYang/QC_TakeSampleCheckBill/QC_TakeSampleCheckBill?operationType=0",
                        "id": 18,
                        "hidden": false
                    },