From f1f06630866d890b475209219316b2a113351000 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 九月 2024 09:48:00 +0800
Subject: [PATCH] 430最终问题修改
---
src/views/eam/modules/equipmentNew/EquipmentModal.vue | 50 ++++++++++++++++
src/views/eam/PredictiveWorkOrderList.vue | 74 ++++++++++++------------
src/views/eam/InspectionCycleList.vue | 10 +-
src/views/eam/FaultCauseChartEquipment.vue | 2
src/views/eam/MaintenanceCycleList.vue | 10 +-
5 files changed, 98 insertions(+), 48 deletions(-)
diff --git a/src/views/eam/FaultCauseChartEquipment.vue b/src/views/eam/FaultCauseChartEquipment.vue
index 4926cc9..fe85085 100644
--- a/src/views/eam/FaultCauseChartEquipment.vue
+++ b/src/views/eam/FaultCauseChartEquipment.vue
@@ -79,7 +79,7 @@
<a-card
:loading="loading"
:bordered="false"
- title="鏈�杩戜竴鏈堣澶囨晠闅滄鏁扮粺璁�"
+ title="璁惧鏁呴殰娆℃暟缁熻"
:style="{ marginTop: '24px' }"
>
<!--<a-row>
diff --git a/src/views/eam/InspectionCycleList.vue b/src/views/eam/InspectionCycleList.vue
index e1d149b..5621339 100644
--- a/src/views/eam/InspectionCycleList.vue
+++ b/src/views/eam/InspectionCycleList.vue
@@ -210,11 +210,11 @@
align: 'center',
dataIndex: 'code',
},
- {
- title: '鍛ㄦ湡鍚嶇О',
- align: 'center',
- dataIndex: 'name',
- },
+ // {
+ // title: '鍛ㄦ湡鍚嶇О',
+ // align: 'center',
+ // dataIndex: 'name',
+ // },
{
title: '鍛ㄦ湡',
align: 'center',
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index 80c00f5..f3f6985 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -197,11 +197,11 @@
align: 'center',
dataIndex: 'code',
},
- {
- title: '鍛ㄦ湡鍚嶇О',
- align: 'center',
- dataIndex: 'name',
- },
+ // {
+ // title: '鍛ㄦ湡鍚嶇О',
+ // align: 'center',
+ // dataIndex: 'name',
+ // },
{
title: '鍛ㄦ湡',
align: 'center',
diff --git a/src/views/eam/PredictiveWorkOrderList.vue b/src/views/eam/PredictiveWorkOrderList.vue
index 8b6f356..a9ed8ca 100644
--- a/src/views/eam/PredictiveWorkOrderList.vue
+++ b/src/views/eam/PredictiveWorkOrderList.vue
@@ -49,14 +49,14 @@
<a-col
:md="6"
:sm="8"
- >
- <a-form-item label="璁惧鍚嶇О">
- <a-input
- placeholder="璇疯緭鍏ヨ澶囧悕绉�"
- v-model="queryParam.equipmentName"
- ></a-input>
- </a-form-item>
- </a-col>
+ >
+ <a-form-item label="璁惧鍚嶇О">
+ <a-input
+ placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+ v-model="queryParam.equipmentName"
+ ></a-input>
+ </a-form-item>
+ </a-col>
<a-col
:md="6"
:sm="8"
@@ -258,9 +258,9 @@
ref="PredictiveWorkOrderDrawer"
@ok="modalFormOk"
></predictive-work-order-drawer>
- <order-assign-modal
- ref="OrderAssign"
- @ok="modalFormOk"
+ <order-assign-modal
+ ref="OrderAssign"
+ @ok="modalFormOk"
>
</order-assign-modal>
@@ -387,17 +387,17 @@
dataIndex: 'actualEndTime',
width: 170
},
- {
- title: '鍒涘缓浜�',
- align: "center",
- dataIndex: 'createBy'
- },
- {
- title: '鍒涘缓鏃ユ湡',
- align: "center",
- dataIndex: 'createTime',
- width: 170
- },
+ // {
+ // title: '鍒涘缓浜�',
+ // align: "center",
+ // dataIndex: 'createBy'
+ // },
+ // {
+ // title: '鍒涘缓鏃ユ湡',
+ // align: "center",
+ // dataIndex: 'createTime',
+ // width: 170
+ // },
{
title: '鎿嶄綔',
dataIndex: 'action',
@@ -446,25 +446,25 @@
},
handleOrderExe(record) {
- this.$refs. PredictiveWorkOrderDrawer.visible = true
- this.$refs. PredictiveWorkOrderDrawer.title = '涓撲笟淇濆吇宸ュ崟鎵ц'
- this.$refs. PredictiveWorkOrderDrawer.handleShow(record)
+ this.$refs.PredictiveWorkOrderDrawer.visible = true
+ this.$refs.PredictiveWorkOrderDrawer.title = '涓撲笟淇濆吇宸ュ崟鎵ц'
+ this.$refs.PredictiveWorkOrderDrawer.handleShow(record)
if (record.status === '3') {
- this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
- this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true//鎾ら攢鎸夐挳
- this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = false//寮�宸ユ寜閽�
+ this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
+ this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true//鎾ら攢鎸夐挳
+ this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = false//寮�宸ユ寜閽�
} else if (record.status === '4') {
- this.$refs. PredictiveWorkOrderDrawer.buttonDistable = false
- this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
- this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.buttonDistable = false
+ this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
} else if (record.status === '5') {
- this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
- this.$refs. PredictiveWorkOrderDrawer.revocationDistable = false
- this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.revocationDistable = false
+ this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
} else if (record.status === '7') {
- this.$refs. PredictiveWorkOrderDrawer.buttonDistable = true
- this.$refs. PredictiveWorkOrderDrawer.revocationDistable = true
- this.$refs. PredictiveWorkOrderDrawer.SWbuttonDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.buttonDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.revocationDistable = true
+ this.$refs.PredictiveWorkOrderDrawer.SWbuttonDistable = true
}
},
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 6714376..3976c6a 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -526,6 +526,56 @@
</a-col>
</a-row>
<a-row>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='浜屼繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='secondMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨浜屼繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.secondMaintenanceTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='涓変繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='thirdMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨涓変繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.thirdMaintenanceTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='6'>
+ <a-form-model-item
+ label='涓嬫涓変繚鏃ユ湡'
+ :labelCol='labelCol'
+ :wrapperCol='wrapperCol'
+ prop='nextThirdMaintenanceTime'
+ >
+ <j-date
+ :disabled='true'
+ style='width: 100%;'
+ placeholder='璇烽�夋嫨涓嬫涓変繚鏃ユ湡'
+ class='query-group-cust'
+ v-model='model.nextThirdMaintenanceTime'
+ ></j-date>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
<a-divider
orientation='center'
style='font-size: large;font-style: italic;color: #66aeed;'
--
Gitblit v1.9.3