From 52663e888fff7f234729199ee7be9b425ba1138d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期三, 15 四月 2026 17:00:30 +0800
Subject: [PATCH] 优化设备故障维修全流程页面与功能
---
pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
index c960191..6da9aff 100644
--- a/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
+++ b/pages/MJGL/Sb_EquipRepairSendWork/Sb_EquipRepairSendWorkBill.vue
@@ -32,13 +32,7 @@
<input :value="hform.HRepairPlanEndDate" />
</uni-datetime-picker>
</view>
- </view>
- <view class="form-item">
- <view class="title">缁翠慨鍐呭:</view>
- <view class="right">
- <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
- </view>
- </view>
+ </view>
<!-- 婧愬崟绫诲瀷 -->
<view class="form-item">
<view class="title">婧愬崟绫诲瀷:</view>
@@ -113,17 +107,29 @@
</zxz-uni-data-select>
</view>
<view class="form-item">
- <view class="title">缁翠慨椤圭洰:</view>
- <zxz-uni-data-select class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
- dataValue="hitemid" v-model="hform.HRepairID">
- </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 class="right" :localdata="HRepairList" dataKey="缁翠慨椤圭洰"
+ dataValue="hitemid" v-model="hform.HRepairID">
+ </zxz-uni-data-select>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨瑕佹眰:</view>
+ <view class="right">
+ <textarea v-model="HDetailList[0].HRepairExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
+ </view>
+ </view>
+ <view class="form-item">
+ <view class="title">缁翠慨鍐呭:</view>
+ <view class="right">
+ <textarea v-model="hform.HRepairContent" placeholder="璇疯緭鍏ョ淮淇唴瀹�" />
+ </view>
+ </view>
<view class="form-item">
<view class="title">璁惧鍚嶇О:</view>
<view class="righton">
@@ -142,18 +148,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 class="form-item">
- <view class="title">缁翠慨瑕佹眰:</view>
- <view class="right">
- <textarea v-model="HDetailList[0].HRepairExplanation" placeholder="璇疯緭鍏ョ淮淇姹�" />
- </view>
- </view>
+ <view class="form-item">
+ <view class="title">澶囨敞:</view>
+ <view class="right">
+ <textarea v-model="hform.HRemark" placeholder="璇疯緭鍏ュ娉�" />
+ </view>
+ </view>
</view>
</template>
@@ -223,7 +223,7 @@
</view>
<!-- <xe-upload ref="XeUpload" :options="uploadOptions" @callback="handleUploadCallback"></xe-upload> -->
<!-- 婧愬崟鍗曟嵁鍒楄〃寮圭獥 -->
- <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="HBillType"
+ <BillListPopupEquipConkBookBillVue ref="billList" :HBillType="HBillType" :HEquipID="hform.HEquipID"
:HSourceBillType="hform.HMainSourceBillType" :HStockOrgID="hform.HStockOrgID">
</BillListPopupEquipConkBookBillVue>
</view>
@@ -527,30 +527,36 @@
},
// 鎻愪氦鏁版嵁鏈夋晥鎬ф牎楠�
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.HManagerID == 0) {
+ if (this.hform.HManagerID == 0 || this.hform.HManagerID === undefined) {
return {
Message: "璐熻矗浜轰笉寰椾负绌�!",
state: false
}
}
+ if (this.hform.HRepairID == 0 || this.hform.HRepairID === undefined) {
+ return {
+ Message: "缁翠慨椤圭洰涓嶅緱涓虹┖!",
+ state: false
+ }
+ }
// 娣诲姞婧愬崟鏍¢獙锛堝鏋滀笉鏄墜宸ュ綍鍏ワ紝鍒欏繀椤婚�夋嫨婧愬崟锛�
if (this.hform.HMainSourceBillType !== '鎵嬪伐褰曞叆') {
if (!this.hform.HMainSourceBillNo || this.hform.HMainSourceBillNo.trim() === '') {
@@ -764,7 +770,7 @@
},
toScanCode() {
MpaasScan.scanCode(cb => {
- this.hform.HBarCode = cb; // 淇锛氬師鏉ユ槸 hfrom 搴旇鏄� hform
+ this.hform.HBarCode = cb;
this.GetMessageByBarCode(cb)
})
},
--
Gitblit v1.9.1