From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu
---
src/views/authority/role.vue | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index d55d34a..0fc1a38 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -30,11 +30,12 @@
</el-button>
<el-button
icon="el-icon-setting"
- @click="handleRole"
v-if="userInfo.role_name.includes('admin')"
+ @click="handleRole"
plain
>权限设置
</el-button>
+ <!-- -->
</template>
</avue-crud>
<el-dialog title="角色权限配置" append-to-body v-model="box" width="345px">
@@ -50,7 +51,7 @@
>
</el-tree>
</el-tab-pane>
- <el-tab-pane label="数据权限">
+ <!-- <el-tab-pane label="数据权限">
<el-tree
:data="dataScopeGrantList"
show-checkbox
@@ -71,7 +72,7 @@
:props="props"
>
</el-tree>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
<template #footer>
<span class="dialog-footer">
@@ -147,29 +148,29 @@
},
],
},
- {
- label: '所属租户',
- prop: 'tenantId',
- type: 'tree',
- dicUrl: '/blade-system/tenant/select',
- addDisplay: false,
- editDisplay: false,
- viewDisplay: website.tenantMode,
- span: 24,
- props: {
- label: 'tenantName',
- value: 'tenantId',
- },
- hide: !website.tenantMode,
- search: website.tenantMode,
- rules: [
- {
- required: true,
- message: '请输入所属租户',
- trigger: 'click',
- },
- ],
- },
+ // {
+ // label: '所属租户',
+ // prop: 'tenantId',
+ // type: 'tree',
+ // dicUrl: '/blade-system/tenant/select',
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: website.tenantMode,
+ // span: 24,
+ // props: {
+ // label: 'tenantName',
+ // value: 'tenantId',
+ // },
+ // hide: !website.tenantMode,
+ // search: website.tenantMode,
+ // rules: [
+ // {
+ // required: true,
+ // message: '请输入所属租户',
+ // trigger: 'click',
+ // },
+ // ],
+ // },
{
label: '角色别名',
prop: 'roleAlias',
@@ -253,8 +254,10 @@
},
submit() {
const menuList = this.$refs.treeMenu.getCheckedKeys();
- const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
- const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+ // const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+ const dataScopeList = [];
+ // const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+ const apiScopeList = [];
grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
this.box = false;
this.$message({
--
Gitblit v1.9.3