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

wangyi

2026-03-03 fbe87c8d043cb038d384df7721bc071676a0c24c

 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue

@@ -217,7 +217,7 @@
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HDeptName: getUserInfo().HDeptName,
               HDeptID: getUserInfo().HDeptID,
                    HDeptID: getUserInfo().HDeptID,
                    HEmpName: getUserInfo().HEmpName,
                    HEmpID: getUserInfo().HEmpID,
                    HManagerName: getUserInfo().HManagerName,
@@ -261,10 +261,11 @@
            async getConkType() {
                try {
                    let res = await CommonUtils.doRequest2Async({
                        url: "/Gy_ConkType/List_PDA",
                        url: '/Gy_ConkType/List_PDA2',
                        data: {
                            sWhere: ``,
                            user: getUserInfo()['Czymc']
                            sWhere: '',
                            user: getUserInfo()['Czymc'],
                            mode: 'Equip'
                        }
                    })

@@ -344,7 +345,7 @@
                }
                if (this.hform.HManagerID == 0) {
                    return {
                        Message: "负责人不得为空!",
                        Message: "验收人不得为空!",
                        state: false
                    }
                }
@@ -500,11 +501,11 @@
            // 获取职员数据
            async getEmpList() {
                try {
                    let sWhere=  " where 1=1 "
                    if(this.hform.HDeptName && uni.getStorageSync("Organization") == '宁波市华舟包装有限公司'){
                    let sWhere = " where 1=1 "
                    if (this.hform.HDeptName && uni.getStorageSync("Organization") == '宁波市华舟包装有限公司') {
                        sWhere += ` and HDeptName = '${this.hform.HDeptName}'`
                    }
                    

                    let res = await CommonUtils.doRequest2Async({
                        url: '/PublicPageMethod/UserList',
                        data: {
@@ -789,7 +790,7 @@
                        count
                    } = res.data
                    if (count == 1) {
                        console.log('data: ',data);
                        console.log('data: ', data);
                        Object.assign(this.hform, {
                            HDeptID: data[0]["HDeptID"],
                            HDeptName: data[0]["使用部门"],