From e1e7e01e40f3de2bd40d2de974a876f4f29abda2 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 22 七月 2025 14:54:50 +0800
Subject: [PATCH] 三保变更
---
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 137 +++++++++++++++++++++++++++++++++------------
1 files changed, 101 insertions(+), 36 deletions(-)
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index 00e0647..f0ec1cb 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -47,38 +47,30 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
<template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
- <a @click="handleEdit(record)">缂栬緫</a>
-
- <a-divider type="vertical"/>
-
<a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
<a>棰嗗彇</a>
</a-popconfirm>
<a-divider type="vertical"/>
- <a-dropdown>
- <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handlerAbolish(record.id)">
- <a>浣滃簾</a>
- </a-popconfirm>
- </a-menu-item>
- <a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+ <a @click="handlerAbolish(record.id)">浣滃簾</a>
+
+ <a-divider type="vertical"/>
</template>
- <template v-else>
- <a @click="handleDetail(record)">璇︽儏</a>
+ <template v-if="record.maintenanceStatus == 'WAIT_MAINTENANCE'||record.maintenanceStatus=='FREEZE'">
+ <a @click="handleOrderChange(record)">鍙樻洿</a>
+
+ <a-divider type="vertical"/>
</template>
- <a-divider v-if="record.maintenanceStatus === 'COMPLETE'" type="vertical"/>
+ <a @click="handleDetail(record)">璇︽儏</a>
- <a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
+ <template v-if="record.maintenanceStatus === 'COMPLETE'">
+ <a-divider type="vertical"/>
+
+ <a @click="handlePrint(record)">鎵撳嵃</a>
+ </template>
</span>
</a-table>
<!-- table鍖哄煙-end -->
@@ -88,6 +80,9 @@
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
:selectShenpiData="selectThirdMaintenanceData"/>
+
+ <!--宸ュ崟鍙樻洿寮圭獥-->
+ <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
</a-card>
</template>
@@ -98,11 +93,14 @@
import { deleteAction, getAction } from '@api/manage'
import ThirdMaintenanceApprovalModal
from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
+ import EamThirdMaintenanceChangeModal
+ from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
export default {
name: 'EamThirdMaintenanceOrderList',
mixins: [JeecgListMixin],
components: {
+ EamThirdMaintenanceChangeModal,
LxSearchEquipmentSelect,
EamThirdMaintenanceOrderModal,
ThirdMaintenanceApprovalModal
@@ -175,9 +173,9 @@
dataIndex: 'actualEndTime'
},
{
- title: '淇濆吇浜�',
+ title: '缁翠慨浜�',
align: 'center',
- dataIndex: 'operator_dictText'
+ dataIndex: 'repairman_dictText'
},
{
title: '淇濆吇鐘舵��',
@@ -190,32 +188,90 @@
dataIndex: 'creationMethod_dictText'
},
{
- title: '鏈哄姩鍔炵‘璁�',
+ title: '璁惧鍔熻兘鏄惁榻愬',
align: 'center',
- dataIndex: 'confirmUser_dictText'
+ dataIndex: 'fullyFunctional_dictText'
},
{
- title: '鏈哄姩鍔炵‘璁ゆ椂闂�',
+ title: '璁惧鑳藉惁姝ｅ父杩愯浆',
align: 'center',
- dataIndex: 'confirmTime'
+ dataIndex: 'runningNormally_dictText'
},
{
- title: '纭棰嗗',
+ title: '妫�鏌ヤ汉',
align: 'center',
- dataIndex: 'confirmLeader_dictText'
+ dataIndex: 'inspector_dictText'
},
{
- title: '棰嗗纭鏃堕棿',
+ title: '妫�鏌ユ椂闂�',
align: 'center',
- dataIndex: 'leaderConfirmTime'
+ dataIndex: 'inspectTime'
+ },
+ {
+ title: '鎿嶄綔浜虹瀛�',
+ align: 'center',
+ dataIndex: 'operatorSignature_dictText'
+ },
+ {
+ title: '鍗忓姪鎿嶄綔浜�',
+ align: 'center',
+ dataIndex: 'assistantOperator'
+ },
+ {
+ title: '鎿嶄綔浜虹瀛楁椂闂�',
+ align: 'center',
+ dataIndex: 'operatorSignatureTime'
+ },
+ {
+ title: '缁翠慨浜虹瀛�',
+ align: 'center',
+ dataIndex: 'repairmanSignature_dictText'
+ },
+ {
+ title: '鍗忓姪缁翠慨浜�',
+ align: 'center',
+ dataIndex: 'assistantRepairman'
+ },
+ {
+ title: '缁翠慨浜虹瀛楁椂闂�',
+ align: 'center',
+ dataIndex: 'repairmanSignatureTime'
+ },
+ {
+ title: '缁翠慨瀹や富浠荤瀛�',
+ align: 'center',
+ dataIndex: 'repairManagerSignature_dictText'
+ },
+ {
+ title: '缁翠慨瀹や富浠荤瀛楁椂闂�',
+ align: 'center',
+ dataIndex: 'repairManagerSignatureTime'
+ },
+ {
+ title: '璁惧妫�鏌ヤ汉绛惧瓧',
+ align: 'center',
+ dataIndex: 'inspectorSignature_dictText'
+ },
+ {
+ title: '璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿',
+ align: 'center',
+ dataIndex: 'inspectorSignatureTime'
+ },
+ {
+ title: '绉讳氦鍗旽F缂栫爜',
+ align: 'center',
+ dataIndex: 'hfCodeA'
+ },
+ {
+ title: '楠屾敹鍗旽F缂栫爜',
+ align: 'center',
+ dataIndex: 'hfCodeB'
}
],
url: {
list: '/eam/thirdMaintenanceOrder/list',
abolish: '/eam/thirdMaintenanceOrder/abolish',
- abolishBatch: '/eam/thirdMaintenanceOrder/abolishBatch',
- collect: '/eam/thirdMaintenanceOrder/collect',
- collectBatch: '/eam/thirdMaintenanceOrder/collectBatch'
+ collect: '/eam/thirdMaintenanceOrder/collect'
}
}
},
@@ -228,7 +284,6 @@
dataIndex: 'action',
align: 'center',
fixed: 'right',
- width: 200,
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
@@ -262,6 +317,15 @@
},
/**
+ * 鐐瑰嚮鍙樻洿鏃惰Е鍙�
+ * @param record
+ */
+ handleOrderChange(record) {
+ this.$refs.orderChangeModal.title = '鍙樻洿'
+ this.$refs.orderChangeModal.add(record)
+ },
+
+ /**
* 鐐瑰嚮棰嗗彇鏃惰Е鍙�
* @param id
*/
@@ -292,9 +356,10 @@
*/
handleDetail(record) {
this.selectThirdMaintenanceData = Object.assign({}, record)
- this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
+ this.$refs.thirdMaintenanceApprovalModal.visible = true
this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
+ this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
},
onMaintenanceDateChange(dateString) {
--
Gitblit v1.9.3