From 9645decf59494cd6194c9a9d229334b3f43f7f99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B7=B3?= <chenchun@hymson.com>
Date: Mon, 20 Feb 2023 19:55:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.RuoYi.Vue3/src/views/system/role/index.vue | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/Yi.RuoYi.Vue3/src/views/system/role/index.vue b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
index 55443a3d..f5421541 100644
--- a/Yi.RuoYi.Vue3/src/views/system/role/index.vue
+++ b/Yi.RuoYi.Vue3/src/views/system/role/index.vue
@@ -45,9 +45,9 @@
     <!-- 表格数据 -->
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
-      <el-table-column label="角色编号" prop="roleCode"  />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true"  />
-      <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true"  />
+      <el-table-column label="角色编号" prop="roleCode" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
+      <el-table-column label="权限字符" prop="roleCode" :show-overflow-tooltip="true" />
       <el-table-column label="显示顺序" prop="orderNum" />
       <el-table-column label="状态" align="center">
         <template #default="scope">
@@ -63,7 +63,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
-            <el-button type="text" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
+            <el-button type="text" icon="Edit" @click=" handleUpdate(scope.row)" v-hasPermi="['system:role:edit']">
             </el-button>
           </el-tooltip>
           <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
@@ -328,7 +328,7 @@ function handleAuthUser(row) {
 }
 /** 查询菜单树结构 */
 function getMenuTreeselect() {
-  listMenu().then((response) => {
+  return listMenu().then((response) => {
     const options = [];
     response.data.items.forEach((m) => {
       options.push({
@@ -339,8 +339,11 @@ function getMenuTreeselect() {
       });
     });
     menuOptions.value = proxy.handleTree(options);
+
+    return response;
   });
 }
+
 /** 所有部门节点数据 */
 function getDeptAllCheckedKeys() {
   // 目前被选中的部门节点
@@ -383,7 +386,7 @@ function handleAdd() {
   title.value = "添加角色";
 }
 /** 修改角色 */
-function handleUpdate(row) {
+ function handleUpdate(row) {
   reset();
   const roleId = row.id || ids.value;
   getRoleMenuTreeselect(roleId);
@@ -395,17 +398,18 @@ function handleUpdate(row) {
   });
 }
 /** 根据角色ID查询菜单树结构 */
-function getRoleMenuTreeselect(roleId) {
+ function getRoleMenuTreeselect(roleId) {
   //1：获取该角色下的全部菜单id
   //2：获取全量菜单
-  getMenuTreeselect();
-
-  roleMenuTreeselect(roleId).then((response) => {
+    const menuTreeselect=getMenuTreeselect();
+    menuTreeselect.then(()=>{
+      nextTick(() => {
+      roleMenuTreeselect(roleId).then((response) => {
     const menuIds = [];
     response.data.forEach((m) => {
       menuIds.push(m.id);
     });
-    nextTick(() => {
+
       menuIds.forEach((v) => {
         menuRef.value.setChecked(v, true, false);
       });
@@ -413,6 +417,9 @@ function getRoleMenuTreeselect(roleId) {
     });
   });
 
+    })
+
+
 }
 /** 根据角色ID查询部门树结构 */
 function getDeptTree(roleId) {