From fdd75d75c3a3a582f120a0e1e873eacc61c732e8 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 15 三月 2024 15:48:28 +0800
Subject: [PATCH] xg
---
src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue | 3 ++-
src/views/eam/modules/malfunctionRepair/AcceptModel.vue | 21 +++++++++++++++++++--
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index fd6eaa7..bff6447 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
@@ -370,7 +370,7 @@
let ids = []
let tableData = this.$refs.equipmentMaintenancePlanDetail.getTableData()
for (let i = 0; i < tableData.length; i++) {
- ids.push(tableData[i].standardId)
+ ids.push(tableData[i].equipmentId)
}
this.$refs.standardSelectModel.showModal(ids)
this.$refs.standardSelectModel.title = '閫夋嫨璁惧'
@@ -387,6 +387,7 @@
id: data[i].id,
standardId: data[i].id,
standardNum: data[i].num,
+ equipmentId: data[i].equipmentId,
equipmentNum: data[i].equipmentNum,
equipmentName: data[i].equipmentName,
model: data[i].equipmentModel,
diff --git a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
index e9674f0..d392958 100644
--- a/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
+++ b/src/views/eam/modules/malfunctionRepair/AcceptModel.vue
@@ -27,9 +27,23 @@
</a-input>
</a-form-model-item>
</a-col>
+ <!-- 楠屾敹鎰忚涓�1锛氬悓鎰� 锛�2锛氶┏浼� -->
<a-col :span="24">
<a-form-model-item
label="楠屾敹鎰忚"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="errUda4"
+ >
+ <a-radio-group v-model="model.errUda4">
+ <a-radio value="1">鍚屾剰</a-radio>
+ <a-radio value="2">椹冲洖</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
+ <a-form-model-item
+ label="鎰忚"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="errUda5"
@@ -37,7 +51,7 @@
<a-textarea
v-model="model.errUda5"
rows="4"
- placeholder="楠屾敹鎰忚"
+ placeholder="鎰忚"
/>
</a-form-model-item>
</a-col>
@@ -92,13 +106,16 @@
confirmLoading: false,
validatorRules: {
errUda5: [
- { required: true, message: "璇疯緭鍏ラ獙鏀舵剰瑙�" },
+ { required: true, message: "璇疯緭鍏ユ剰瑙�" },
{ min: 0, max: 100, message: '闀垮害涓嶈秴杩� 100 涓瓧绗�' },
],
errUda3: [
{ required: true, message: "璇疯緭鍏ュ悕绉�" },
{ min: 0, max: 10, message: '鍚嶇О涓嶈秴杩� 10 涓瓧绗�' },
],
+ errUda4: [
+ { required: true, message: "璇烽�夋嫨楠屾敹鎰忚" },
+ ],
},
url: {
accept: "/eam/equipmentReportRepair/accept",
--
Gitblit v1.9.3