From 1e653db94c24389cc7615fd4a7ef1d63b00af534 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:39:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/repair/EamRepairOrderList.vue |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/views/eam/repair/EamRepairOrderList.vue b/src/views/eam/repair/EamRepairOrderList.vue
index 5d01fd4..3869ba3 100644
--- a/src/views/eam/repair/EamRepairOrderList.vue
+++ b/src/views/eam/repair/EamRepairOrderList.vue
@@ -44,7 +44,7 @@
 
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator" v-if="isDisplayOperation">
-      <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus">棰嗗彇</a-button>
+      <a-button @click="handleOpenReceiveFaultModal" type="primary" icon="plus"  v-if="isShowAuth('eam:repair:collect')">棰嗗彇</a-button>
       <!--<a-button type="primary" icon="download" @click="handleExportXls('缁翠慨宸ュ崟')">瀵煎嚭</a-button>-->
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
@@ -123,23 +123,34 @@
         // 琛ㄥご
         columns: [
           {
+            title: '#',
+            dataIndex: '',
+            key: 'rowIndex',
+            width: 60,
+            align: 'center',
+            customRender: function(t, r, index) {
+              return parseInt(index) + 1
+            },
+            fixed: 'left',
+          },
+          {
             title: '宸ュ崟缂栧彿',
             align: 'center',
             dataIndex: 'repairCode',
-            width: 200,
+            width: 120,
             fixed: 'left'
           },
-          // {
-          //   title: '鎶ヤ慨缂栧彿',
-          //   align: 'center',
-          //   dataIndex: 'reportId',
-          //   width: 200,
-          //   fixed: 'left'
-          // },
           {
             title: '璁惧缂栧彿',
             align: 'center',
-            dataIndex: 'equipmentId_dictText',
+            dataIndex: 'equipmentCode',
+            width: 120,
+            fixed: 'left'
+          },
+          {
+            title: '璁惧鍚嶇О',
+            align: 'center',
+            dataIndex: 'equipmentName',
             width: 200,
             fixed: 'left'
           },

--
Gitblit v1.9.3