From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
index 627783b..967fa43 100644
--- a/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
+++ b/src/views/eam/modules/daily3MaintenanceOrder/EquipmentPrecisionCheckOrderModal.vue
@@ -70,7 +70,7 @@
:wrapperCol="wrapperCol"
label="淇濆吇鍗曚綅"
>
- <span v-if="this.model != null">{{ this.model.actualEndTime }}</span>
+ <span v-if="this.model != null">{{ this.model.manageName }}</span>
<span v-else>-</span>
</a-form-item>
</a-col>
@@ -197,8 +197,7 @@
<a-input v-model="model.sparePart" />
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
+
<a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
@@ -213,7 +212,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+
+ <!-- <a-col :span="12">
<a-form-item
:labelCol="{ span: 8 }"
:wrapperCol="{ span: 4 }"
@@ -225,6 +227,35 @@
@change="handle5Switch(model.meetProcessRequire)"
:checked="model.meetProcessRequire == '1'"
/>
+ </a-form-item>
+ </a-col> -->
+ <a-col :span="12">
+ <a-form-item
+ style="font-size: large;font-style: normal;font-size: 15px;"
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑳藉惁婊¤冻鍔犲伐宸ヨ壓瑕佹眰"
+ >
+ <j-dict-select-tag
+ style="font-size: large;font-style: normal;font-size: 15px;width: 100%"
+ allow-clear
+ :triggerChange="true"
+ dictCode="meet_process_require"
+ v-model="model.meetProcessRequire"
+ />
+
+ </a-form-item>
+ </a-col>
+ <a-col
+ v-if="model.meetProcessRequire =='3'"
+ :span="12"
+ >
+ <a-form-item
+ :labelCol="{ span: 8 }"
+ :wrapperCol="{ span: 12 }"
+ label="鑷畾涔夎鏄庯細"
+ >
+ <a-input v-model="model.meetProcessRequireRemark" />
</a-form-item>
</a-col>
</a-row>
@@ -377,6 +408,7 @@
dataSource: [],
model: {},
departs: [],
+
labelCol: {
xs: { span: 24 },
sm: { span: 6 },
@@ -488,6 +520,7 @@
if (res.success) {
this.dataSource = res.result[0].precisionInspectionDetails
this.model = Object.assign(this.model, res.result[0]);
+ this.model = Object.assign({}, this.model);
}
})
},
--
Gitblit v1.9.3