From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
index f0ec1cb..8f1e428 100644
--- a/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -79,7 +79,7 @@
<eamThirdMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/>
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal"
- :selectShenpiData="selectThirdMaintenanceData"/>
+ :selectShenpiData="selectedRowData"/>
<!--宸ュ崟鍙樻洿寮圭獥-->
<eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/>
@@ -93,8 +93,7 @@
import { deleteAction, getAction } from '@api/manage'
import ThirdMaintenanceApprovalModal
from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue'
- import EamThirdMaintenanceChangeModal
- from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue'
+ import EamThirdMaintenanceChangeModal from './modules/EamThirdMaintenanceChangeModal.vue'
export default {
name: 'EamThirdMaintenanceOrderList',
@@ -115,7 +114,7 @@
return {
description: '璁惧涓夌骇淇濆吇绠＄悊椤甸潰',
disableMixinCreated: true,
- selectThirdMaintenanceData: {},
+ selectedRowData: {},
// 琛ㄥご
columns: [
{
@@ -148,6 +147,12 @@
fixed: 'left'
},
{
+ title: '淇濆吇鐘舵��',
+ align: 'center',
+ dataIndex: 'maintenanceStatus_dictText',
+ fixed: 'left'
+ },
+ {
title: '宸ュ崟鍙�',
align: 'center',
dataIndex: 'orderNum'
@@ -176,11 +181,6 @@
title: '缁翠慨浜�',
align: 'center',
dataIndex: 'repairman_dictText'
- },
- {
- title: '淇濆吇鐘舵��',
- align: 'center',
- dataIndex: 'maintenanceStatus_dictText'
},
{
title: '鍒涘缓鏂瑰紡',
@@ -284,6 +284,7 @@
dataIndex: 'action',
align: 'center',
fixed: 'right',
+ width: 200,
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
@@ -355,11 +356,11 @@
* @param record
*/
handleDetail(record) {
- this.selectThirdMaintenanceData = Object.assign({}, record)
+ this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.title = '璇︽儏'
this.$refs.thirdMaintenanceApprovalModal.visible = true
this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true
- this.$refs.thirdMaintenanceApprovalModal.recordDetail(record)
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
},
onMaintenanceDateChange(dateString) {
--
Gitblit v1.9.3