From 815c6be8d063ca1ec89079722d265585f7d3602c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 11:05:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/authority/role.vue | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index bece5ed..55bd32a 100644
--- a/Source/UBCS-WEB/src/views/authority/role.vue
+++ b/Source/UBCS-WEB/src/views/authority/role.vue
@@ -27,18 +27,18 @@
plain
@click="handleDelete">鍒� 闄�
</el-button>
+ <!-- v-if="userInfo.role_name.includes('admin')" -->
<el-button size="small"
- icon="el-icon-setting"
- @click="handleRole"
- v-if="userInfo.role_name.includes('admin')"
- plain>鏉冮檺璁剧疆
+ 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 +113,7 @@
option: {
height: "auto",
tip: false,
+ columnBtn:false,
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
--
Gitblit v1.9.3