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/equipment/EamEquipmentLedger.vue |   47 +++++++++++++++++++++++------------------------
 1 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/views/eam/equipment/EamEquipmentLedger.vue b/src/views/eam/equipment/EamEquipmentLedger.vue
index 8ce27e9..f1a896f 100644
--- a/src/views/eam/equipment/EamEquipmentLedger.vue
+++ b/src/views/eam/equipment/EamEquipmentLedger.vue
@@ -65,16 +65,20 @@
 
     <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
     <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')">瀵煎嚭</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
+      <a-button v-has="'eam:equipment:add'" @click="handleAdd" type="primary" icon="plus">鏂板</a-button>
+      <a-button v-has="'eam:equipment:export'" type="primary" icon="download" @click="handleExportXls('璁惧鍙拌处')">瀵煎嚭
+      </a-button>
+      <a-upload v-has="'eam:equipment:import'" name="file" :showUploadList="false" :multiple="false"
+                :headers="tokenHeader" :action="importExcelUrl"
                 @change="handleImportExcel">
         <a-button type="primary" icon="import">瀵煎叆</a-button>
       </a-upload>
-      <a-button type="primary" icon="download" @click="handleTemplateXlsDownload">瀵煎叆妯℃澘涓嬭浇</a-button>
+      <a-button v-has="'eam:equipment:download'" type="primary" icon="download" @click="handleTemplateXlsDownload">
+        瀵煎叆妯℃澘涓嬭浇
+      </a-button>
       <a-dropdown v-if="selectedRowKeys.length > 0">
         <a-menu slot="overlay">
-          <a-menu-item key="2" @click="batchDel">
+          <a-menu-item v-has="'eam:equipment:batchdel'" key="2" @click="batchDel">
             <a-icon type="delete"/>
             鍒犻櫎
           </a-menu-item>
@@ -131,26 +135,21 @@
         </template>
 
         <span slot="action" slot-scope="text, record">
-          <a @click.stop="handleEdit(record)">缂栬緫</a>
+          <a v-has="'eam:equipment:edit'" @click.stop="handleEdit(record)">缂栬緫</a>
 
-          <a-divider type="vertical"/>
+          <a-divider v-has="'eam:equipment:edit'" type="vertical"/>
 
-          <a-dropdown>
-            <a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a href="javascript:;" @click="handleOpenResumeDrawer(record)">灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a v-has="'eam:equipment:resume'" href="javascript:;" @click="handleOpenResumeDrawer(record)">灞ュ巻</a>
+
+          <a-divider v-has="'eam:equipment:resume'" type="vertical"/>
+
+          <a-popconfirm v-has="'eam:equipment:del'" title="纭畾鍒犻櫎鍚�?" @confirm="() => handleDelete(record.id)">
+            <a>鍒犻櫎</a>
+          </a-popconfirm>
+
+          <a-divider v-has="'eam:equipment:del'" type="vertical"/>
+
+          <a href="javascript:;" @click="handleDetail(record)">璇︽儏</a>
         </span>
 
       </a-table>
@@ -417,7 +416,7 @@
             title: '鎿嶄綔',
             dataIndex: 'action',
             align: 'center',
-            width: 150,
+            width: 200,
             scopedSlots: { customRender: 'action' },
             fixed: 'right'
           }

--
Gitblit v1.9.3