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

yusijie

2026-02-06 28328db7ef0b0270e9e94b6a11b32cb5f9bdac88

 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,7 +215,7 @@
                    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,
                    HEmpName: getUserInfo().HEmpName,
@@ -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: '',
@@ -500,10 +500,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,
                        }
                    })