From df18b23b4569828d6be32fb64c80492241e1fc46 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 16 十月 2023 20:31:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/authority/role.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/authority/role.vue b/Source/UBCS-WEB/src/views/authority/role.vue
index bc4a369..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="鑿滃崟鏉冮檺">
@@ -84,6 +84,7 @@
import {add, getPage, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
import {mapGetters} from "vuex";
import website from '@/config/website';
+ import {setStore, getStore} from '@/util/store'
export default {
data() {
@@ -112,6 +113,7 @@
option: {
height: "auto",
tip: false,
+ columnBtn:false,
// simplePage: true,
searchShow: true,
searchMenuSpan: 6,
@@ -142,8 +144,8 @@
prop: "tenantId",
type: "tree",
dicUrl: "/api/ubcs-system/tenant/select",
- addDisplay: false,
- editDisplay: false,
+ addDisplay: website.tenantId === getStore({name: 'tenantId'}),
+ editDisplay: website.tenantId === getStore({name: 'tenantId'}),
viewDisplay: website.tenantMode,
span: 24,
props: {
@@ -154,7 +156,7 @@
search: website.tenantMode,
rules: [{
required: true,
- message: "璇疯緭鍏ユ墍灞炵鎴�",
+ message: "璇烽�夋嫨鎵�灞炵鎴�",
trigger: "click"
}]
},
--
Gitblit v1.9.3