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

wangyi

2026-03-12 be6aab24e85b7d2fa0a6279ee93af0f62cd90406

 pages/MJGL/Sb_EquipConkBook/Sb_EquipConkBookBill.vue

@@ -78,7 +78,7 @@
                    <!-- <input disabled v-model="hform.HDeptName" placeholder="请选择部门" /> -->
                </view>
                <view class="form-item">
                    <view class="title required">负责人:</view>
                    <view class="title required">验收人:</view>
                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
                        dataValue="HItemID" v-model="hform.HManagerID">

@@ -207,7 +207,7 @@

                hform: {
                    HBarCode: "",
                    HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HConkBeginDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HConkTypeName: "",
                    HConkTypeID: 0,
                    HConkReasonName: "",
@@ -215,9 +215,9 @@
                    HExplanation: "",
                    HBillNo: "",
                    HInterID: 0,
                    HDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HDeptName: getUserInfo().HDeptName,
               HDeptID: getUserInfo().HDeptID,
                    HDeptID: getUserInfo().HDeptID,
                    HEmpName: getUserInfo().HEmpName,
                    HEmpID: getUserInfo().HEmpID,
                    HManagerName: getUserInfo().HManagerName,
@@ -230,7 +230,7 @@
                    HChecker: '',
                    HCloseMan: '',
                    HUpDater: '',
                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss"),
                    HMakeDate: dayjs(new Date()).format("YYYY-MM-DD"),
                    HCheckDate: '',
                    HCloseDate: '',
                    HUpDateDate: '',
@@ -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,10 +501,15 @@
            // 获取职员数据
            async getEmpList() {
                try {
                    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: {
                            sWhere: " where 1=1",
                            sWhere: sWhere,
                        }
                    })

@@ -784,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]["使用部门"],