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

wtt

2026-04-13 e7809773188bac751c927ad4b26afb4e9015fce9

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

 pages/EmployeeRecords/EmployeeRecordsBill.vue

@@ -327,6 +327,7 @@
            this.getHGroupList()
            this.getHShiftsList()
            this.getHProcList()
            this.getHShiftCurrent()
            //先获取角色列表，然后获取用户绑定的角色
            this.getRoleList().then(() => {
                this.getUserBoundRoles();
@@ -719,6 +720,41 @@
                    }
                }
            },
            async getHShiftCurrent() {
                // 根据当前用户绑定的工作中心和部门获取到班次信息(没有则不获取)
                let HDeptID = getUserInfo()["HDeptID"]
                let HCenterID = getUserInfo()["HWorkCenterID"]
                console.log(HDeptID, HCenterID)
                if(!HDeptID || !HCenterID) {
                    return
                }
                try{
                   let res = await CommonUtils.doRequest2Async({
                       url: "/Gy_ShiftsController/Get_HWorkShift",
                       data: {
                           HDeptID,
                           HCenterID
                       }
                   }) 
                   
                    let {count, data,Message} = res.data
                    if(count == 1) {
                        this.hform.HShiftsID = data[0]["HInterID"]
                        this.hform.HShiftsName = data[0]["班次"]
                    }else {
                        CommonUtils.showTips({
                            title: "温馨提示",
                            message: `获取班次信息失败: ${Message}` 
                        })
                    }
                }catch(err) {
                    CommonUtils.showTips({
                        title: "温馨提示",
                        message: `获取班次信息失败: ${err.message}` 
                    })
                }
                
            },
            // 获取用户已绑定的角色
            async getUserBoundRoles() {
                try {

 pages/MJGL/mujudianjianjiludan/Sc_MouldDotCheckBill.vue

@@ -368,7 +368,9 @@
                    HDeleteDate: "",
                    lngBillKey: 0,
                    lngBillSubKey: 0,
                    HLastResult: "OK"
                    HLastResult: "OK",
                    HExplanation: "",
                    HInnerBillNo: "",
                }
            };
        },
@@ -567,7 +569,7 @@
                    if (count == 1) {
                        this.hform.HMouldDotCheckRuleNo = data[0].HBillNo
                        this.hform.HMouldDotCheckRuleID = data[0].HInterID
                        this.hform.HPlanNo = data[0].单据号
                        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]
@@ -581,13 +583,19 @@
                                "HClaim": item.具体要求,
                                "HManagerID": item.负责人ID,
                                "HManagerName": item.负责人名称,
                                "HCloseMan": "",
                                "HCloseType": 0,
                                "HRemark": "",
                                "HSourceInterID": item.hmainid == null ? 0 : item.hmainid,
                                "HSourceEntryID": item.HEntryID == null ? 0 : item.HEntryID,
                                "HSourceBillNo": item.单据号,
                                "HSourceBillNo": item.单据号 || '',
                                "HSourceBillType": item.源单类型 || '',
                                "HDotCheckItemClassID": item.HDotCheckItemClassID || 0,
                                "HDotCheckItemClassName": item.点检项目分类名称 || "",
                                "HDotCheckItemMethodID": item.点检方法id || 0,
                                "HDotCheckItemMethodName": item.点检方法 || "",
                                "HRelationQty": 0,
                                "HRelationMoney": 0,
                                // "HDotCheckResult": item.默认结论 == 1 ? true : false
                                "HDotCheckResult": item.默认点检结果 == 'OK' ? true : false
                            }

 pages/baogong/OA_ErrMsgBackBill.vue

@@ -1001,6 +1001,12 @@
                            this.hform.HQty = res.data.data[0].计划数量 //计划数量
                            this.hform.HSourceID = res.data.data[0].HSourceID //生产资源id
                            this.hform.HSourceName = res.data.data[0].生产资源 //生产资源
                            this.hform.HProcExchBillNo = data[0].流转卡号 //源单单号
                            this.hform.HProcExchEntryID = data[0].流转卡主内码 //源单主内码
                            this.hform.HProcExchInterID = data[0].流转卡子内码 //源单子内码
                            this.hform.HICMOBillNo = data[0].HICMOBillNo
                            this.hform.HICMOInterID = data[0].HICMOInterID
                            this.hform.HICMOEntryID = data[0].HICMOEntryID
                        } else {
                            uni.showToast({
                                title: res.data.Message,

 pages/index/login.vue

@@ -111,7 +111,7 @@
                    "杭州凯贝奈特外网": 'http://erp.hzcabinet.cn:9090/API/',
                    "翁涛涛本地测试": 'http://localhost:81/API/',
                    "陈镐哲本地测试": 'http://192.168.0.174:81/API/',
                    "陈镐哲本地测试2": 'http://192.168.88.82:81/API/',
                    "陈镐哲本地测试2": 'http://192.168.88.45:81/API/',
                    "张瑞广本地测试": 'http://localhost:8082/API/',
                    "余思杰本地测试": 'http://localhost:8082/LuBaoAPI/',
                    "杨权鑫本地测试": 'http://192.168.0.180:8082/API/',