From d04ec69df4f6e73a99ab70ec6aecf4c48ade4f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=A5=E4=BF=8A=E4=B8=9C?= <1172482914@qq.com> Date: Fri, 10 Jul 2020 12:52:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=B6=E5=B7=B2=E6=9C=89=E6=9D=83=E9=99=90=E6=9C=AA?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8B=BE=E9=80=89=E5=BC=82=E5=B8=B8=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/role/index.vue | 26 +++++++++++++++--------- 1 file 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 658efc617..1739f0a76 100644 --- a/ruoyi-ui/src/views/system/role/index.vue +++ b/ruoyi-ui/src/views/system/role/index.vue @@ -368,16 +368,16 @@ export default { }, /** 根据角色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 @@ export default { 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 = "分配数据权限"; }); },