编辑角色

src/views/enterprise/edit-role.vue

@@ -139,16 +139,17 @@ export default {
     // 获取角色详情
     getRoleDetail(roleId) {
       roleDetail({ roleId }).then(res => {
-        const { roleId, roleName, menuIds } = res.result;
-        Object.assign(this.roleData, { roleId, roleName, menuIds: JSON.parse(menuIds || '[]') });
+        let { roleId, roleName, menuIds } = res.result;
+        menuIds = typeof menuIds == 'string' ? menuIds.split(',') : [];
+        Object.assign(this.roleData, { roleId, roleName });
         // 将menuIds分配到相应同的tab下的checkedId中
-        this.roleData.menuIds.forEach(el => {
-          this.tabList.some(item => {
-            item.menuList.forEach(menu => {
-              item.checkedId[menu.menuId] = getAllMenuId([ menu ], el.menuIds || []);
-            })
-            return item.appType == el.appType;
+        this.tabList.forEach(el => {
+          let checkedId = [];
+          el.menuList.forEach(item => {
+            el.checkedId[item.menuId] = getAllMenuId([ item ], menuIds);
+            checkedId = checkedId.concat(el.checkedId[item.menuId]);
           })
+          this.roleData.menuIds.push({ appType: el.appType, menuIds: checkedId });
         })
       })
       function getAllMenuId(menuList, allMenuIds) {