From b17d5d4454c88070912140d2efbf0150b1fec3a2 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 20 五月 2025 14:20:29 +0800
Subject: [PATCH] art: 设备管理-二保-列表修改

---
 src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
index 02310e0..294a261 100644
--- a/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
+++ b/src/views/eam/maintenance/EamSecondMaintenanceOrderList.vue
@@ -78,26 +78,27 @@
         :pagination="ipagination"
         :loading="loading"
         class="j-table-force-nowrap"
+        :scroll="{x:'max-content'}"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
         <span slot="action" slot-scope="text, record">
-          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE' && isShowAuth('eam:secondMaintenance:edit')">
-          <a @click="handleEdit(record)">缂栬緫</a>
+          <template v-if="record.maintenanceStatus === 'WAIT_MAINTENANCE'">
+          <a @click="handleEdit(record)" v-if="isShowAuth('eam:secondMaintenance:edit')">缂栬緫</a>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-if="isShowAuth('eam:secondMaintenance:edit')" />
 
-          <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)">
+          <a-popconfirm title="纭畾棰嗗彇鍚�?" @confirm="() => handlerCollect(record.id)" v-if="isShowAuth('eam:secondMaintenance:collect')">
             <a>棰嗗彇</a>
           </a-popconfirm>
 
-          <a-divider type="vertical" />
+          <a-divider type="vertical" v-if="isShowAuth('eam:secondMaintenance:collect')" />
 
           <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-menu-item v-if="isShowAuth('eam:secondMaintenance:abolish')">
+                <a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handlerAbolish(record.id)" >
                   <a>浣滃簾</a>
                 </a-popconfirm>
               </a-menu-item>
@@ -215,6 +216,42 @@
           dataIndex: 'creationMethod_dictText'
         },
         {
+          title: '纭绠$悊鍛�',
+          align: 'center',
+          dataIndex: 'confirmUser_dictText',
+          width: 60
+        },
+        {
+          title: '绠$悊鍛樼‘璁ゆ椂闂�',
+          align: 'center',
+          dataIndex: 'confirmTime',
+          width: 60
+        },
+        {
+          title: '绠$悊鍛樻剰瑙�',
+          align: 'center',
+          dataIndex: 'confirmComment',
+          width: 60
+        },
+        {
+          title: '纭棰嗗',
+          align: 'center',
+          dataIndex: 'confirmLeader_dictText',
+          width: 60
+        },
+        {
+          title: '棰嗗纭鏃堕棿',
+          align: 'center',
+          dataIndex: 'leaderConfirmTime',
+          width: 60
+        },
+        {
+          title: '棰嗗鎰忚',
+          align: 'center',
+          dataIndex: 'leaderConfirmComment',
+          width: 60
+        },
+        {
           title: '澶囨敞',
           align: 'center',
           dataIndex: 'remark'

--
Gitblit v1.9.3