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

yusijie

2026-02-06 28328db7ef0b0270e9e94b6a11b32cb5f9bdac88

 pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue

@@ -36,7 +36,7 @@
                <view class="form-item">
                    <view class="title">维修内容:</view>
                    <view class="right">
                        <textarea v-model="hform.HRepairContent" placeholder="请输入验证内容" />
                        <textarea v-model="hform.HRepairContent" placeholder="请输入维修内容" />
                    </view>
                </view>
            <!-- 源单类型 -->
@@ -57,7 +57,7 @@
            
            <!-- 源单单号 -->
            <view class="form-item">
                <view class="title required">源单单号:</view>
                <view class="title">源单单号:</view>
                <view :class="enableSourceBillEdit?'right':'righton'">
                    <input v-model="hform.HMainSourceBillNo" :disabled="!enableSourceBillEdit"
                           @confirm="GetMessageByHMainSourceBillNo(hform.HMainSourceBillNo)" 
@@ -306,7 +306,7 @@
                    HDeleteMan: '',
                    HDeleteDate: '',
                    // 新增的源单相关字段
                    HMainSourceBillType: '设备维修登记单', // 默认为设备维修登记单
                    HMainSourceBillType: '-1', // 默认为设备维修登记单
                    HMainSourceBillNo: '',
                    HMainSourceInterID: 0,
                    HMainSourceEntryID: 0,
@@ -706,10 +706,14 @@
            // 获取职员数据
            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,
                        }
                    })

@@ -857,8 +861,12 @@
                    let oMain = JSON.stringify(this.hform);
                    this.HDetailList[0].HManagerID = this.hform.HManagerID
                    this.HDetailList[0].HRepairID = this.hform.HRepairID
                    let oprType = this.operationType
                    if(oprType == 4){
                        oprType = 1
                    }
                    let sSubStr = JSON.stringify(this.HDetailList);
                    let sMainSub = oMain + ';' + sSubStr + `;-1;${this.operationType}` + ';' + getUserInfo()[
                    let sMainSub = oMain + ';' + sSubStr + `;-1;${oprType}` + ';' + getUserInfo()[
                    'Czymc'];
                    let res = await CommonUtils.doRequest2Sync({
                        url: "/Sb_EquipRepairSendWorkBill/AddEquipRepairSendWorkBill",
@@ -934,6 +942,8 @@
                        this.hform.HBarName = data1.设备名称
                        this.hform.HBarModel = data1.设备型号
                        this.hform.HBarSpec = data1.设备规格
                        this.hform.HRepairContent = data1.故障描述
                        
                    }
                    else {
                        CommonUtils.showTips({