From 1a5ab0d78c55273b173397ebd8ed06b0ba8978cd Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期四, 14 三月 2024 16:44:57 +0800
Subject: [PATCH] xg
---
src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue | 63 +++++++++++++++++++++++++++++++
src/views/eam/EquipmentMaintenancePlanList.vue | 39 +++++++++++++++++++
2 files changed, 100 insertions(+), 2 deletions(-)
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 5d10f17..0b94b4a 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -23,6 +23,23 @@
></j-input>
</a-form-item>
</a-col>
+ <!-- 鎸夊垱寤烘椂闂磋寖鍥存绱� -->
+ <a-col
+ :xl="6"
+ :lg="7"
+ :md="8"
+ :sm="24">
+ <a-form-item label="鍒涘缓鏃堕棿">
+ <a-range-picker
+ v-model="ranges"
+ style="width:100%"
+ format="YYYY-MM-DD HH:mm:ss"
+ showTime
+ placeholder="璇烽�夋嫨鍒涘缓鏃堕棿"
+ @change="changeDate"
+ />
+ </a-form-item>
+ </a-col>
<a-col
:xl="6"
:lg="7"
@@ -37,6 +54,8 @@
/>
</a-form-item>
</a-col>
+
+
<a-col
:xl="6"
:lg="7"
@@ -267,6 +286,7 @@
data() {
return {
description: '淇濆吇璁″垝绠＄悊椤甸潰',
+ ranges:[],
// 琛ㄥご
columns: [
{
@@ -383,6 +403,11 @@
this.equipmentMaintenancePlanDetailMainId = selectionRows[0]['id']
this.mainStatus = selectionRows[0]['status']
},
+ searchReset() {
+ this.queryParam = {}
+ this.ranges = []
+ this.loadData()
+ },
loadData(arg) {
if (!this.url.list) {
this.$message.error("璇疯缃畊rl.list灞炴��!")
@@ -466,7 +491,19 @@
}).finally(res => {
this.loadData();
})
- }
+ },
+ // 灏唕anges杞寲涓哄紑濮嬫椂闂村拰缁撴潫鏃堕棿
+ changeDate() {
+ if (this.ranges.length === 0) {
+ this.queryParam.beginTime = ''
+ this.queryParam.endTime = ''
+ } else {
+ //鍚庣鎶ヨ繖涓敊rejected value ["2024-03-14T06:26:38.692Z"]
+ this.queryParam.beginTime = this.ranges[0].format('YYYY-MM-DD')
+ this.queryParam.endTime = this.ranges[1].format('YYYY-MM-DD')
+ }
+ },
+
}
}
</script>
diff --git a/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue b/src/views/eam/modules/maintenancePlan/EquipmentMaintenancePlanForm.vue
index af9b878..fd6eaa7 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="璁″垝鍗曠被鍨�"
@@ -37,6 +57,24 @@
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>
</a-row>
@@ -71,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>
@@ -109,6 +147,11 @@
},
data() {
return {
+ ranges: [],
+ selectOptions: [
+ { label: '鎵�鏈夎澶�', value: '0' },
+ { label: '閮ㄥ垎璁惧', value: '1' }
+ ],
toolbarConfig: {
// prefix 鍓嶇紑锛泂uffix 鍚庣紑
slot: ['prefix', 'suffix'],
@@ -135,6 +178,12 @@
],
type: [
{ required: true, message: '璇烽�夋嫨璁″垝鍗曠被鍨�!' },
+ ],
+ selectOption: [
+ { required: true, message: '璇烽�夋嫨淇濆吇璁惧!' },
+ ],
+ ranges: [
+ { required: true, message: '璇烽�夋嫨璁″垝鏃堕棿!' },
],
},
refKeys: ['equipmentMaintenancePlanDetail',],
@@ -335,6 +384,7 @@
var equipmentMaintenancePlanDetail = {}
if (tableStr.indexOf(data[i].id) == -1) {
equipmentMaintenancePlanDetail = {
+ id: data[i].id,
standardId: data[i].id,
standardNum: data[i].num,
equipmentNum: data[i].equipmentNum,
@@ -376,6 +426,17 @@
}
})
},
+ //涓昏〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿鍙橈紝瀛愯〃璁″垝寮�濮嬫椂闂村拰璁″垝缁撴潫鏃堕棿涔熷彉
+ 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 = []
--
Gitblit v1.9.3