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/maintenancePlan/EquipmentMaintenancePlanForm.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index fd6eaa7..4dbe70c 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
@@ -67,14 +67,14 @@
:wrapperCol="wrapperCol"
prop="ranges"
>
- <a-range-picker
+ <a-range-picker
v-model="model.ranges"
style="width:100%"
format="YYYY-MM-DD HH:mm:ss"
showTime
:placeholder="[ '璁″垝寮�濮嬫椂闂�', '璁″垝缁撴潫鏃堕棿']"
@change="changeDate"
- />
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -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,
--
Gitblit v1.9.3