From 746e355df3ce7b588f40e96e4f20ba35266e7190 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 22 八月 2023 11:28:42 +0800
Subject: [PATCH] 1.人员管理开发完成

---
 src/views/basicSettings/roleList.vue |  675 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 345 insertions(+), 330 deletions(-)

diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index 89635a6..3fe1ff7 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -1,109 +1,99 @@
 <template>
   <div>
     <div class="body" :style="{height:mainHeight+'px'}">
-      <div class="bodyTopButtonGroup" style="justify-content: space-between">
-        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline">鏂板</el-button>
-        <el-button v-waves icon="el-icon-download">瀵煎叆</el-button>
-      </div>
-
-      <div class="bodyTopFormGroup">
-        <el-form
-          ref="form"
-          :model="form"
-          label-width="100px"
-          inline
-          style="display: flex;"
-        >
-          <div class="elForm">
-            <el-form-item label="姣嶄欢缂栫爜" style=" display: flex;">
-              <el-input v-model="form.OrgCode" placeholder="璇疯緭鍏�" style="width: 200px" />
-            </el-form-item>
-            <el-form-item label="姣嶄欢鍚嶇О" style=" display: flex;">
-              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
-            </el-form-item>
-            <el-form-item label="姣嶄欢瑙勬牸" style=" display: flex;">
-              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
-            </el-form-item>
-
-            <el-form-item label="鐗堟湰缂栧彿" style=" display: flex;">
-              <el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
-            </el-form-item>
-            <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
-              <el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
-            </el-form-item>
-            <el-form-item v-show="isExpandForm" label="鍒涘缓鏃ユ湡" style=" display: flex;">
-              <el-date-picker
-                v-model="form.createdate"
-                style="width: 200px"
-                type="date"
-                placeholder="閫夋嫨鏃ユ湡"
-              />
-            </el-form-item>
-          </div>
-          <div
-            class="bodySearchReset"
-            :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
-          >
-            <el-button v-waves type="primary" icon="el-icon-search">鏌ヨ</el-button>
-            <el-button v-waves type="info" icon="el-icon-refresh">閲嶇疆</el-button>
-          </div>
-        </el-form>
-        <div
-          class="bodyTopFormExpand"
-        >
-          <svg-icon
-            v-show="mouseHoverType==='mouseout'"
-            style="cursor: pointer"
-            :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
-            @mouseenter="mouseHoverType=$event.type"
-          />
-          <svg-icon
-            v-show="mouseHoverType==='mouseenter'"
-            style="cursor: pointer"
-            :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
-            @click="isExpandForm=!isExpandForm"
-            @mouseout="mouseHoverType=$event.type"
-          />
-        </div>
-      </div>
 
       <div
         class="elTableDiv"
       >
 
-        <div style="width: 300px;">
+        <div style="width: 300px;background:#fff">
+
+          <div style="margin: 20px 10px 0 10px;display: flex;justify-content: space-between;">
+            <div style="display: flex;">
+              <div
+                style="width: 5px;height: 100%;border-radius: 5px;"
+                :style="{background:$store.state.settings.theme}"
+              />
+              <div style="margin-left: 8px;">瑙掕壊鍚嶇О</div>
+            </div>
+
+            <div style="margin-right:10px">
+              <i class="el-icon-plus" style="cursor: pointer;color: #999" @click="rolePlusClick" />
+            </div>
+
+          </div>
+
           <el-tree
             ref="treeLeftRef"
-            style="padding: 10px;"
-            :style="{height:isExpandForm?tableHeight:(tableHeight+105)+'px'}"
+            style="padding: 10px;overflow: auto"
+            :style="{height:(tableHeight-20)+'px'}"
             :data="treeLeft"
             node-key="code"
             highlight-current
             :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">
+              <span v-if="!data.isEdit">{{ node.label }}</span>
+              <input
+                v-if="data.isEdit"
+                :ref="data.code"
+                v-model="data.name"
+                type="text"
+                @click.stop
+                @blur="roleSave(data)"
+                @keyup.enter="roleSave(data)"
+              >
+
+              <span v-if="!data.isEdit&&data.identifying!=='0'&&data.identifying!=='1'">
+                <i
+                  v-if="data.code!=='000'"
+                  class="el-icon-edit"
+                  style="margin-right:10px;color: #999"
+                  @click.stop="val=>roleEditClick(val,node,data)"
+                />
+                <i
+                  v-if="data.code!=='000'"
+                  class="el-icon-delete"
+                  style="margin-right: 4px;color: #999"
+                  @click.stop="val=>roleDeleteClick(val,node,data)"
+                />
+              </span>
+            </span>
+          </el-tree>
         </div>
 
         <div
-          style="margin-left: 15px;width:100%;"
+          style="margin-left: 10px;width:100%;position: relative"
         >
+
+          <el-button
+            style="position: absolute;right: 15px;z-index:1;top:3px"
+            type="primary"
+            @click="saveClick"
+          >淇� 瀛�
+          </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
                   ref="scrollLeft"
                   style="border-right: 1px solid rgba(0,0,0,0.2);width: 200px;
                   overflow-y: auto;overflow-x:hidden;"
-                  :style="{height:isExpandForm?tableHeight:(tableHeight+35)+'px',}"
+                  :style="{height:(tableHeight-40)+'px'}"
                   @scroll="scrollLeftScroll()"
-                  @mouseover="changeScrollLeftFlag('left')"
+                  @mouseover="isScroll='left'"
                 >
                   <div style=" ">
                     <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鑿滃崟鏉冮檺
                   </div>
-                  <!--                  :style="{height:isExpandForm?tableHeight:(tableHeight+15)+'px',}"-->
+
                   <el-tree
                     ref="treeCenterRef"
                     style="padding-top: 10px;width: 199px;"
@@ -111,7 +101,7 @@
                     highlight-current
                     :props="defaultPropsCenter"
                     show-checkbox
-                    node-key="code"
+                    node-key="menucode"
                     :default-expand-all="true"
                     @check-change="handleTreeCenterCheckChange"
                     @check="handleTreeCenterCheck"
@@ -121,10 +111,10 @@
 
                 <div
                   ref="scrollCenter"
-                  style="border-right: 1px solid rgba(0,0,0,0.2);width: 600px;padding-left: 10px;overflow-y: auto"
-                  :style="{height:isExpandForm?tableHeight:(tableHeight+35)+'px',}"
+                  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="changeScrollLeftFlag('center')"
+                  @mouseover="isScroll='center'"
                 >
                   <div style=" ">
                     <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鎸夐挳鏉冮檺
@@ -138,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"
+                          v-for="i in it.buttoncodelist"
                           :key="i"
                           :label="i"
-                          style="display:flex;align-items: center"
+                          style="display:flex;align-items: center;"
                         />
                       </el-checkbox-group>
+
                     </div>
 
                   </div>
@@ -169,9 +161,9 @@
                 <div
                   ref="scrollRight"
                   style="width: 360px;padding-left: 10px;overflow-y: auto"
-                  :style="{height:isExpandForm?tableHeight:(tableHeight+35)+'px',}"
+                  :style="{height:(tableHeight-40)+'px',}"
                   @scroll="scrollRightScroll()"
-                  @mouseover="changeScrollLeftFlag('right')"
+                  @mouseover="isScroll='right'"
                 >
                   <div style=" ">
                     <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 鏁版嵁鏉冮檺
@@ -185,22 +177,22 @@
                   </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"
+                          v-for="i in it.datacodelist"
                           :key="i"
                           style="display:flex;align-items: center"
                           :label="i"
@@ -214,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>
 
@@ -228,150 +220,177 @@
 </template>
 
 <script>
-import Pagination from '@/components/Pagination'
-import ImportPicker from '@/components/ImportPicker'
-import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
 import {
+  RoleAddUpdateSava, RoleDeleteSava,
+  RolePermissionSava,
   RolePermissionSearchRole,
   RolePermissionSearchRoleMenu,
   RolePermissionSearchRoleMenuButton
 } from '@/api/basicSettings'
 import arrayToTree from 'array-to-tree'
+import { throttle } from '@/utils/debounceAndThrottle'
+import { DataPermissions } from '@/api/GeneralBasicData'
 
 export default {
-  name: 'Zzjg',
-  components: {
-    Pagination, ImportPicker
-  },
-  directives: { elDragDialog, waves },
+  name: 'RoleList',
+  directives: { waves },
   data() {
     return {
-      mouseHoverType: 'mouseout',
-      isExpandForm: false,
       mainHeight: 0,
       tableHeight: 0,
-      form: {
-        OrgCode: '', // 缁勭粐鏋舵瀯浠g爜
-        OrgName: '', // 缁勭粐鏋舵瀯鍚嶇О
-        OrgType: '', // 缁勭粐绫诲瀷
-        UserName: '', // 鍒涘缓浜哄憳
-        createdate: '',
-        prop: 'lm_date', // 鎺掑簭瀛楁
-        order: 'desc', // 鎺掑簭瀛楁
-        page: 1, // 绗嚑椤�
-        rows: 20 // 姣忛〉澶氬皯鏉�
-      },
-      treeLeft: [],
-      treeCenter: [],
+
+      treeLeft: [], // 宸︿晶鏍�
+      treeCenter: [], // 涓棿鏍�
       defaultPropsLeft: {
         children: 'roles',
         label: 'name'
       },
       defaultPropsCenter: {
         children: 'children',
-        label: 'name'
+        label: 'menuname'
       },
-      activeName: 'PC绔�',
+      activeName: 'PC',
 
       buttonIsChecked: false,
       dataIsChecked: false,
 
       menuCheckedCodeArr: [], // 鑿滃崟鏉冮檺鏁扮粍閫変腑鐨�
 
-      allButtonData: [], // 鎵�鏈夌殑鎸夐挳鍔犳潈闄�
+      allButtonData: [], // 鎵�鏈夎彍鍗曞搴旂殑鎸夐挳鏉冮檺鍔犳暟鎹潈闄�
 
-      isScroll: 'left'
+      isScroll: 'left',
 
+      dataKeyValue: []// 鏁版嵁鏉冮檺閿�煎
+
+    }
+  },
+  watch: {
+    treeLeft: {
+      handler(newValue, oldValue) {
+        newValue[0].roles.forEach(i => {
+          if (i.isEdit) {
+            this.$nextTick(() => {
+              this.$refs[i.code].focus()
+            })
+          }
+        })
+      },
+      deep: true
     }
   },
 
   created() {
-    this.getRolePermissionSearchRole()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
     this.getHeight()
+
+    this.getRolePermissionSearchRole()
   },
   methods: {
 
     // 鑾峰彇瑙掕壊鏉冮檺鏌ヨ瑙掕壊
     async getRolePermissionSearchRole() {
       const { data: res } = await RolePermissionSearchRole()
+      res[0].roles.forEach(i => {
+        i.isEdit = false
+      })
+
       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 = res.length > 0 ? 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 }
+      ]
 
-      // console.log(this.allButtonData, 213)
-      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).map(j => j.name)
-            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).map(j => j.name)
-            const dataChecked = this.allButtonData.tData.filter(j => j.menucode === it.code && j.flag === 'Y').name
-            // console.log(dataAll, dataChecked, 2)
-            it.itemData = dataAll
-            it.checkedData = dataChecked
+              it.buttoncodelist = it.buttoncodelist.map(j => j.buttonname)
+            }
 
-            // 鐢ㄤ綔鑿滃崟鍕鹃�夊洖鏄�
-            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.buttonIsChecked = result.every(i => i.flag === 'Y')
-      this.handleCheckedButtonChange('', '', true)
-      this.handleCheckedDataChange('', '', true)
-      // console.log(this.menuCheckedCodeArr, 2)
+      this.handleData()// 澶勭悊鏁版嵁鍥炴樉
+    },
+    // 澶勭悊缁勫悎鏁版嵁
+    handleData() {
+      this.menuCheckedCodeArr = this.allButtonData.map(i => i.menucode)
       this.$nextTick(() => {
         this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
       })
 
-      this.$forceUpdate()
-      // console.log(this.treeCenter[0].children)
+      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()
     },
 
     // 宸﹁竟婊氬姩鏉℃粦鍔ㄦ椂
@@ -395,15 +414,6 @@
         this.$refs.scrollCenter.scrollTop = this.$refs.scrollRight.scrollTop
       }
     },
-
-    resize() {
-
-    },
-
-    changeScrollLeftFlag(val) {
-      this.isScroll = val
-    },
-
     // 鍏ㄩ�夋敼鍙�
     handleCheckAllChange(val, belong) {
       const checkedKeys = this.$refs.treeCenterRef.getCheckedKeys()
@@ -412,12 +422,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
+                  it.buttonChecked = it.buttoncodelist
                 }
                 if (belong === 'data') {
-                  it.checkedData = '鍏ㄩ儴'
+                  it.dataChecked = '鍏ㄩ儴'
                 }
               }
             })
@@ -427,29 +437,31 @@
         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 = ''
                 }
               }
             })
           }
         })
       }
-
-      // console.log(this.treeCenter[0].children, 20)
     },
     // 鍗曚釜鎸夐挳鏀瑰彉
-    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)
       }
@@ -460,35 +472,33 @@
       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()
     },
-    // 澶勭悊鏍戝舰鍕鹃��
+    // 澶勭悊涓棿鏍戝舰鍕鹃��
     handleTreeCenterCheck(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
       // console.log(obj, checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys, '鍔犲瀹�')
 
@@ -497,199 +507,204 @@
         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, '鐜嬭�佸悏')
       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()
       }
     },
-
     // 鍗曢�夋鎸夐挳鏀瑰彉
     handleCheckedDataChange(value, code, flag) {
       // console.log(value, code)
-      if (flag) {
+      if (!flag) {
         this.menuCheckedCodeArr.push(code)
         this.menuCheckedCodeArr = [...new Set(this.menuCheckedCodeArr)]
-
         this.$refs.treeCenterRef.setCheckedKeys(this.menuCheckedCodeArr)
       }
-
       // 杩欓噷鏄垽鏂叏閫塺adio 鏄惁閫変腑
       let count = 0
       let childrenLength = 0
       this.treeCenter[0].children.forEach(item => {
         if (item.children && item.children.length) {
           item.children.forEach(it => {
-            if (it.checkedData) {
+            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
-      // console.log(JSON.parse(JSON.stringify(this.treeCenter[0].children)))
-
       this.$forceUpdate()
     },
-
-    async  treeLeftNodeClick(obj, Node, VueComponent) {
-      // this.menuCheckedCodeArr = []
-
-      await this.getRolePermissionSearchRoleMenuButton(obj.code)
-      await this.getRolePermissionSearchRoleMenu(obj.code)
+    // 瑙掕壊鍒囨崲
+    async treeLeftNodeClick(obj, Node, VueComponent) {
+      if (obj.code !== '000') {
+        await this.getRolePermissionSearchRoleMenuButton(obj.code)
+        // await this.getRolePermissionSearchRoleMenu(obj.code)
+        this.handleData()
+      }
     },
+    // 瑙掕壊鍚嶇О鏂板
+    rolePlusClick() {
+      this.treeLeft[0].roles.push({ code: '', name: '', isEdit: true })
+    },
+    // 瑙掕壊鍚嶇О淇敼
+    roleEditClick(self, node, data) {
+      // console.log(self, node, data)
+      this.treeLeft[0].roles.forEach(i => {
+        i.isEdit = false
+      })
+      data.isEdit = !data.isEdit
+    },
+    // 瑙掕壊鍚嶇О鍒犻櫎
+    roleDeleteClick(self, node, data) {
+      // console.log(self, node, data)
+      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+        confirmButtonText: '纭畾',
+        cancelButtonText: '鍙栨秷',
+        type: 'warning'
+      }).then(() => {
+        const D = {
+          rolecode: data.code,
+          rolename: data.name,
+          type: this.activeName
+        }
+        RoleDeleteSava(D).then(res => {
+          if (res.code === '200') {
+            this.$notify.success('瑙掕壊鍒犻櫎鎴愬姛锛�')
+          }
+          this.getRolePermissionSearchRole()
+        })
+      }).catch(() => {
+        this.$notify.info('宸插彇娑堝垹闄�')
+      })
+    },
+    // 瑙掕壊鍚嶇О淇濆瓨   閲囩敤闃叉姈褰㈠紡
+    roleSave: throttle(function(val) {
+      val.isEdit = false
 
+      if (val.name.trim().length === 0) {
+        this.getRolePermissionSearchRole()
+        return this.$notify.info('鏃犳晥淇濆瓨锛�')
+      }
+
+      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),
+
+    // 椤甸潰鍕鹃�夊ソ淇濆瓨浜嬩欢
+    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 => {
+            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.buttonChecked && it.buttonChecked.length > 0) { // 宸查�夎彍鍗�
+                it.buttonCheckedCode = this.$ButtonData.filter(i =>
+                  it.buttonChecked.includes(i.buttonname)
+                ).map(i => i.buttoncode)
+              }
+              arr.push({
+                menucode: it.menucode,
+                datacode: it.dataCheckedCode !== undefined ? it.dataCheckedCode : '',
+                buttoncode: it.buttonCheckedCode ? it.buttonCheckedCode.join(',') : ''
+              })
+            }
+          })
+        }
+      })
+
+      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() {
       this.$nextTick(() => {
         this.mainHeight = window.innerHeight - 85
-        this.tableHeight = this.mainHeight - 255
-        // this.$refs.tableDataRef.doLayout()
+        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
+      }
     }
   }
 }
 </script>
 
-<!--鍏叡椤甸潰鏍峰紡-->
-<style lang="scss" scoped>
-$main_color: #42b983;
-::v-deep .el-button--text {
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
-  color: $main_color;
-  cursor: pointer;
-}
-
-.el-icon-edit-outline {
-  margin-right: 15px;
-}
-
-::v-deep .el-button--primary, .el-button--default, .el-button--info {
-  height: 34px;
-  display: flex;
-  align-items: center;
-  padding: 0 15px;
-}
-
-::v-deep .el-button--primary {
-  //background-color: $main_color !important;
-}
-
-::v-deep .el-button--default {
-  background-color: #f8f8fa;
-  border: none;
-}
-
-::v-deep .el-input__inner {
-  height: 34px;
-  line-height: 34px;
-  //color: #a7a7a7;
-}
-
-::v-deep .el-dialog__body {
-  padding: 20px 100px !important;
-}
-
-::v-deep .dialogVisibleRoles .el-dialog__body {
-  padding: 20px 20px !important;
-}
-
-::v-deep .importPickerClass .el-dialog__body {
-  padding: 20px 20px !important;
-}
-
-::v-deep .el-dialog__footer {
-  display: flex;
-  justify-content: flex-end;
-}
-
-::v-deep .el-table .caret-wrapper {
-  transform: scale(0.8);
-}
-
-::v-deep .cell {
+<style scoped lang="scss">
+.custom-tree-node {
+  flex: 1;
   display: flex;
   align-items: center;
   justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
 }
 
-::v-deep .el-table::before {
-  height: 0;
+::v-deep .el-checkbox__label {
+  width: 55px;
 }
 
-::v-deep .el-table__body-wrapper {
-  background-color: #f8f8fa;
-}
-
-::v-deep .el-table__body .el-table__row.hover-row td {
-  background-color: #eaecef;
-}
-
-::v-deep .el-form--inline .el-form-item__label {
-  color: #a7a7a7;
-}
-
-.body ::v-deep .el-divider {
-  border: 1px solid #eee;
-  width: 99%;
-  margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
-  margin-bottom: 0;
-}
-
-.userDialogVisible ::v-deep .el-form-item {
-  margin-bottom: 0;
-}
-
-::v-deep .el-select__caret {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.tableFixed {
-  ::v-deep .el-table__fixed-right {
-    height: 100% !important;
-  }
-
-  ::v-deep .el-table__fixed {
-    height: 100% !important;
-  }
-}
-</style>
-<style>
-
-.el-table .custom-row {
-  background: #f8f8fa;
+.el-icon-plus:hover, .el-icon-edit:hover, .el-icon-delete:hover {
+  color: #000 !important;
 }
 </style>

--
Gitblit v1.9.3