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 | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 70 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index 7938c7f..4dbe70c 100644
--- a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
+++ b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
@@ -22,6 +22,26 @@
></a-input>
</a-form-model-item>
</a-col>
+ <!-- 閫夋嫨妗嗛�夐」涓�0锛氭墍鏈夎澶� 1锛氶儴鍒嗚澶� -->
+ <a-col :span="12">
+ <a-form-model-item
+ label="淇濆吇璁惧閫夋嫨"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="selectOption"
+ >
+ <a-select
+ v-model="model.selectOption"
+ placeholder="璇烽�夋嫨淇濆吇璁惧"
+ >
+ <a-select-option
+ v-for="item in selectOptions"
+ :key="item.value"
+ :value="item.value"
+ >{{item.label}}</a-select-option>
+ </a-select>
+ </a-form-model-item>
+ </a-col>
<a-col :span="12">
<a-form-model-item
label="璁″垝鍗曠被鍨�"
@@ -35,6 +55,25 @@
:triggerChange="true"
dictCode="maintenance_type"
v-model="model.type"
+ @change="(e)=>handleClearTable(e)"
+ />
+ </a-form-model-item>
+ </a-col>
+ <!-- 璁″垝寮�濮嬫椂闂达紝璁″垝缁撴潫鏃堕棿 -->
+ <a-col :span="12">
+ <a-form-model-item
+ label="璁″垝鏃堕棿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="ranges"
+ >
+ <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>
@@ -70,7 +109,7 @@
<a-button
type='primary'
@click='standardSelect'
- :disabled="formDisabled||model.type===null||model.type===undefined||model.type===''"
+ :disabled="formDisabled||model.type===null||model.type===undefined||model.type===''||model.selectOption!=='1'"
icon="plus"
>璁惧-淇濆吇鏍囧噯
</a-button>
@@ -108,6 +147,11 @@
},
data() {
return {
+ ranges: [],
+ selectOptions: [
+ { label: '鎵�鏈夎澶�', value: '0' },
+ { label: '閮ㄥ垎璁惧', value: '1' }
+ ],
toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
@@ -134,6 +178,12 @@
],
type: [
{ required: true, message: '璇烽�夋嫨璁″垝鍗曠被鍨�!' },
+ ],
+ selectOption: [
+ { required: true, message: '璇烽�夋嫨淇濆吇璁惧!' },
+ ],
+ ranges: [
+ { required: true, message: '璇烽�夋嫨璁″垝鏃堕棿!' },
],
},
refKeys: ['equipmentMaintenancePlanDetail',],
@@ -320,10 +370,10 @@
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 = '閫夋嫨绮惧害鍙傛暟'
+ this.$refs.standardSelectModel.title = '閫夋嫨璁惧'
this.$refs.standardSelectModel.disableSubmit = false
},
addSelected(data) {
@@ -334,8 +384,10 @@
var equipmentMaintenancePlanDetail = {}
if (tableStr.indexOf(data[i].id) == -1) {
equipmentMaintenancePlanDetail = {
+ 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,
@@ -375,6 +427,21 @@
}
})
},
+ //涓昏〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿鍙橈紝瀛愯〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿涔熷彉
+ changeDate(date, dateString) {
+ this.model.beginTime = dateString[0];
+ this.model.endTime = dateString[1];
+ let tableData = this.$refs.equipmentMaintenancePlanDetail.getTableData()
+ for (let i = 0; i < tableData.length; i++) {
+ let row = this.$refs.equipmentMaintenancePlanDetail.getRowById(tableData[i].standardId);
+ row.planStartTime = dateString[0]
+ row.planEndTime = dateString[1]
+ }
+ },
+
+ handleClearTable(e) {
+ this.equipmentMaintenancePlanDetailTable.dataSource = []
+ }
}
}
</script>
--
Gitblit v1.9.3