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/equipmentCategory/EquipmentCategoryLeft.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
index d0bf837..f8e4bbe 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
+++ b/src/views/eam/modules/equipmentCategory/EquipmentCategoryLeft.vue
@@ -77,13 +77,13 @@
placement="bottomCenter"
>
<a-menu slot="overlay">
- <a-menu-item v-if="key!=-1">
+ <a-menu-item v-if="key!=-1" v-has="'equipmentCategory:add&Edit&delete'">
<a
href="javascript:;"
@click="handleEdit(entity)"
>缂栬緫</a>
</a-menu-item>
- <a-menu-item>
+ <a-menu-item v-has="'equipmentCategory:add&Edit&delete'">
<a
href="javascript:;"
@click="handleAdd(entity)"
@@ -91,7 +91,7 @@
娣诲姞瀛愮被鍒�
</a>
</a-menu-item>
- <a-menu-item v-if="key!=-1&&leaf">
+ <a-menu-item v-if="key!=-1&&leaf" v-has="'equipmentCategory:add&Edit&delete'">
<a-popconfirm
title="纭畾鍒犻櫎鍚�?"
@confirm="() => handleDelete(entity.id)"
@@ -169,6 +169,7 @@
this.$refs.modalForm.title = "鏂板";
this.$refs.modalForm.disableSubmit = false;
this.$refs.modalForm.parentId = record.id;
+ this.$refs.modalForm.equipmentCategoryUda1 = record.equipmentCategoryUda1;
},
onClearSelected() {
this.hiding = true;
--
Gitblit v1.9.3