From d04ec69df4f6e73a99ab70ec6aecf4c48ade4f81 Mon Sep 17 00:00:00 2001
From: 严俊东 <1172482914@qq.com>
Date: 星期五, 10 七月 2020 12:52:45 +0800
Subject: [PATCH] 角色权限修改时已有权限未自动勾选异常修复
---
ruoyi-ui/src/views/system/role/index.vue | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 658efc6..1739f0a 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -368,16 +368,16 @@
},
/** 根据角色ID查询菜单树结构 */
getRoleMenuTreeselect(roleId) {
- roleMenuTreeselect(roleId).then(response => {
+ return roleMenuTreeselect(roleId).then(response => {
this.menuOptions = response.menus;
- this.$refs.menu.setCheckedKeys(response.checkedKeys);
+ return response;
});
},
/** 根据角色ID查询部门树结构 */
getRoleDeptTreeselect(roleId) {
- roleDeptTreeselect(roleId).then(response => {
+ return roleDeptTreeselect(roleId).then(response => {
this.deptOptions = response.depts;
- this.$refs.dept.setCheckedKeys(response.checkedKeys);
+ return response;
});
},
// 角色状态修改
@@ -450,24 +450,30 @@
handleUpdate(row) {
this.reset();
const roleId = row.roleId || this.ids
- this.$nextTick(() => {
- this.getRoleMenuTreeselect(roleId);
- });
+ const roleMenu = this.getRoleMenuTreeselect(roleId);
getRole(roleId).then(response => {
this.form = response.data;
this.open = true;
+ this.$nextTick(() => {
+ roleMenu.then(res => {
+ this.$refs.menu.setCheckedKeys(res.checkedKeys);
+ });
+ });
this.title = "修改角色";
});
},
/** 分配数据权限操作 */
handleDataScope(row) {
this.reset();
- this.$nextTick(() => {
- this.getRoleDeptTreeselect(row.roleId);
- });
+ const roleDeptTreeselect = this.getRoleDeptTreeselect(row.roleId);
getRole(row.roleId).then(response => {
this.form = response.data;
this.openDataScope = true;
+ this.$nextTick(() => {
+ roleDeptTreeselect.then(res => {
+ this.$refs.dept.setCheckedKeys(res.checkedKeys);
+ });
+ });
this.title = "分配数据权限";
});
},
--
Gitblit v1.9.2