From 075cc6cdfe236118fcd25dbfa5285aa4c412d342 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 14 十一月 2023 11:21:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/authority/role.vue | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index bece5ed..6ac1858 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -20,25 +20,27 @@
@refresh-change="refreshChange"
@on-load="onLoad">
<template slot="menuLeft">
- <el-button type="danger"
- size="small"
- icon="el-icon-delete"
- v-if="permission.role_delete"
- plain
- @click="handleDelete">鍒� 闄�
+ <el-button v-if="permissionList.delBtn"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ @click="handleDelete">
+ 鍒� 闄�
</el-button>
- <el-button size="small"
- icon="el-icon-setting"
- @click="handleRole"
- v-if="userInfo.role_name.includes('admin')"
- plain>鏉冮檺璁剧疆
+ <!-- v-if="userInfo.role_name.includes('admin')" -->
+ <el-button v-if="permissionList.authSettingBtn"
+ size="small"
+ icon="el-icon-setting"
+ @click="handleRole"
+ plain>鏉冮檺璁剧疆
</el-button>
</template>
</avue-crud>
<el-dialog title="瑙掕壊鏉冮檺閰嶇疆"
append-to-body
:visible.sync="box"
- width="350px"
+ width="350px"
style="height: 115vh; margin-top: -13vh; overflow: hidden">
<el-tabs type="border-card" style="overflow-y: auto; height: 72vh">
<el-tab-pane label="鑿滃崟鏉冮檺">
@@ -113,6 +115,7 @@
option: {
height: "auto",
tip: false,
+ columnBtn:false,
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
@@ -212,10 +215,11 @@
...mapGetters(["userInfo", "permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.role_add, false),
- viewBtn: this.vaildData(this.permission.role_view, false),
- delBtn: this.vaildData(this.permission.role_delete, false),
- editBtn: this.vaildData(this.permission.role_edit, false)
+ addBtn: this.vaildData(this.permission.role.role_add, false),
+ viewBtn: this.vaildData(this.permission.role.role_view, false),
+ delBtn: this.vaildData(this.permission.role.role_delete, false),
+ editBtn: this.vaildData(this.permission.role.role_edit, false),
+ authSettingBtn: this.vaildData(this.permission.role.role_auth_setting,false),
};
},
ids() {
--
Gitblit v1.9.3