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/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue b/src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue
index 4e5efad..e721afa 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/MaintenanceStandardSafetyRequirement.vue
@@ -19,6 +19,7 @@
       icon="plus"
       v-if="specialtyMaintenanceStandardSelectionRows.length == 1 "
       :disabled="addDisableStatus"
+      v-has="'specialtyMaintenanceStandard:safetyRequirementAdd'"
     >鏂板</a-button>
     <div>
 
@@ -42,7 +43,10 @@
             title="纭畾鍒犻櫎鍚�?"
             @confirm="() => handleDelete(record.id)"
           >
-            <a v-if="!addDisableStatus">鍒犻櫎</a>
+            <a
+              v-has="'specialtyMaintenanceStandard:safetyRequirementDelete'"
+              v-if="!addDisableStatus"
+            >鍒犻櫎</a>
           </a-popconfirm>
         </span>
       </a-table>
@@ -73,10 +77,10 @@
       default: '-1',
       required: false
     },
-    addDisableStatus:{
-      type:Boolean,
-      required:false,
-      default:true,
+    addDisableStatus: {
+      type: Boolean,
+      required: false,
+      default: true,
     }
   },
   mounted() {

--
Gitblit v1.9.3