From 233494b19c74c7678f36eef42d481f01ed0b360c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 26 十月 2023 17:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/menu.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/menu.vue b/Source/UBCS-WEB/src/views/system/menu.vue
index 3f4ac08..e30bf08 100644
--- a/Source/UBCS-WEB/src/views/system/menu.vue
+++ b/Source/UBCS-WEB/src/views/system/menu.vue
@@ -21,14 +21,14 @@
@on-load="onLoad"
@tree-load="treeLoad">
<template slot="menuLeft">
- <el-button v-if="this.permission.menu.menu_delete"
+ <el-button v-if="permissionList.delBtn"
icon="el-icon-delete"
plain
size="small"
type="danger"
@click="handleDelete">鍒� 闄�
</el-button>
- <el-button v-if="this.permission.menu.menu_clone"
+ <el-button v-if="permissionList.cloneBtn"
icon="el-icon-connection"
plain
size="small"
@@ -38,7 +38,7 @@
</template>
<template slot="menu" slot-scope="scope">
<el-button
- v-if="userInfo.role_name.includes('admin') && scope.row.category === 1"
+ v-if="permissionList.addChildBtn && scope.row.category === 1"
icon="el-icon-circle-plus-outline"
size="small"
type="text"
@@ -442,7 +442,9 @@
addBtn: this.vaildData(this.permission.menu.menu_add, false),
viewBtn: this.vaildData(this.permission.menu.menu_view, false),
delBtn: this.vaildData(this.permission.menu.menu_delete, false),
- editBtn: this.vaildData(this.permission.menu.menu_edit, false)
+ editBtn: this.vaildData(this.permission.menu.menu_edit, false),
+ cloneBtn: this.vaildData(this.permission.menu.menu_clone,false),
+ addChildBtn: this.vaildData(this.permission.menu.menu_add_child,false),
};
},
--
Gitblit v1.9.3