From bd6e504f946b05371aceda524a64972402fcb92e Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Mon, 11 May 2020 18:36:11 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84](v2.5):?=
 =?UTF-8?q?=20v2.5=20beta=20=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=B8=AD=E5=88=86=E9=85=8D=E8=8F=9C=E5=8D=95=E5=90=8E?=
 =?UTF-8?q?=E5=AD=90=E8=8F=9C=E5=8D=95=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

问题：角色管理中的分配菜单由于是懒加载的，导致保存分配的菜单时只保存了选择的父节点
修复：在保存前先将部分菜单加载出来

2.5 Beta 详情：https://www.ydyno.com/archives/1225.html
---
 src/api/system/dept.js          |  4 ++--
 src/api/system/menu.js          | 10 +++++++---
 src/views/system/dept/index.vue |  2 +-
 src/views/system/menu/index.vue |  4 ++--
 src/views/system/role/index.vue |  9 ++++++---
 src/views/system/user/index.vue |  4 ++--
 6 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/api/system/dept.js b/src/api/system/dept.js
index 8877b53..d5b2736 100644
--- a/src/api/system/dept.js
+++ b/src/api/system/dept.js
@@ -9,7 +9,7 @@ export function getDepts(params) {
   })
 }
 
-export function getSuperior(ids) {
+export function getDeptSuperior(ids) {
   const params = {
     ids: ids
   }
@@ -43,4 +43,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, getDepts, getSuperior }
+export default { add, edit, del, getDepts, getDeptSuperior }
diff --git a/src/api/system/menu.js b/src/api/system/menu.js
index f9888a7..6e7eae0 100644
--- a/src/api/system/menu.js
+++ b/src/api/system/menu.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import qs from 'qs'
 
 export function getMenusTree(pid) {
   return request({
@@ -15,9 +16,12 @@ export function getMenus(params) {
   })
 }
 
-export function getSuperior(id) {
+export function getMenuSuperior(ids) {
+  const params = {
+    ids: ids
+  }
   return request({
-    url: 'api/menus/superior?id=' + id,
+    url: 'api/menus/superior?' + qs.stringify(params, { indices: false }),
     method: 'get'
   })
 }
@@ -53,4 +57,4 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del, getMenusTree, getSuperior, getMenus }
+export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus }
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 9cbc25e..7fee6ee 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -174,7 +174,7 @@ export default {
       }
     },
     getSupDepts(id) {
-      crudDept.getSuperior(id).then(res => {
+      crudDept.getDeptSuperior(id).then(res => {
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren && !obj.children) {
             obj.children = null
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b3174ec..1f0e689 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -221,8 +221,8 @@ export default {
       }, 100)
     },
     getSupDepts(id) {
-      crudMenu.getSuperior(id).then(res => {
-        const children = res.content.map(function(obj) {
+      crudMenu.getMenuSuperior(id).then(res => {
+        const children = res.map(function(obj) {
           if (!obj.leaf && !obj.children) {
             obj.children = null
           }
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e6acb00..cbb2434 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -128,8 +128,8 @@
 
 <script>
 import crudRoles from '@/api/system/role'
-import { getDepts, getSuperior } from '@/api/system/dept'
-import { getMenusTree } from '@/api/system/menu'
+import { getDepts, getDeptSuperior } from '@/api/system/dept'
+import { getMenusTree, getMenuSuperior } from '@/api/system/menu'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -247,6 +247,9 @@ export default {
         val.menus.forEach(function(data, index) {
           _this.menuIds.push(data.id)
         })
+        getMenuSuperior(this.menuIds).then(res => {
+          this.menus = res
+        })
       }
     },
     // 保存菜单
@@ -300,7 +303,7 @@ export default {
       depts.forEach(dept => {
         ids.push(dept.id)
       })
-      getSuperior(ids).then(res => {
+      getDeptSuperior(ids).then(res => {
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren && !obj.children) {
             obj.children = null
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a599ed6..caa7aa7 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -204,7 +204,7 @@
 <script>
 import crudUser from '@/api/system/user'
 import { isvalidPhone } from '@/utils/validate'
-import { getDepts, getSuperior } from '@/api/system/dept'
+import { getDepts, getDeptSuperior } from '@/api/system/dept'
 import { getAll, getLevel } from '@/api/system/role'
 import { getAllJob } from '@/api/system/job'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
@@ -415,7 +415,7 @@ export default {
       })
     },
     getSupDepts(deptId) {
-      getSuperior(deptId).then(res => {
+      getDeptSuperior(deptId).then(res => {
         this.depts = res.content.map(function(obj) {
           if (obj.hasChildren && !obj.children) {
             obj.children = null