From eb45fafc624372b454d1a47311d82851007d4582 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期二, 05 九月 2023 11:25:10 +0800
Subject: [PATCH] bug修改
---
src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue | 139 ++++++++++++++++++++++------------------------
1 files changed, 67 insertions(+), 72 deletions(-)
diff --git a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
index 42bafe9..ba98bf4 100644
--- a/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
+++ b/src/views/eam/modules/malfunctionRepair/MalfunctionRepaireModal.vue
@@ -26,7 +26,7 @@
</a-form-item>
</a-col>
<a-col :span="24/2">
- <!-- <a-form-item
+ <a-form-item
label="鏄惁鍋滄満缁翠慨"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -39,7 +39,12 @@
dictCode="is_stop"
v-decorator="['isStop', validatorRules.isStop]"
/>
- </a-form-item> -->
+ </a-form-item>
+
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
label="璁惧缂栫爜"
:labelCol="labelCol"
@@ -52,6 +57,22 @@
@search="onSearchEquipmentList()"
:read-only="true"
v-decorator="['equipmentNum', validatorRules.equipmentNum]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="24/2">
+ <a-form-item
+ label="鏁呴殰鏃堕棿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <j-date
+ :disabled="disableSubmit"
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
+ :showTime="true"
+ dateFormat="YYYY-MM-DD HH:mm:ss"
+ v-decorator="['faultTime', validatorRules.faultTime]"
/>
</a-form-item>
</a-col>
@@ -85,36 +106,36 @@
/>
</a-form-item>
</a-col>
- <a-row
- hidden
- :gutter="24"
- >
- <a-col :span="12">
- <a-form-item
- label="璁惧Id"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
- v-decorator="['equipmentId', validatorRules.equipmentId ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
- <a-form-item
- label="浣跨敤閮ㄩ棬Id"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- :disabled="true"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
- v-decorator="['useDepartId', validatorRules.useDepartId ]"
- />
- </a-form-item>
- </a-col>
+ <a-row
+ hidden
+ :gutter="24"
+ >
+ <a-col :span="12">
+ <a-form-item
+ label="璁惧Id"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヨ澶囩紪鐮�/鍚嶇О/鍨嬪彿'"
+ v-decorator="['equipmentId', validatorRules.equipmentId ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="浣跨敤閮ㄩ棬Id"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ :disabled="true"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ娇鐢ㄩ儴闂╥d'"
+ v-decorator="['useDepartId', validatorRules.useDepartId ]"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
</a-row>
<a-row :gutter="24">
@@ -171,22 +192,7 @@
/>
</a-form-item>
</a-col>
- <a-col :span="24/2">
- <a-form-item
- label="鏁呴殰鏃堕棿"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <j-date
- :disabled="disableSubmit"
- style="width: 100%"
- placeholder="璇烽�夋嫨鏁呴殰鏃堕棿"
- :showTime="true"
- dateFormat="YYYY-MM-DD HH:mm:ss"
- v-decorator="['faultTime', validatorRules.faultTime]"
- />
- </a-form-item>
- </a-col>
+
</a-row>
<a-row :gutter="24">
<a-col :span="24/2">
@@ -219,25 +225,14 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="24">
+ </a-row>
+ <!-- <a-row :gutter="24">
+ <a-col :span="24/2">
<a-form-item
label="鏁呴殰鐓х墖"
- :labelCol="{span:3}"
- :wrapperCol="{span:21}"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
>
- <!-- <j-image-upload-self
- :isMultiple="false"
- v-decorator="['photo', {}]"
- @ok="uploadOk"
- >
- </j-image-upload-self> -->
- <!-- <j-image-upload
- :isMultiple="false"
- @ok="uploadOk"
- v-decorator="['photo', {}]"
- /> -->
<j-image-upload
:disabled="disableSubmit"
:isMultiple="true"
@@ -246,7 +241,7 @@
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
</a-form>
</a-spin>
@@ -316,11 +311,11 @@
{ required: true, message: '璇疯緭鍏ュ叆搴撳崟缂栧彿!' },
]
},
- // isStop: {
- // rules: [
- // { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
- // ]
- // },
+ isStop: {
+ rules: [
+ { required: true, message: '璇烽�夋嫨鏄惁鍋滄満!' },
+ ]
+ },
equipmentNum: {
rules: [
{ required: true, message: '璇烽�夋嫨璁惧!' },
@@ -358,7 +353,7 @@
that.model = Object.assign({}, record);
that.visible = true;
that.$nextTick(() => {
- that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId','equipmentNum', 'equipmentName','equipmentModel','equipmentSpecification','urgency','useDepartId','departName', 'faultDescription', 'faultTime', 'remark', "photo"));
+ that.form.setFieldsValue(pick(that.model, 'num', 'isStop', 'equipmentId', 'equipmentNum', 'equipmentName', 'equipmentModel', 'equipmentSpecification', 'urgency', 'useDepartId', 'departName', 'faultDescription', 'faultTime', 'remark', "photo"));
});
if (record.id) {
this.codeDisable = true;
@@ -417,7 +412,7 @@
},
sendEquipmentRecord(data) {
let record = data.record;
- this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id,equipmentNum:record.num,equipmentModel:record.model,equipmentSpecification:record.specification,useDepartId:record.useId,departName:record.useId_dictText });
+ this.form.setFieldsValue({ equipmentName: record.name, equipmentId: record.id, equipmentNum: record.num, equipmentModel: record.model, equipmentSpecification: record.specification, useDepartId: record.useId, departName: record.useId_dictText });
},
},
--
Gitblit v1.9.3