From f79bb27a83f3de364b586d7a2a515f92ef9e29dd Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 07 三月 2025 11:25:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/repairorder/RepairOrderModal.vue | 62 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/modules/repairorder/RepairOrderModal.vue b/src/views/eam/modules/repairorder/RepairOrderModal.vue
index 8449cfd..2b6bfc3 100644
--- a/src/views/eam/modules/repairorder/RepairOrderModal.vue
+++ b/src/views/eam/modules/repairorder/RepairOrderModal.vue
@@ -13,9 +13,9 @@
<a-row :gutter="24">
<a-col :span="24/2">
<a-form-item label="鍗曟嵁鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol">
- <a-input
+ <a-input
allow-clear
- placeholder="璇疯緭鍏ュ崟鎹彿"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
v-decorator="['num', validatorRules.num]"
/>
</a-form-item>
@@ -86,7 +86,7 @@
</a-form-item>
</a-col>
<a-col :span="24" >
- <a-form-item label="璁惧缂栫爜" :labelCol="{span:3}" :wrapperCol="{span:21}">
+ <a-form-item label="缁熶竴缂栫爜" :labelCol="{span:3}" :wrapperCol="{span:21}">
<a-input-search
:disabled="disableSubmit"
placeholder="璇烽�夋嫨璁惧"
@@ -159,11 +159,11 @@
</a-form-item>
</a-col>
<a-col :span="24/2" >
- <a-form-item label="濮斿鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-item label="澶栧鍗曚綅" :labelCol="labelCol" :wrapperCol="wrapperCol">
<j-dict-select-tag
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇烽�夋嫨濮斿鍗曚綅'"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨澶栧鍗曚綅'"
:triggerChange="true"
dictCode="mom_base_supplier,name,id, del_flag='0'"
v-decorator="['outsourcingUnit', validatorRules.outsourcingUnit]"
@@ -239,6 +239,26 @@
<j-date placeholder="璇烽�夋嫨璁″垝缁撴潫鏃堕棿" v-decorator="['planEndTime', validatorRules.planEndTime ]" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
</a-form-item>
</a-col>
+ <a-col :span="24/2" >
+ <a-form-item label="鏁呴殰鍘熷洜" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input v-decorator="['faultReason', validatorRules.faultReason]" placeholder="璇疯緭鍏ユ晠闅滃師鍥�" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2" >
+ <a-form-item label="鏁呴殰鐜拌薄" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="disableSubmit" v-decorator="['faultPhenomenon', validatorRules.faultPhenomenon]" placeholder="璇疯緭鍏ユ晠闅滅幇璞�" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2" >
+ <a-form-item label="鏁呴殰鎺掗櫎" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="disableSubmit" v-decorator="['faultRemove', validatorRules.faultRemove]" placeholder="璇疯緭鍏ユ晠闅滄帓闄�" ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2" >
+ <a-form-item label="棰勯槻鎺柦" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-input :disabled="disableSubmit" v-decorator="['preventiveMeasure', validatorRules.preventiveMeasure]" placeholder="璇疯緭鍏ラ闃叉帾鏂�" ></a-input>
+ </a-form-item>
+ </a-col>
<a-col :span="24">
<a-form-item label="鏁呴殰鎻忚堪" :labelCol="{span:3}" :wrapperCol="{span:21}" >
<a-textarea rows="2" v-decorator="['faultDescription', validatorRules.faultDescription ]" placeholder="璇疯緭鍏ユ晠闅滄弿杩�" ></a-textarea>
@@ -295,7 +315,7 @@
export default {
name: "RepairOrderModal",
- components: {
+ components: {
JMultiSelectTag,
Tooltip,
FaultReportRepair,
@@ -359,6 +379,26 @@
rules: [
{ required: true, message: '璇烽�夋嫨璐ｄ换鐝粍!' },
]
+ },
+ faultReason:{
+ rules: [
+ { required: true, message: '璇峰～鍐欐晠闅滃師鍥�!' },
+ ]
+ },
+ faultPhenomenon:{
+ rules: [
+ { required: true, message: '璇峰～鍐欐晠闅滅幇璞�!' },
+ ]
+ },
+ preventiveMeasure:{
+ rules: [
+ { required: true, message: '璇峰～鍐欓闃叉帾鏂�!' },
+ ]
+ },
+ faultRemove:{
+ rules: [
+ { required: true, message: '璇峰～鍐欐晠闅滄帓闄�!' },
+ ]
}
},
url: {
@@ -372,7 +412,7 @@
equipmentList:[],
teamList:[],
userList:[],
-
+
}
},
created () {
@@ -395,7 +435,7 @@
that.form.setFieldsValue(pick(that.model, 'num', 'equipmentId','equipmentNum','equipmentModel',
'equipmentName','urgency','businessType','projectMaintenanceOrderNum','reportRepairId','reportRepairId_dictText','reportRepairNum','dispatchMethod',
'maintenanceMethod','responsibilityName','outsourcingUnit','responsibilityId','teamId','workingHourQuota','planStartTime','departName',
- 'planEndTime','faultDescription','photo','remark'));
+ 'planEndTime','faultDescription','photo','remark','faultReason','faultPhenomenon','preventiveMeasure','faultRemove'));
});
},
close () {
@@ -405,9 +445,9 @@
},
handleOk () {
const that = this;
-
+
// 瑙﹀彂琛ㄥ崟楠岃瘉
-
+
this.form.validateFields((err, values) => {
if (!err) {
that.confirmLoading = true;
@@ -505,7 +545,7 @@
sendFaultReportRepairRecord(data) {
let record = data.record;
this.form.setFieldsValue({ reportRepairId:record.id,equipmentId: record.equipmentId,equipmentNum:record.equipmentNum,equipmentName: record.equipmentName,equipmentModel:record.equipmentModel,reportRepairNum:record.num,
- urgency:record.urgency, departId: record.useDepartId,departName:record.useDepartId_dictText });
+ urgency:record.urgency, departId: record.useDepartId,departName:record.useDepartId_dictText,faultReason:record.faultReason });
},
onProjectMaintenanceOrder() {
this.$refs.ProjectMaintenanceOrder.list();
--
Gitblit v1.9.3