From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index a0df89f..083f2da 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -62,7 +62,7 @@
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰缂栧彿"
:labelCol="labelCol"
@@ -70,12 +70,12 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
+ :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩紪鍙�'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰鍚嶇О"
@@ -87,6 +87,20 @@
:disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩悕绉�'"
v-decorator="['name', validatorRules.name ]"
+ />
+ </a-form-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="淇濆吇鏍囧噯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
+ v-decorator="['standard', validatorRules.standard ]"
/>
</a-form-item>
</a-col>
@@ -125,21 +139,8 @@
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- label="淇濆吇鏍囧噯"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
- v-decorator="['standard', validatorRules.standard ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
+
+ <!-- <a-col :span="12">
<a-form-item
label="缁翠繚涓撲笟"
:labelCol="labelCol"
@@ -154,7 +155,7 @@
v-decorator="['maintenanceSpecialtyId', validatorRules.maintenanceSpecialtyId]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row :gutter="24">
<a-col :span="12">
@@ -172,6 +173,7 @@
/>
</a-form-item>
</a-col>
+
</a-row>
<a-row :gutter="24">
<a-col :span="24">
@@ -293,7 +295,7 @@
this.visible = true;
this.disableSubmit = false;
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'maintenanceProjectCategoryNumName', 'maintenanceRequire', 'num', 'name', 'maintenanceMethod', 'maintenanceTool', 'maintenanceSpecialtyId', 'standard', 'workingHourQuota', 'remark'))
+ this.form.setFieldsValue(pick(this.model, 'maintenanceProjectCategoryNumName', 'maintenanceRequire', 'num', 'name', 'maintenanceMethod', 'maintenanceTool', 'maintenanceSpecialtyId', 'standard', 'workingHourQuota', 'location', 'remark'))
});
if (record.id) {
this.codeDisable = true;
--
Gitblit v1.9.3