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

wtt

9 天以前 5064e9fe8abc757c1098c402a57e33a213d5ff4c

 pages/MJGL/Sb_EquipRepairCheckBill/Sb_EquipRepairCheckBill.vue

@@ -41,12 +41,7 @@
                        </radio-group>
                    </view>
                </view>
                <view class="form-item">
                    <view class="title">验收内容:</view>
                    <view class="right">
                        <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="请输入验收内容" />
                    </view>
                </view>
               
                <!-- 维修记录（源单） -->
                <view class="form-item">
                    <view class="title required">维修记录:</view>
@@ -89,17 +84,23 @@
                    </zxz-uni-data-select>
                </view>
                <view class="form-item">
                    <view class="title">验收项目:</view>
                    <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="维修验收项目"
                        dataValue="hitemid" v-model="hform.HRepairCheckID">
                    </zxz-uni-data-select>
                </view>
                <view class="form-item">
                    <view class="title required">负责人:</view>
                    <zxz-uni-data-select required class="right" :localdata="HEmpList" dataKey="HName"
                        dataValue="HItemID" v-model="hform.HManagerID">
                    </zxz-uni-data-select>
                </view>
            <view class="form-item">
                <view class="title required">验收项目:</view>
                <zxz-uni-data-select required class="right" :localdata="HRepairCheckList" dataKey="维修验收项目"
                    dataValue="hitemid" v-model="hform.HRepairCheckID">
                </zxz-uni-data-select>
            </view>
            <view class="form-item">
                <view class="title">验收内容:</view>
                <view class="right">
                    <textarea v-model="HDetailList[0].HRepairCheckContent" placeholder="请输入验收内容" />
                </view>
            </view>
                <view class="form-item">
                    <view class="title">设备名称:</view>
                    <view class="righton">
@@ -118,6 +119,12 @@
                        <input v-model="hform.HBarModel" disabled />
                    </view>
                </view>
            <view class="form-item">
               <view class="title">备注:</view>
               <view class="right">
                  <textarea v-model="hform.HRemark" placeholder="请输入备注" />
               </view>
            </view>
            </view>
        </template>
        <!-- 其他信息 -->
@@ -187,7 +194,7 @@
        <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload>

        <!-- 源单单据列表弹窗 -->
        <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="hform.HBillType" :HSourceBillType="'设备维修记录单'"
        <BillListPopupEquipConkBookBillVue ref="billList" :HEquipID="hform.HEquipID" :HBillType="hform.HBillType" :HSourceBillType="'设备维修记录单'"
            :HStockOrgID="hform.HStockOrgID">
        </BillListPopupEquipConkBookBillVue>
    </view>
@@ -249,6 +256,7 @@
                    "HEquipID": 0,
                    "HBarSpec": "",
                    "HBarModel": "",
               "HRemark": "",
                    "HMaker": getUserInfo()["Czymc"],
                    "HMakeDate": dayjs(new Date()).format("YYYY-MM-DD"),
                    "HUpDater": "",
@@ -390,36 +398,37 @@

            // 提交数据有效性校验
            ValidCheck() {
                if (this.hform.HEquipID == 0) {
                if (this.hform.HEquipID == 0 || this.hform.HEquipID === undefined) {
                    return {
                        Message: "未录入设备信息，请先录入设备信息!",
                        state: false
                    }
                }
                if (this.hform.HDeptID == 0) {
                if (this.hform.HDeptID == 0 || this.hform.HDeptID === undefined) {
                    return {
                        Message: "部门不得为空!",
                        state: false
                    }
                }
                if (this.hform.HEmpID == 0) {
                if (this.hform.HEmpID == 0 || this.hform.HEmpID === undefined) {
                    return {
                        Message: "验收人不得为空!",
                        state: false
                    }
                }
                if (this.hform.HRepairCheckID == 0) {
            if (this.hform.HManagerID == 0 || this.hform.HManagerID === undefined) {
                return {
                    Message: "负责人不得为空!",
                    state: false
                }
            }
                if (this.hform.HRepairCheckID == 0 || this.hform.HRepairCheckID === undefined) {
                    return {
                        Message: "验证项目不得为空!",
                        Message: "验收项目不得为空!",
                        state: false
                    }
                }
                if (this.hform.HManagerID == 0) {
                    return {
                        Message: "负责人不得为空!",
                        state: false
                    }
                }
                
                // 新增：维修记录校验
                if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
                    return {
@@ -723,11 +732,6 @@
                    if(count == 1) {
                        this.hform.HRepairCheckID = this.HRepairCheckList.find(item => data[0]["表体维修项目"] == item["维修验收项目"])?.hitemid
                        this.HDetailList[0].HRepairCheckContent = data[0].维修内容
                    }else {
                       CommonUtils.showTips({
                           title: "温馨提示",
                           message: `获取派工单失败: ${Message}`
                       }) 
                    }
                }catch(err) {
                    CommonUtils.showTips({