From 029a6d4f2739cee27c7857af060b119eb461878f Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期一, 30 十月 2023 15:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
index 13d9c64..ae05671 100644
--- a/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
+++ b/src/views/eam/modules/dailyMaintenanceOrder/FinishDevolutionModal.vue
@@ -78,6 +78,7 @@
rowKey='id'
:columns="columns"
:dataSource="dataSource"
+ :pagination="false"
>
</a-table>
@@ -190,7 +191,7 @@
{
title: '绫诲瀷',
align: 'center',
- dataIndex: 'maintenanceMethod1'
+ dataIndex: 'maintenanceRole'
},
{
@@ -201,7 +202,7 @@
{
title: '淇濆吇椤圭洰',
align: 'center',
- dataIndex: 'maintenanceProjectNum'
+ dataIndex: 'maintenanceProjectName'
},
{
title: '淇濆吇鏍囧噯',
@@ -211,12 +212,12 @@
{
title: '鎵ц鎯呭喌',
align: 'center',
- dataIndex: 'maintenanceTool1'
+ dataIndex: 'maintenanceOrderDetailUda2'
},
{
title: '鎵ц浜�',
align: 'center',
- dataIndex: 'photo1',
+ dataIndex: 'maintenanceOrderDetailUda1',
},
],
--
Gitblit v1.9.3