From d286265fcefa1ab2233742cf1e30b38ae6c9215f Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期六, 12 七月 2025 14:38:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index b91805c..b546ca0 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -65,7 +65,6 @@
<a-divider type="vertical" v-if="record.maintenanceStatus === 'COMPLETE'"/>
<a v-if="record.maintenanceStatus === 'COMPLETE'" @click="handlePrint(record)">鎵撳嵃</a>
</template>
-
</span>
</a-table>
</div>
@@ -116,22 +115,26 @@
align: 'center',
customRender: function(t, r, index) {
return parseInt(index) + 1
- }
+ },
+ fixed: 'left'
},
{
title: '缁熶竴缂栫爜',
align: 'center',
- dataIndex: 'equipmentCode'
+ dataIndex: 'equipmentCode',
+ fixed: 'left'
},
{
title: '璁惧鍚嶇О',
align: 'center',
- dataIndex: 'equipmentName'
+ dataIndex: 'equipmentName',
+ fixed: 'left'
},
{
title: '璁惧鍨嬪彿',
align: 'center',
- dataIndex: 'equipmentModel'
+ dataIndex: 'equipmentModel',
+ fixed: 'left'
},
{
title: '宸ュ崟鍙�',
@@ -166,7 +169,7 @@
{
title: '缁翠慨宸�',
align: 'center',
- dataIndex: 'operator_dictText'
+ dataIndex: 'repairer_dictText'
},
{
title: '淇濆吇鐘舵��',
@@ -191,12 +194,12 @@
{
title: '妫�鏌ヤ汉纭',
align: 'center',
- dataIndex: 'confirmLeader_dictText'
+ dataIndex: 'inspector_dictText'
},
{
title: '妫�鏌ヤ汉纭鏃堕棿',
align: 'center',
- dataIndex: 'leaderConfirmTime'
+ dataIndex: 'inspectConfirmTime'
},
{
title: 'HF缂栫爜',
--
Gitblit v1.9.3