From e547dfb950a19b2d54e2f06aadff7e2be15d6ced Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 09 八月 2023 17:17:23 +0800
Subject: [PATCH] 1.角色新增、修改、删除功能

---
 src/views/basicSettings/roleList.vue |  358 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 211 insertions(+), 147 deletions(-)

diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index a59c491..ed294ec 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -25,7 +25,7 @@
 
           <el-tree
             ref="treeLeftRef"
-            style="padding: 10px;overflow: scroll"
+            style="padding: 10px;overflow: auto"
             :style="{height:(tableHeight-20)+'px'}"
             :data="treeLeft"
             node-key="code"
@@ -33,6 +33,8 @@
             :props="defaultPropsLeft"
             :default-expand-all="true"
             :expand-on-click-node="false"
+            draggable
+            :allow-drop="treeLeftAllowDrop"
             @node-click="treeLeftNodeClick"
           >
             <span slot-scope="{ node, data }" class="custom-tree-node">
@@ -40,14 +42,14 @@
               <input
                 v-if="data.isEdit"
                 :ref="data.code"
-                v-model="node.label"
+                v-model="data.name"
                 type="text"
                 @click.stop
                 @blur="roleSave(data)"
                 @keyup.enter="roleSave(data)"
               >
 
-              <span v-if="!data.isEdit">
+              <span v-if="!data.isEdit&&data.identifying!=='0'&&data.identifying!=='1'">
                 <i
                   v-if="data.code!=='000'"
                   class="el-icon-edit"
@@ -73,10 +75,11 @@
             style="position: absolute;right: 15px;z-index:1;top:3px"
             type="primary"
             @click="saveClick"
-          >淇� 瀛�</el-button>
+          >淇� 瀛�
+          </el-button>
 
           <el-tabs v-model="activeName" type="border-card">
-            <el-tab-pane label="PC绔�" name="PC绔�">
+            <el-tab-pane label="PC绔�" name="PC">
               <div style="display: flex;">
 
                 <div
@@ -98,7 +101,7 @@
                     highlight-current
                     :props="defaultPropsCenter"
                     show-checkbox
-                    node-key="code"
+                    node-key="menucode"
                     :default-expand-all="true"
                     @check-change="handleTreeCenterCheckChange"
                     @check="handleTreeCenterCheck"
@@ -108,7 +111,7 @@
 
                 <div
                   ref="scrollCenter"
-                  style="border-right: 1px solid rgba(0,0,0,0.2);width: 600px;padding-left: 10px;overflow-y: auto"
+                  style="border-right: 1px solid rgba(0,0,0,0.2);width: 660px;padding-left: 10px;overflow-y: auto"
                   :style="{height:(tableHeight-40)+'px'}"
                   @scroll="scrollCenterScroll()"
                   @mouseover="isScroll='center'"
@@ -125,28 +128,30 @@
                   </el-checkbox>
 
                   <div v-if="treeCenter.length>0">
-                    <div v-for="item in treeCenter[0].children" :key="item.code">
+                    <div v-for="(item,index) in treeCenter[0].children" :key="item.menucode">
+
                       <div
-                        v-if="item.display"
+                        v-if="!item.buttoncodelist"
                         style="margin-left: 40px;height:26px;display: flex;"
                       />
 
                       <el-checkbox-group
                         v-for="it in item.children"
                         v-if="item.expanded"
-                        :key="it.code"
-                        v-model="it.checkedButton"
-                        style="margin-left: 40px;height:26px;display: flex"
-                        @change="val=>handleCheckedButtonChange(val,it.code)"
+                        :key="it.menucode"
+                        v-model="it.buttonChecked"
+                        style="margin-left: 40px;height:26px;display: flex;"
+                        @change="val=>handleCheckedButtonChange(val,index,it.menucode,it.buttonChecked)"
                       >
 
                         <el-checkbox
-                          v-for="i in it.itemButton"
-                          :key="i.code"
-                          :label="i.name"
-                          style="display:flex;align-items: center"
+                          v-for="i in it.buttoncodelist"
+                          :key="i"
+                          :label="i"
+                          style="display:flex;align-items: center;"
                         />
                       </el-checkbox-group>
+
                     </div>
 
                   </div>
@@ -172,25 +177,25 @@
                   </el-checkbox>
 
                   <div v-if="treeCenter.length>0">
-                    <div v-for="item in treeCenter[0].children" :key="item.code">
+                    <div v-for="item in treeCenter[0].children" :key="item.menucode">
                       <div
-                        v-if="item.display"
+                        v-if="!item.datacodelist"
                         style="margin-left: 40px;height:26px;display: flex;"
                       />
 
                       <el-radio-group
                         v-for="it in item.children"
                         v-if="item.expanded"
-                        :key="it.code"
-                        v-model="it.checkedData"
+                        :key="it.menucode"
+                        v-model="it.dataChecked"
                         style="margin-left: 40px;height:26px;display: flex"
-                        @change="val=>handleCheckedDataChange(val,it.code)"
+                        @change="val=>handleCheckedDataChange(val,it.menucode)"
                       >
                         <el-radio
-                          v-for="i in it.itemData"
-                          :key="i.code"
+                          v-for="i in it.datacodelist"
+                          :key="i"
                           style="display:flex;align-items: center"
-                          :label="i.name"
+                          :label="i"
                         />
                       </el-radio-group>
                     </div>
@@ -201,7 +206,7 @@
 
               </div>
             </el-tab-pane>
-            <el-tab-pane label="APP绔�" name="APP绔�">澶уぇ</el-tab-pane>
+            <el-tab-pane label="APP绔�" name="APP">澶уぇ</el-tab-pane>
             <el-tab-pane label="宸ユ帶绔�" name="宸ユ帶绔�">宸ユ帶绔�</el-tab-pane>
           </el-tabs>
 
@@ -217,6 +222,7 @@
 <script>
 import waves from '@/directive/waves'
 import {
+  DataPermissions, RoleAddUpdateSava, RoleDeleteSava,
   RolePermissionSava,
   RolePermissionSearchRole,
   RolePermissionSearchRoleMenu,
@@ -241,18 +247,20 @@
       },
       defaultPropsCenter: {
         children: 'children',
-        label: 'name'
+        label: 'menuname'
       },
-      activeName: 'PC绔�',
+      activeName: 'PC',
 
       buttonIsChecked: false,
       dataIsChecked: false,
 
       menuCheckedCodeArr: [], // 鑿滃崟鏉冮檺鏁扮粍閫変腑鐨�
 
-      allButtonData: [], // 鎵�鏈夌殑鎸夐挳鍔犳潈闄�
+      allButtonData: [], // 鎵�鏈夎彍鍗曞搴旂殑鎸夐挳鏉冮檺鍔犳暟鎹潈闄�
 
-      isScroll: 'left'
+      isScroll: 'left',
+
+      dataKeyValue: []// 鏁版嵁鏉冮檺閿�煎
 
     }
   },
@@ -272,11 +280,12 @@
   },
 
   created() {
-    this.getRolePermissionSearchRole()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
+
+    this.getRolePermissionSearchRole()
   },
   methods: {
 
@@ -289,76 +298,98 @@
 
       this.treeLeft = res
 
-      if (res.length > 0) {
+      if (res && res.length > 0) {
         this.$nextTick(() => { // 榛樿閫変腑绗竴涓�
           this.$refs.treeLeftRef.setCurrentKey(res[0].roles[0].code) // 榛樿閫変腑鑺傜偣绗竴涓�
         })
-        await this.getRolePermissionSearchRoleMenuButton(res[0].roles[0].code)
-        await this.getRolePermissionSearchRoleMenu(res[0].roles[0].code)
+
+        await this.getDataPermissions()// 鑾峰彇鏁版嵁鏉冮檺閿�煎
+        await this.getRolePermissionSearchRoleMenuButton(res[0].roles[0].code)// 鐢ㄤ簬鏁版嵁鍥炴樉
+
+        await this.getRolePermissionSearchRoleMenu(res[0].roles[0].code)// 鐢ㄤ簬娓叉煋椤甸潰
       } else {
         this.$notify.error('璇峰厛寤虹浉瀵瑰簲鐨勮鑹诧紒')
       }
     },
+    async getDataPermissions() {
+      const { data: res } = await DataPermissions()
+      this.dataKeyValue = res
+    },
+
     // 鑾峰彇鑿滃崟鏉冮檺瀵瑰簲鐨勬寜閽�
     async getRolePermissionSearchRoleMenuButton(rolecode) {
-      const { data: res } = await RolePermissionSearchRoleMenuButton({ rolecode })
-      this.allButtonData = res
+      const { data: res } = await RolePermissionSearchRoleMenuButton({ rolecode, type: this.activeName })
+      this.allButtonData = JSON.parse(res[0].jsondate)
     },
     // 鑾峰彇鑿滃崟鏉冮檺
     async getRolePermissionSearchRoleMenu(rolecode) {
-      const { data: res } = await RolePermissionSearchRoleMenu({ rolecode, type: 'PC' })
+      const { data: res } = await RolePermissionSearchRoleMenu({ rolecode, type: this.activeName })
 
       // 鎷垮埌鏁扮粍list杞崲鎴愭爲褰ree
       const result = arrayToTree(res, {
-        parentProperty: 'parentid',
-        customID: 'code',
+        parentProperty: 'parent_id',
+        customID: 'menucode',
         childrenProperty: 'children'
       })
 
-      this.menuCheckedCodeArr = []
+      this.treeCenter = [
+        { menucode: '-1', menuname: '鍏ㄩ儴', children: result }
+      ]
 
-      result.forEach(item => {
+      this.treeCenter[0].children.forEach(item => {
         if (item.children && item.children.length) {
           item.children.forEach(it => {
-            // 鎸夐挳鏉冮檺鍥炴樉
-            const buttonAll = this.allButtonData.tButton.filter(j => j.menucode === it.code)
-            const buttonChecked = this.allButtonData.tButton.filter(j =>
-              j.menucode === it.code && j.flag === 'Y'
-            ).map(j => j.name)
-            it.itemButton = buttonAll
-            it.checkedButton = buttonChecked
+            it.buttoncodelist = it.buttoncodelist !== '' && it.buttoncodelist !== null ? it.buttoncodelist.split(',') : []
+            if (it.buttoncodelist && it.buttoncodelist.length > 0) {
+              it.buttoncodelist = this.$ButtonData.filter(j =>
+                it.buttoncodelist.includes(j.buttoncode)
+              )
 
-            // 鏁版嵁鏉冮檺鍥炴樉
-            const dataAll = this.allButtonData.tData.filter(j => j.menucode === it.code)
-            const dataChecked = this.allButtonData.tData.filter(j => j.menucode === it.code && j.flag === 'Y')
+              it.buttoncodelist = it.buttoncodelist.map(j => j.buttonname)
+            }
 
-            it.itemData = dataAll
-            it.checkedData = dataChecked.length > 0 ? dataChecked[0].name : []
-
-            // 鐢ㄤ綔鑿滃崟鍕鹃�夊洖鏄�
-            if (it.flag === 'Y') {
-              this.menuCheckedCodeArr.push(it.code)
+            it.datacodelist = it.datacodelist ? it.datacodelist.split(',') : []
+            if (it.datacodelist && it.datacodelist.length > 0) {
+              it.datacodelist = this.dataKeyValue.filter(j =>
+                it.datacodelist.includes(j.datacode)
+              ).map(j => j.dataname)
             }
           })
-          item.display = true
+
           item.expanded = true
         }
       })
 
-      // console.log(JSON.parse(JSON.stringify(result)), 8)
-
-      this.treeCenter = [
-        { code: '-1', name: '鍏ㄩ儴', flag: result.every(i => i.flag === 'Y') ? 'Y' : 'N', children: result }
-      ]
-
-      this.handleCheckedButtonChange('', '', true)
-      this.handleCheckedDataChange('', '', true)
-
+      this.handleData()// 澶勭悊鏁版嵁鍥炴樉
+    },
+    // 澶勭悊缁勫悎鏁版嵁
+    handleData() {
+      this.menuCheckedCodeArr = this.allButtonData.map(i => i.menucode)
       this.$nextTick(() => {
         this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
       })
 
-      this.$forceUpdate()
+      this.treeCenter[0].children.forEach(item => {
+        if (item.children && item.children.length) {
+          item.children.forEach(it => {
+            let temp = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].buttoncode : []
+            temp = temp.length > 0 ? temp.split(',') : []
+            it.buttonChecked = [] // 鏁版嵁鍥炴樉
+            this.$ButtonData.forEach(j => {
+              if (temp.includes(j.buttoncode)) {
+                it.buttonChecked.push(j.buttonname)
+              }
+            })
+
+            const datacode = this.allButtonData.filter(j => j.menucode === it.menucode).length > 0 ? this.allButtonData.filter(j => j.menucode === it.menucode)[0].datacode : ''
+            it.dataChecked = datacode ? this.dataKeyValue.find(j => j.datacode === datacode).dataname : '' // 鏁版嵁鍥炴樉
+          })
+        }
+      })
+
+      this.handleCheckedButtonChange('', '', '', '', true)
+      this.handleCheckedDataChange('', '', true)
+      // this.$forceUpdate()
     },
 
     // 宸﹁竟婊氬姩鏉℃粦鍔ㄦ椂
@@ -390,12 +421,12 @@
         this.treeCenter[0].children.forEach(item => {
           if (item.children && item.children.length) {
             item.children.forEach(it => {
-              if (checkedKeys.includes(it.code)) {
+              if (checkedKeys.includes(it.menucode)) {
                 if (belong === 'button') {
-                  it.checkedButton = it.itemButton.map(i => i.name)
+                  it.buttonChecked = it.buttoncodelist
                 }
                 if (belong === 'data') {
-                  it.checkedData = '鍏ㄩ儴'
+                  it.dataChecked = '鍏ㄩ儴'
                 }
               }
             })
@@ -405,12 +436,12 @@
         this.treeCenter[0].children.forEach(item => {
           if (item.children && item.children.length) {
             item.children.forEach(it => {
-              if (checkedKeys.includes(it.code)) {
+              if (checkedKeys.includes(it.menucode)) {
                 if (belong === 'button') {
-                  it.checkedButton = []
+                  it.buttonChecked = []
                 }
                 if (belong === 'data') {
-                  it.checkedData = undefined
+                  it.dataChecked = ''
                 }
               }
             })
@@ -419,13 +450,17 @@
       }
     },
     // 鍗曚釜鎸夐挳鏀瑰彉
-    handleCheckedButtonChange(value, code, flag) {
+    handleCheckedButtonChange(oldValue, index, code, newValue, flag) {
+      // console.log(oldValue, index, code, newValue, 2)
       // 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴
       if (!flag) {
-        if (!this.menuCheckedCodeArr.includes(code) && value.length === 1) { // 鍚�
+        if (!this.menuCheckedCodeArr.includes(code) && oldValue.length === 0 && newValue.length === 1) { // 鍚�
           this.menuCheckedCodeArr.push(code)
-        } else if (this.menuCheckedCodeArr.includes(code) && value.length === 0) { // 鏄�
-          this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== code)
+        } else if (this.menuCheckedCodeArr.includes(code) && oldValue.length === 1 && newValue.length === 0) { // 鏄�
+          // 褰撴暟鎹潈闄愭湭鍕鹃�夋椂鍒欒繃婊ゆ帀鐩稿搴旂殑鑿滃崟
+          if (this.treeCenter[0].children[index].children.find(i => i.menucode === code).dataChecked.toString().length < 1) {
+            this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== code)
+          }
         }
         this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
       }
@@ -436,30 +471,29 @@
       this.treeCenter[0].children.forEach(item => {
         if (item.children && item.children.length) {
           item.children.forEach(it => {
-            if (it.checkedButton.length === it.itemButton.length) {
+            if (it.buttonChecked && it.buttonChecked.length === it.buttoncodelist.length && it.buttoncodelist.length > 0) {
               count++
             }
-            childrenLength++
+
+            if (it.buttoncodelist.length) {
+              childrenLength++
+            }
           })
         }
       })
+
       this.buttonIsChecked = count === childrenLength
       this.$forceUpdate()
     },
     // 鑾峰彇鏍戝舰鑺傜偣node
     getLeftTreeNode(data, Node, VueComponent) {
-      // console.log(data, Node, VueComponent, 2221)
-      // console.log(Node.expanded)
       this.treeCenter[0].children.forEach(item => {
-        if (item.name === data.name) {
+        if (item.menucode === data.menucode) {
           item.expanded = Node.expanded
         }
       })
-      if (data.code === '-1') {
+      if (data.menucode === '-1') {
         Node.expanded = true // 鏆傛椂鍏堝啓鎴愯繖涓�
-        // this.treeCenter[0].children.forEach(item => {
-        //   item.expanded = Node.expanded
-        // })
       }
       this.$forceUpdate()
     },
@@ -472,31 +506,36 @@
         this.dataIsChecked = false
         this.menuCheckedCodeArr = []
       } else {
-        if (checkedKeys.includes(obj.code)) { // 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴   //鏄�
-          this.menuCheckedCodeArr.push(obj.code)
+        if (checkedKeys.includes(obj.menucode)) { // 鍒ゆ柇鏄惁鍖呭惈鍦ㄥ唴   //鏄�
+          this.menuCheckedCodeArr.push(obj.menucode)
         } else { // 鍚�
-          this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== obj.code)
+          this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== obj.menucode)
         }
       }
     },
     // 澶勭悊涓棿鏍戝舰閫変腑鍊兼敼鍙�
     handleTreeCenterCheckChange(obj, selfChecked, selfChildrenTreeCheck) {
       // console.log(obj, selfChecked, selfChildrenTreeCheck, '鐜嬭�佸悏')
-      obj.flag = selfChecked ? 'Y' : 'N'
       if (!selfChildrenTreeCheck) {
-        if (!selfChecked) {
+        if (!selfChecked) { // 浠庨�変腑鍒颁笉閫変腑
+          obj.buttonChecked = []
+          obj.dataChecked = ''
+          this.menuCheckedCodeArr = this.menuCheckedCodeArr.filter(i => i !== obj.menucode)
+        }
+        if (selfChecked) { // 浠庝笉閫変腑鍒伴�変腑
+          obj.buttonCheckedCode = []
           this.treeCenter[0].children.forEach(item => {
             if (item.children && item.children.length) {
               item.children.forEach(it => {
-                if (it.code === obj.code) {
-                  it.checkedButton = []
-                  it.checkedData = undefined
+                if (it.menucode === obj.menucode) {
+                  this.menuCheckedCodeArr.push(obj.menucode)
                 }
               })
             }
           })
-          this.$forceUpdate()
         }
+
+        this.$forceUpdate()
       }
     },
     // 鍗曢�夋鎸夐挳鏀瑰彉
@@ -505,7 +544,6 @@
       if (!flag) {
         this.menuCheckedCodeArr.push(code)
         this.menuCheckedCodeArr = [...new Set(this.menuCheckedCodeArr)]
-
         this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
       }
       // 杩欓噷鏄垽鏂叏閫塺adio 鏄惁閫変腑
@@ -514,16 +552,17 @@
       this.treeCenter[0].children.forEach(item => {
         if (item.children && item.children.length) {
           item.children.forEach(it => {
-            if (it.checkedData.length > 0) {
+            if (it.dataChecked.length > 0 && it.datacodelist.length > 0) {
               count++
             }
-            if (it.itemData.length > 0) {
+            // console.log(it.dataChecked, 234)
+            if (it.datacodelist.length > 0) {
               childrenLength++
             }
           })
         }
       })
-      // console.log(count, childrenLength, 9)
+      // console.log(count, childrenLength, 123)
       this.dataIsChecked = count === childrenLength
       this.$forceUpdate()
     },
@@ -531,12 +570,13 @@
     async treeLeftNodeClick(obj, Node, VueComponent) {
       if (obj.code !== '000') {
         await this.getRolePermissionSearchRoleMenuButton(obj.code)
-        await this.getRolePermissionSearchRoleMenu(obj.code)
+        // await this.getRolePermissionSearchRoleMenu(obj.code)
+        this.handleData()
       }
     },
     // 瑙掕壊鍚嶇О鏂板
     rolePlusClick() {
-      this.treeLeft[0].roles.push({ code: 1234, name: '', isEdit: true })
+      this.treeLeft[0].roles.push({ code: '', name: '', isEdit: true })
     },
     // 瑙掕壊鍚嶇О淇敼
     roleEditClick(self, node, data) {
@@ -549,64 +589,69 @@
     // 瑙掕壊鍚嶇О鍒犻櫎
     roleDeleteClick(self, node, data) {
       // console.log(self, node, data)
-      // this.treeLeft[0].roles.forEach((item, index) => {
-      //   if (item.code === data.code) {
-      //     this.treeLeft[0].roles.splice(index, 1) // 鏆傛椂鍏堝啓鎴愬墠绔垹闄わ紝鍚庢湡璋冪敤鎺ュ彛鍒犻櫎
-      //   }
-      // })
+      const D = {
+        rolecode: data.code,
+        rolename: data.name,
+        type: this.activeName
+      }
+      RoleDeleteSava(D).then(res => {
+        if (res.code === '200') {
+          this.$notify.success('瑙掕壊鍒犻櫎鎴愬姛锛�')
+        }
+        this.getRolePermissionSearchRole()
+      })
     },
     // 瑙掕壊鍚嶇О淇濆瓨   閲囩敤闃叉姈褰㈠紡
-    roleSave: throttle(function(data) {
-      data.isEdit = false
-      console.log('鎵ц浜嗭紒')
+    roleSave: throttle(function(val) {
+      val.isEdit = false
+      const data = {
+        rolecode: val.code,
+        rolename: val.name,
+        type: val.code === '' ? 'Add' : 'Update'
+      }
+      console.log(data, '鎵ц浜嗭紒')
+      RoleAddUpdateSava(data).then(res => {
+        if (res.code === '200') {
+          this.$notify.success(val.code === '' ? '瑙掕壊鏂板鎴愬姛锛�' : '瑙掕壊淇敼鎴愬姛锛�')
+        }
+      })
+      this.getRolePermissionSearchRole()
     }, 1000, true),
 
     // 椤甸潰鍕鹃�夊ソ淇濆瓨浜嬩欢
-    saveClick() {
-      // console.log(this.treeCenter)
-
-      const rolecode = this.$refs.treeLeftRef.getCurrentKey()
-
-      const roleMenu = []
-      const roleButton = []
-      const roleData = []
-
-      this.treeCenter[0].children.forEach((item, index) => {
+    async saveClick() {
+      const menuKeyArr = this.$refs.treeCenterRef.getCheckedKeys()
+      const arr = []
+      this.treeCenter[0].children.forEach(item => {
         if (item.children && item.children.length) {
-          item.children.forEach((it, ind) => {
-            if (it.flag === 'Y') {
-              roleMenu.push({ rolecode, menucode: it.code })
+          item.children.forEach(it => {
+            if (menuKeyArr.includes(it.menucode)) {
+              if (it.buttoncodelist.length > 0 && it.buttoncodelist && it.dataChecked && it.dataChecked.toString().length > 0) { // 鏁版嵁鏉冮檺宸插嬀閫�
+                it.dataCheckedCode = this.dataKeyValue.find(i => i.dataname === it.dataChecked).datacode
+              }
 
-              if (it.itemButton && it.itemButton.length && it.checkedButton.length > 0) {
-                it.itemButton.forEach(i => {
-                  if (it.checkedButton.includes(i.name)) {
-                    roleButton.push({ rolecode, buttoncode: i.code })
-                  }
-                })
+              if (it.buttonChecked && it.buttonChecked.length > 0) { // 宸查�夎彍鍗�
+                it.buttonCheckedCode = this.$ButtonData.filter(i =>
+                  it.buttonChecked.includes(i.buttonname)
+                ).map(i => i.buttoncode)
               }
-              if (it.checkedData && it.checkedData.length) {
-                roleData.push({ rolecode, datacode: it.itemData.find(i => i.name === it.checkedData).code })
-              }
+              arr.push({
+                menucode: it.menucode,
+                datacode: it.dataCheckedCode !== undefined ? it.dataCheckedCode : '',
+                buttoncode: it.buttonCheckedCode ? it.buttonCheckedCode.join(',') : ''
+              })
             }
           })
         }
       })
-      // console.log(roleMenu)
-      // console.log(roleButton)
-      // console.log(roleData)
-      const data = {
-        roleMenu, roleButton, roleData
-      }
 
-      RolePermissionSava(data).then(res => {
-        if (res.code === '200') {
-          const rolename = this.treeLeft[0].roles.find(i => i.code === rolecode).name
-          this.$notify.success(rolename + '鐨勮鑹叉潈闄愭彁浜ゆ垚鍔燂紒')
-          this.getRolePermissionSearchRoleMenuButton(rolecode)
-          this.getRolePermissionSearchRoleMenu(rolecode)
-        }
-        this.$forceUpdate()
-      })
+      const rolecode = this.$refs.treeLeftRef.getCurrentKey()
+      const res = await RolePermissionSava(JSON.stringify(arr), rolecode, this.activeName)
+      if (res.code === '200') {
+        const rolename = this.treeLeft[0].roles.find(i => i.code === rolecode).name
+        this.$notify.success(rolename + '鐨勮鑹叉潈闄愭彁浜ゆ垚鍔燂紒')
+        await this.getRolePermissionSearchRoleMenuButton(rolecode)
+      }
     },
     // 鑾峰彇椤甸潰楂樺害
     getHeight() {
@@ -614,6 +659,17 @@
         this.mainHeight = window.innerHeight - 85
         this.tableHeight = this.mainHeight - 50
       })
+    },
+    // 宸︿晶鏍戝舰鎷栧姩澶勭悊
+    treeLeftAllowDrop(draggingNode, dropNode, type) {
+      // console.log(draggingNode, dropNode, type)
+      // 娉ㄦ帀鐨勬槸鍚岀骇鎷栨嫿
+      if (draggingNode.level === dropNode.level) {
+        return type === 'prev' || type === 'next'
+      } else {
+        // 涓嶅悓绾ц繘琛屽鐞�
+        return false
+      }
     }
   }
 }
@@ -628,4 +684,12 @@
   font-size: 14px;
   padding-right: 8px;
 }
+
+::v-deep .el-checkbox__label {
+  width: 55px;
+}
+
+.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
+  color: #000 !important;
+}
 </style>

--
Gitblit v1.9.3