From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点,若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱

---
 src/views/eam/modules/equipmentNew/EquipmentDocumentList.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/eam/modules/equipmentNew/EquipmentDocumentList.vue b/src/views/eam/modules/equipmentNew/EquipmentDocumentList.vue
index 7002013..af5b351 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentDocumentList.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentDocumentList.vue
@@ -24,6 +24,7 @@
         @click="handleAdd"
         type="primary"
         icon="plus"
+        v-has="'accountSons:add&edit&delete&submit'"
       >鏂板</a-button>
       <!-- <a-button type="primary" icon="download" @click="handleExportXls('璁惧鏂囨。')">瀵煎嚭</a-button>
       <a-upload
@@ -35,7 +36,7 @@
         @change="handleImportExcel">
           <a-button type="primary" icon="import">瀵煎叆</a-button>
       </a-upload> -->
-      <a-dropdown v-if="selectedRowKeys.length > 0">
+      <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'accountSons:add&edit&delete&submit'">
         <a-menu slot="overlay">
           <a-menu-item
             key="1"
@@ -85,7 +86,7 @@
           slot="action"
           slot-scope="text, record"
         >
-          <a @click="handleEdit(record)">缂栬緫</a>
+          <a @click="handleEdit(record)" v-has="'accountSons:add&edit&delete&submit'">缂栬緫</a>
 
           <a-divider type="vertical" />
 
@@ -125,6 +126,7 @@
           <a-popconfirm
             title="纭畾鍒犻櫎鍚�?"
             @confirm="() => handleDelete(record.id)"
+            v-has="'accountSons:add&edit&delete&submit'"
           >
             <a>鍒犻櫎</a>
           </a-popconfirm>

--
Gitblit v1.9.3