From b2fbcecfb0a8a763244523c7e6a3e7f342ff309d Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Feb 2023 16:25:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E3=80=81=E5=8A=9F=E8=83=BD=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/system/roleAdminister/index.js      |  8 ++------
 .../src/views/RoleAdminister/RoleAdminister.vue | 17 +++++++++++++++--
 .../src/views/functional/functional.vue         |  3 ++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/anrui-system-ui/src/api/system/roleAdminister/index.js b/anrui-system-ui/src/api/system/roleAdminister/index.js
index d31c6f99fe..cc1d510dab 100644
--- a/anrui-system-ui/src/api/system/roleAdminister/index.js
+++ b/anrui-system-ui/src/api/system/roleAdminister/index.js
@@ -161,12 +161,8 @@ export function saveSource(data) {
 // 功能授权
 export function funMenuTree(data) {
   return request({
-    url: `/portal/v1/sysfunction/listAllByRoleSid`,
-    method: 'POST',
-    data: data,
-    headers: {'Content-Type': 'application/json',
-    'token':tokens
-    }
+    url: `/portal/v1/sysfunction/getFunctionAuthorization/` + data.roleSid,
+    method: 'get'
   })
 }
 // 功能授权保存
diff --git a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
index 13ed9eadfa..8075128d8d 100644
--- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
+++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue
@@ -780,9 +780,22 @@ export default {
     },
 //    功能授权保存
     funSave() {
-      let funMenus = this.$refs.funTree.getCheckedKeys()
+      let funMenus = []
+      funMenus = this.$refs.funTree.getCheckedNodes(false, true)
+      // funMenus = this.$refs.Tree.getCheckedKeys()
+      console.log('已选节点、半选节点node', funMenus)
+      const funMenus_sid = []
+      for (var i = 0; i < funMenus.length; i++) {
+        funMenus_sid.push(funMenus[i].sid)
+      }
+      console.log('已选节点、半选节点sid', funMenus_sid)
+      // let funMenus = this.$refs.funTree.getCheckedKeys()
+      // let params = {
+      //   functionSid: funMenus.toString(),
+      //   roleSid: this.Thisrow.sid
+      // }
       let params = {
-        functionSid: funMenus.toString(),
+        functionSid: funMenus_sid.toString(),
         roleSid: this.Thisrow.sid
       }
       savefunMenu(params).then(res => {
diff --git a/anrui-system-ui/src/views/functional/functional.vue b/anrui-system-ui/src/views/functional/functional.vue
index af80865fb6..7b54392c19 100644
--- a/anrui-system-ui/src/views/functional/functional.vue
+++ b/anrui-system-ui/src/views/functional/functional.vue
@@ -252,12 +252,13 @@ export default {
       this.dialogTitle = '编辑'
       this.editDialog = true
       this.roleForm = Object.assign({}, row)
+      console.log(this.roleForm)
       getSingleData({ id: row.sid }).then((res) => {
         if (res.success) {
           this.roleForm = res.data
         }
       })
-      getMenusForFunction(this.roleForm.sourceSid).then((resp) => {
+      getMenusForFunction({ sourceSid: this.roleForm.sourceSid }).then((resp) => {
         if (resp.success) {
           this.actionUrl_list = resp.data
         }