From b86d97b09d1aca57291004c1a2bc014f90702918 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 26 一月 2024 16:14:39 +0800
Subject: [PATCH] 提交代码

---
 Source/UBCS-WEB/src/views/authority/role.vue |   37 +++++++++++++++++++++----------------
 1 files changed, 21 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..9ad91ca 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,8 @@
         option: {
           height: "auto",
           tip: false,
+          calcHeight: 20,
+          columnBtn:false,
           // simplePage: true,
           searchShow: true,
           searchMenuSpan: 6,
@@ -212,10 +216,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