组织树修改，相关组件修改

src/components/organization/index.vue

@@ -5,22 +5,46 @@
       <div class="paren_header">
         <p>{{ title }}</p>
         <template>
-          <div class="column" v-show="vice">
-            <div :class="active == index ? 'column_childs' : 'column_child'" v-for="(item, index) in colType" :key="index" @click="upStart(index)">
+          <div
+            v-show="vice"
+            class="column"
+          >
+            <div
+              v-for="(item, index) in colType"
+              :key="index"
+              :class="active == index ? 'column_childs' : 'column_child'"
+              @click="upStart(index)"
+            >
               {{ item.name }}
             </div>
           </div>
         </template>
       </div>
       <div class="paren_content">
-        <div class="dptBox" v-show="active == 0">
+        <div
+          v-show="active == 0"
+          class="dptBox"
+        >
           <el-scrollbar style="height: 100%">
-            <el-tree :data="data" :check-strictly="true" :default-expanded-keys="defaultExpandedKeys" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" :default-checked-keys="checkedKeys" :node-key="nodekey" ref="tree" highlight-current>
-              <span v-if="orgType == 'org'" slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
-                {{ data.OrganName }}
-              </span>
-              <span v-else slot-scope="{ data }" :title="data.AuthName" class="org-data-tree-node">
-                {{ data.AuthName }}
+            <el-tree
+              ref="tree"
+              :data="data"
+              :check-strictly="true"
+              :default-expanded-keys="defaultExpandedKeys"
+              show-checkbox
+              :props="defaultProps"
+              :default-checked-keys="checkedKeys"
+              :node-key="nodeKey"
+              highlight-current
+              @node-click="nodeClick"
+              @check-change="currentChange"
+            >
+              <span
+                slot-scope="{ data }"
+                :title="data[defaultProps.label]"
+                class="org-data-tree-node"
+              >
+                {{ data[defaultProps.label] }}
               </span>
             </el-tree>
           </el-scrollbar>
@@ -28,14 +52,28 @@
         <!-- <div class="dptBox" v-if="doesJobShow" v-show="active == 1">
           <Rolelist :type="true" @radioChange="radioChange" :radioCheck="radioCheck" :number="8" :active="true" class="lessData" :mainData="mainData" />
         </div> -->
-        <div v-show="active == 1" class="dptBox duoBox">
+        <div
+          v-show="active == 1"
+          class="dptBox duoBox"
+        >
           <el-scrollbar style="height: 100%">
-            <el-tree :data="data" show-checkbox @check-change="currentChangeDuo" :default-expanded-keys="defaultExpandedKeys" :props="defaultProps" :default-checked-keys="checkedKeysDuo" :node-key="nodekey" ref="treeDuo" highlight-current>
-              <span v-if="orgType == 'org'" slot-scope="{ data }" :title="data.OrganName" class="org-data-tree-node">
-                {{ data.OrganName }}
-              </span>
-              <span v-else slot-scope="{ data }" :title="data.AuthName" class="org-data-tree-node">
-                {{ data.AuthName }}
+            <el-tree
+              ref="treeDuo"
+              :data="data"
+              show-checkbox
+              :default-expanded-keys="defaultExpandedKeys"
+              :props="defaultProps"
+              :default-checked-keys="checkedKeysDuo"
+              :node-key="nodeKey"
+              highlight-current
+              @check-change="currentChangeDuo"
+            >
+              <span
+                slot-scope="{ data }"
+                :title="data[defaultProps.label]"
+                class="org-data-tree-node"
+              >
+                {{ data[defaultProps.label] }}
               </span>
             </el-tree>
           </el-scrollbar>
@@ -45,223 +83,204 @@
   </div>
 </template>
 <script>
-import Rolelist from '@/components/rolelist'
+// import Rolelist from '@/components/rolelist'
 export default {
+  // components: { Rolelist },
   props: {
     title: {
       type: String,
-      default: "",
+      default: ''
     },
     vice: {
       type: Boolean,
-      default: false,
+      default: false
     },
     data: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
-    nodekey: {
+    nodeKey: {
       type: String,
-      default: "",
+      default: ''
+    },
+    upNodeKey: {
+      type: String,
+      default: ''
     },
     defaultProps: {
       type: Object,
-      default: () => { },
+      default: () => {}
     },
     checkedKeys: {
-      //已选中
+      // 已选中
       type: Array,
-      default: () => [],
+      default: () => []
     },
     checkedKeysDuo: {
-      //已选中
+      // 已选中
       type: Array,
-      default: () => [],
+      default: () => []
     },
     lessData: {
-      //副岗
+      // 副岗
       type: Array,
-      default: () => [],
+      default: () => []
     },
     mainData: {
-      //主岗
+      // 主岗
       type: Array,
-      default: () => [],
+      default: () => []
     },
     radioCheck: {
       type: Number,
-      default: 0,
+      default: 0
     },
     checkBoxList: {
       type: Array,
-      default: () => [],
-    },
-    orgType: {
-      type: String,
-      default: "org",
+      default: () => []
     },
     orgList: {
       type: Array,
       default: () => []
+    },
+    defaultMultiple: {
+      type: Boolean,
+      default: false
     }
   },
-  components: { Rolelist },
-  data () {
+  data() {
     return {
       active: 0,
       colType: [
         {
-          name: "所属组织",
+          name: '所属组织'
         },
         {
-          name: "组织授权",
+          name: '组织授权'
         }
       ],
       checkedDatas: [],
-      checkedId: null,
-      checkedList: [], //选中的列表,
-      nodekeys: "nodekey",
+      checkedList: [], // 选中的列表
       defaultExpandedKeys: [-1],
       getExpandedKeysStep: [false, false]
-    };
+    }
   },
   watch: {
     checkedKeys: {
-      handler (val) {
-        this.checkedList = val;
+      handler(val) {
+        this.checkedList = val
         this.$refs.tree.setCheckedKeys(val)
         this.getExpandedKeysStep.splice(0, 1, true)
       },
-      deep: true,
+      deep: true
     },
     checkedKeysDuo: {
-      handler (val) {
+      handler(val) {
         this.$refs.tree.setCheckedKeys(val)
       },
-      deep: true,
+      deep: true
     },
     orgList: {
-      handler (val) {
+      handler() {
         this.getExpandedKeysStep.splice(1, 1, true)
       },
       deep: true
     },
     getExpandedKeysStep: {
-      handler (val) {
+      handler(val) {
         if (val.every(v => v)) {
           this.defaultExpandedKeys = [-1]
-          if (this.orgType === 'org') {
-            this.checkedKeys.forEach(key => {
-              if (key !== -1) {
-                const org = this.orgList.find(item => item.OrganId == key)
-                if (org) {
-                  const OrganUpid = org.OrganUpid
-                  if (!this.defaultExpandedKeys.includes(OrganUpid)) {
-                    this.defaultExpandedKeys.push(OrganUpid)
-                  }
+          this.checkedKeys.forEach(key => {
+            if (key !== -1) {
+              const node = this.orgList.find(item => item[this.nodeKey] == key)
+              if (node) {
+                const upNodeKey = node[this.upNodeKey]
+                if (!this.defaultExpandedKeys.includes(upNodeKey)) {
+                  this.defaultExpandedKeys.push(upNodeKey)
                 }
               }
-            })
-          } else if (this.orgType === 'auth') {
-            this.checkedKeys.forEach(key => {
-              if (key !== -1) {
-                const auth = this.orgList.find(item => item.AuthId == key)
-                if (auth) {
-                  const UpAuthId = auth.UpAuthId
-                  if (!this.defaultExpandedKeys.includes(UpAuthId)) {
-                    this.defaultExpandedKeys.push(UpAuthId)
-                  }
-                }
-              }
-            })
-          }
+            }
+          })
         }
       },
       deep: true
     }
   },
-  mounted () {
+  mounted() {
     if (this.data != null) {
       this.data = this.formatData(this.data)
     }
+    if (this.defaultMultiple) {
+      this.active = 1
+    }
   },
   methods: {
-    //点击选择
-    upStart (index) {
-      this.active = index;
-      this.$emit("getTreeindex", index)
+    // 点击选择
+    upStart(index) {
+      this.active = index
+      this.$emit('getTreeindex', index)
     },
-    formatData (params) {
-      let data = params;
-      data.map((item) => {
-        if (item.hasOwnProperty('children')) {
-          item.disabled = true;
+    formatData(params) {
+      const data = params
+      data.forEach(item => {
+        if (Object.hasOwnProperty.call(item, 'children')) {
+          item.disabled = true
           this.formatData(item.children)
         }
-      });
-      return data;
+      })
+      return data
     },
-    currentChange (data, isChecked) {
-      if (this.orgType == 'org') {
-        const { OrganId } = data
-        this.$emit("getTreeData", this.$refs.tree.getCheckedNodes())
-        if (isChecked) {
-          const checked = [OrganId]
-          this.$refs.tree.setCheckedKeys(checked)
-        }
-      } else if (this.orgType == 'auth') {
-        const { AuthId } = data
-        this.$emit("getTreeData", this.$refs.tree.getCheckedNodes())
-        if (isChecked) {
-          const checked = [AuthId]
-          this.$refs.tree.setCheckedKeys(checked)
-        }
+    currentChange(data, isChecked) {
+      const key = data[this.nodeKey]
+      this.$emit('getTreeData', this.$refs.tree.getCheckedNodes())
+      if (isChecked) {
+        const checked = [key]
+        this.$refs.tree.setCheckedKeys(checked)
       }
     },
-    currentChangeDuo () {
+    currentChangeDuo() {
       const arr = this.$refs.treeDuo.getCheckedNodes()
-      this.$emit("getTreeDataDuo", arr)
+      this.$emit('getTreeDataDuo', arr)
     },
     // 选中后设置初始数据
-    setDataObj (arr) {
-      arr.forEach((item) => {
+    setDataObj(arr) {
+      arr.forEach(item => {
         if (!item.children) {
           item.children = {
             OrganId: item.OrganId,
-            ValidBegin: "",
-            ValidEnd: "",
-            Action: "",
-            QueryRow: "",
-            QueryCol: "",
-            NewCol: "",
-            EditRow: "",
-            EditCol: "",
-            DeleteRow: "",
-          };
+            ValidBegin: '',
+            ValidEnd: '',
+            Action: '',
+            QueryRow: '',
+            QueryCol: '',
+            NewCol: '',
+            EditRow: '',
+            EditCol: '',
+            DeleteRow: ''
+          }
         }
-      });
-      this.$emit("getTreeData", arr)
+      })
+      this.$emit('getTreeData', arr)
     },
-    nodeClick (data) {
-      this.$emit("getTreeDatas", data)
-      this.checkedId = data.nodekey
+    nodeClick(data) {
+      this.$emit('getTreeDatas', data)
     },
-    radioChange (val) {
+    radioChange(val) {
       this.$emit('radioChange', val)
     },
-    //多选框
-    checkChange (arr) {
-      this.$emit("checkChange", arr)
+    // 多选框
+    checkChange(arr) {
+      this.$emit('checkChange', arr)
     },
-    checkClick (item) {
-      this.$emit("checkClick", item)
+    checkClick(item) {
+      this.$emit('checkClick', item)
     }
-  },
-};
+  }
+}
 </script>
 
 <style lang="scss">
-@import "./organization.scss";
+@import './organization.scss';
 .DBox {
   cursor: not-allowed;
 }

src/components/usergrouptree/index.vue

@@ -1,20 +1,39 @@
 <!--
  * @Author: zk
  * @Date: 2022-02-09 15:47:09
- * @LastEditTime: 2022-03-30 14:22:36
+ * @LastEditTime: 2022-04-11 16:06:43
  * @LastEditors: your name
  * @Description: 用户组树
- * @FilePath: \Foshan4A4.0\src\components\usergrouptree\index.vue
 -->
 <template>
   <div class="userGroupTree">
     <div class="head">
       <p>{{ title }}</p>
     </div>
-    <div :class="type ? 'radioBg':''" class="content">
-      <el-scrollbar style="height: 100%" wrap-style="overflow-x:hidden;">
-        <el-tree ref="tree" :data="data" show-checkbox :check-strictly="true" :default-props="defaultProps" :default-expanded-keys="defaultExpandedKeys" node-key="GroupId" highlight-current @check-change="currentChange">
-          <span slot-scope="{ data }" :title="data.GroupName" class="custom-tree-node">
+    <div
+      :class="type ? 'radioBg':''"
+      class="content"
+    >
+      <el-scrollbar
+        style="height: 100%"
+        wrap-style="overflow-x:hidden;"
+      >
+        <el-tree
+          ref="tree"
+          :data="data"
+          show-checkbox
+          :check-strictly="true"
+          :default-props="defaultProps"
+          :default-expanded-keys="defaultExpandedKeys"
+          node-key="GroupId"
+          highlight-current
+          @check-change="currentChange"
+        >
+          <span
+            slot-scope="{ data }"
+            :title="data.GroupName"
+            class="custom-tree-node"
+          >
             {{ data.GroupName }}
           </span>
         </el-tree>
@@ -59,7 +78,7 @@ export default {
       default: 0
     }
   },
-  data () {
+  data() {
     return {
       data: [], // tree数据
       checkedList: [], // 已选中数据
@@ -67,12 +86,12 @@ export default {
       pageSize: 20,
       defaultExpandedKeys: [-1],
       getExpandedKeysStep: [false, false],
-      userGroupList: [],
+      userGroupList: []
     }
   },
   watch: {
     checkedKeys: {
-      handler (val) {
+      handler(val) {
         this.checkedList = val
         this.$refs.tree.setCheckedKeys(val)
         this.getExpandedKeysStep.splice(0, 1, true)
@@ -97,12 +116,12 @@ export default {
       deep: true
     }
   },
-  created () {
+  created() {
     this.getGroupTree()
   },
   methods: {
     // 复选框选中
-    currentChange (data, isChecked) {
+    currentChange(data, isChecked) {
       if (this.type) {
         const { GroupId } = data
         this.$emit('getTreeData', this.$refs.tree.getCheckedNodes())
@@ -115,7 +134,7 @@ export default {
         this.$emit('getTreeData', arr)
       }
     },
-    async getGroupTree () {
+    async getGroupTree() {
       const result = await GetGroupTree({
         QueryName: '',
         PageIndex: this.pageIndex,
@@ -125,27 +144,29 @@ export default {
       if (this.singleNode) {
         if (this.singleNode === -1) {
           const obj = {
-          AuthCount: 0,
-          GroupId: -1,
-          GroupName: this.accountGroupType,
-          GroupUpid: 0,
-          QueryTarget: 0,
-          Status: 0,
-          UserCount: 0,
-          disabled: true
-        }
-        this.data = [obj]
+            AuthCount: 0,
+            GroupId: -1,
+            GroupName: this.accountGroupType,
+            GroupUpid: 0,
+            QueryTarget: 0,
+            Status: 0,
+            UserCount: 0,
+            disabled: true
+          }
+          this.data = [obj]
         } else {
-          this.data = [datas.find(data => {
-            if (data.GroupId === this.singleNode) {
-              data.disabled = true
-              return true
-            }
-          })]
+          this.data = [
+            datas.find(data => {
+              if (data.GroupId === this.singleNode) {
+                data.disabled = true
+                return true
+              }
+            })
+          ]
         }
       } else {
-      this.userGroupList = datas
-      this.getExpandedKeysStep.splice(1, 1, true)
+        this.userGroupList = datas
+        this.getExpandedKeysStep.splice(1, 1, true)
         const tree = translateDataToTreeAll(datas, 'GroupUpid', 'GroupId')
         const setDisabled = (tree, key) => {
           if (key) {

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -22,14 +22,14 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <div class="part">
-            <AccountGroupTree :title="`上级${accountGroupType}`" nodekey="GroupId" :single-node="doesGroupExist ? GroupUpId : 0" :type="true" :default-props="defaultProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
+            <AccountGroupTree :title="`上级${accountGroupType}`" :single-node="doesGroupExist ? GroupUpId : 0" :type="true" :default-props="defaultProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <!-- 开启角色 -->
         <template v-if="openRole">
           <el-col :span="8">
             <div class="part">
-              <RoleList title="角色列表" :role-type="roleType" :group-ids="groupIds" :check-box-list="roleListCheckedList" :number="8" :active="true" :selected-role-id="currentSelectedRoleId" :pageSize="200" @checkChange="getRoleListChecked" @checkClick="selectRole" @role-list-change="roleListCheckedFilter" />
+              <RoleList title="角色列表" :role-type="roleType" :group-ids="groupIds" :check-box-list="roleListCheckedList" :number="8" :active="true" :selected-role-id="currentSelectedRoleId" :page-size="200" @checkChange="getRoleListChecked" @checkClick="selectRole" @role-list-change="roleListCheckedFilter" />
             </div>
           </el-col>
           <el-col :span="8">
@@ -99,7 +99,7 @@ export default {
     return {
       doesGroupExist: this.$route.meta.doesGroupExist, // 控制岗位新增/编辑
       GroupId: 0,
-      GroupUpId: parseInt(this.$route.query.GroupUpId),
+      GroupUpId: Number(this.$route.query.GroupUpId),
       // dialogVisible: false,
       openRole: 0,
       accountGroupTreeCheckedList: [], // 岗位树初始勾选项
@@ -154,7 +154,7 @@ export default {
     const { OpenRole } = obj
     this.openRole = OpenRole
     this.accountGroupTreeCheckedTemp = [this.GroupUpId]
-    this.doesGroupExist && (this.GroupId = parseInt(this.$route.query.GroupId))
+    this.doesGroupExist && (this.GroupId = Number(this.$route.query.GroupId))
   },
   mounted () {
     if (this.GroupUpId !== -1) {
@@ -192,8 +192,8 @@ export default {
             RoleList.forEach(role => {
               role.IsSelected &&
                 (this.roleListCheckedTemp.push(role),
-                  this.roleListCheckedCopy.push(role),
-                  this.roleListCheckedList.push(role.RoleId))
+                this.roleListCheckedCopy.push(role),
+                this.roleListCheckedList.push(role.RoleId))
             })
           AuthList &&
             AuthList.length &&

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -1,10 +1,9 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-08 09:27:43
- * @LastEditTime: 2022-03-30 14:30:43
+ * @LastEditTime: 2022-04-11 14:58:18
  * @LastEditors: your name
  * @Description: 用户组管理
- * @FilePath: \Foshan4A2.0\src\views\accountGroupManagement\components\home.vue
 -->
 <template>
   <div class="accountGroup-home">
@@ -218,20 +217,6 @@ export default {
       initCurrentKeyStep: [false, false]
     }
   },
-  created () {
-    let keyWords = ''
-    const treeEx = sessionStorage.getItem('accountGroupExpandedKeys');
-    if (this.$route.query.keyWords) {
-      keyWords = this.$route.query.keyWords
-    }
-    if (treeEx) {
-      this.expandedKeys = JSON.parse(treeEx);
-    }
-    this.getGroupTree(keyWords)
-  },
-  mounted () {
-    this.initCurrentKeyStep.splice(1, 1, true)
-  },
   watch: {
     dataList: {
       handler: function (val) {
@@ -261,12 +246,26 @@ export default {
     initCurrentKeyStep: {
       handler(arr) {
         if (arr.every(item => item)) {
-          this.currentKey = parseInt(sessionStorage.getItem('accountGroupCurrentKey') ?? -1)
+          this.currentKey = Number(sessionStorage.getItem('accountGroupCurrentKey') ?? -1)
         }
       },
       deep: true
     }
   },
+  created () {
+    let keyWords = ''
+    const treeEx = sessionStorage.getItem('accountGroupExpandedKeys');
+    if (this.$route.query.keyWords) {
+      keyWords = this.$route.query.keyWords
+    }
+    if (treeEx) {
+      this.expandedKeys = JSON.parse(treeEx);
+    }
+    this.getGroupTree(keyWords)
+  },
+  mounted () {
+    this.initCurrentKeyStep.splice(1, 1, true)
+  },
   methods: {
     // 树点击
     handleNodeClick (data) {
@@ -399,8 +398,8 @@ export default {
     },
     // 获取指定数据
     decompose (value, key, id) {
-      let data = _.cloneDeep(value)
-      let arr = []
+      const data = _.cloneDeep(value)
+      const arr = []
       for (let i = 0; i < data.length; i++) {
         if (data[i][key] == id) {
           arr.push(data[i])

src/views/accountManagement/components/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-03-16 20:44:15
+ * @LastEditTime: 2022-04-11 14:02:12
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -79,7 +79,7 @@
       <el-row v-if="openGroup && openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card content-card-xl">
-            <AccountGroupTree :title="`所属${accountGroupType}`" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
+            <AccountGroupTree :title="`所属${accountGroupType}`" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <el-col v-is="['account_edit_role_list']" :span="8">
@@ -100,7 +100,7 @@
       <el-row v-if="openGroup && !openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card content-card-xxl">
-            <AccountGroupTree :title="`所属${accountGroupType}`" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
+            <AccountGroupTree :title="`所属${accountGroupType}`" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <el-col :span="8">

src/views/authorityManagement/components/authorityHome.vue

@@ -1,10 +1,9 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:27:43
- * @LastEditTime: 2022-03-30 14:07:45
+ * @LastEditTime: 2022-04-11 14:59:47
  * @LastEditors: your name
  * @Description: 权限管理
- * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\home.vue
 -->
 <template>
   <div class="authority-home">
@@ -237,18 +236,18 @@ export default {
     initCurrentKeyStep: {
       handler(arr) {
         if (arr.every(item => item)) {
-          this.currentKey = parseInt(sessionStorage.getItem('authCurrentKey') ?? -1)
+          this.currentKey = Number(sessionStorage.getItem('authCurrentKey') ?? -1)
         }
       },
       deep: true
     }
   },
   methods: {
-    //树点击
+    // 树点击
     handleNodeClick (data) {
       this.currentKey = data.AuthId
     },
-    //下级卡片点击
+    // 下级卡片点击
     childrenClick (data) {
       this.currentKey = data.AuthId
       if (!this.expandedKeys.includes(this.currentKey)) {
@@ -279,7 +278,7 @@ export default {
         this.expandedKeys = this.expandedKeys.filter(key => key !== AuthId)
       })
     },
-    //下级切换状态
+    // 下级切换状态
     childrenRenderChange (data, index) {
       const { AuthId, flag, Type, UpAuthId } = data
       this.dataUpId = UpAuthId
@@ -312,7 +311,7 @@ export default {
       this.dataUpId = UpAuthId
       this.handleChange(AuthId, flag, Type)
     },
-    //删除
+    // 删除
     remove () {
       if (this.type === 1) {
         this.deleteApp(this.dataId)
@@ -320,7 +319,7 @@ export default {
         this.deleteAuth(this.dataId)
       }
     },
-    //查询
+    // 查询
     getSearchData (val) {
       if (val) {
         this.$router.replace({ path: '/authority', query: { keyWords: val } })
@@ -330,12 +329,12 @@ export default {
       this.$refs.tree.filter(val);
       // this.getAuthTree(val)
     },
-    //清除查询
+    // 清除查询
     clearSearchData () {
       this.$router.replace('/authority')
       this.getAuthTree()
     },
-    //节点关闭按钮点击
+    // 节点关闭按钮点击
     onNodeClick (data) {
       this.flag = true
       this.dataId = data.AuthId
@@ -343,10 +342,10 @@ export default {
       this.title = data.AuthName
       this.type = data.Type
     },
-    //获取指定数据
+    // 获取指定数据
     decompose (value, key, id) {
-      let data = _.cloneDeep(value);
-      let arr = []
+      const data = _.cloneDeep(value);
+      const arr = []
       for (let i = 0; i < data.length; i++) {
         if (data[i][key] == id) {
           arr.push(data[i])
@@ -364,7 +363,7 @@ export default {
         }
       })
     },
-    //渲染节点
+    // 渲染节点
     // renderContent (h, data) {
     //   return (
     //     <div class="account-left-content-teams">
@@ -396,8 +395,8 @@ export default {
     //     </div>
     //   )
     // },
-    //-----------获取数据------------
-    //应用状态变更
+    // -----------获取数据------------
+    // 应用状态变更
     async handleChange (id, flag, type, index = 0, isChildren = false) {
       const Status = flag ? 1 : 0
       try {
@@ -456,7 +455,7 @@ export default {
         }
       }
     },
-    //应用删除
+    // 应用删除
     async deleteApp (id) {
       try {
         const res = await DeleteApp({
@@ -480,7 +479,7 @@ export default {
         this.flag = false
       }
     },
-    //权限项删除
+    // 权限项删除
     async deleteAuth (id) {
       try {
         const res = await DeleteAuth({

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-03-17 12:06:54
+ * @LastEditTime: 2022-04-11 14:43:27
  * @LastEditors: your name
  * @Description:权限项
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -40,7 +40,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div :class="!openRole && !OpenGroup ? '' : 'r24'" class="flex1 part">
-        <Organization :defaultProps="defaultProps" :checkedKeys="checkedKeys" @getTreeData="getTreeData" :orgType="orgType" :orgList="orgList" :data="data" nodekey="AuthId" title="上级权限项" />
+        <Organization :defaultProps="defaultProps" :checkedKeys="checkedKeys" @getTreeData="getTreeData" :orgList="orgList" :data="data" node-key="AuthId" up-node-key="AuthUpid" title="上级权限项" />
       </div>
       <!--有角色-->
       <template v-if="openRole">
@@ -122,7 +122,6 @@ export default {
       rulesObj: {},
       msgDatas: [],
       roleType: '',
-      orgType: '',
       checkedKeys: [],
       disabled: true,
       orgList: []
@@ -161,7 +160,6 @@ export default {
     } else if (this.OpenGroup) {
       this.roleType = 'account';
     }
-    this.orgType = 'auth';
   },
   methods: {
     //获取指定数据

src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-03-17 12:05:58
+ * @LastEditTime: 2022-04-11 14:43:37
  * @LastEditors: your name
  * @Description:权限项
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -40,7 +40,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div :class="!openRole && !OpenGroup ? '' : 'r24'" class="flex1 part">
-        <Organization :defaultProps="defaultProps" :checkedKeys="checkedKeys" @getTreeData="getTreeData" :orgType="orgType" :orgList="orgList" :data="data" nodekey="AuthId" title="上级权限项" />
+        <Organization :defaultProps="defaultProps" :checkedKeys="checkedKeys" @getTreeData="getTreeData" :orgList="orgList" :data="data" node-key="AuthId" up-node-key="AuthUpid" title="上级权限项" />
       </div>
       <!--有角色-->
       <template v-if="openRole">
@@ -122,7 +122,6 @@ export default {
       rulesObj: {},
       msgDatas: [],
       roleType: '',
-      orgType: '',
       checkedKeys: [],
       disabled: true,
       orgList: []
@@ -163,7 +162,6 @@ export default {
     } else if (this.OpenGroup) {
       this.roleType = 'account';
     }
-    this.orgType = 'auth';
   },
   methods: {
     //获取指定数据

src/views/jobsManagement/add.vue

@@ -44,7 +44,7 @@
       <el-row :gutter="25">
         <el-col :span="24">
           <div class="part">
-            <Organization title="上级组织" :active="0" :data="dataObj" :defaultProps="defaultProps" nodekey="OrganId" @getTreeData="getOrganTreeData" :checkedKeys="checkedIdList" />
+            <Organization title="上级组织" :active="0" :data="dataObj" :defaultProps="defaultProps" node-key="OrganId" up-node-key="OrganUpid" @getTreeData="getOrganTreeData" :checkedKeys="checkedIdList" />
           </div>
         </el-col>
       </el-row>

src/views/jobsManagement/edit.vue

@@ -44,7 +44,7 @@
       <el-row :gutter="25">
         <el-col :span="24">
           <div class="part">
-            <Organization title="上级组织" :active="0" :data="dataObj" :defaultProps="defaultProps" nodekey="OrganId" @getTreeData="getOrganTreeData" :checkedKeys="checkedIdList" />
+            <Organization title="上级组织" :active="0" :data="dataObj" :defaultProps="defaultProps" node-key="OrganId" up-node-key="OrganUpid" @getTreeData="getOrganTreeData" :checkedKeys="checkedIdList" />
           </div>
         </el-col>
       </el-row>

src/views/organizationManagement/components/organizationAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-03-17 11:40:21
+ * @LastEditTime: 2022-04-11 14:35:15
  * @LastEditors: your name
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -52,7 +52,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="flex1 part">
-        <Organization :defaultProps="defaultProps" :data="data" nodekey="OrganId" @getTreeData="getTreeData" :checkedKeys="checkedKeys" :orgList="orgList" title="上级组织" />
+        <Organization :defaultProps="defaultProps" :data="data" node-key="OrganId" up-node-key="OrganUpid" @getTreeData="getTreeData" :checkedKeys="checkedKeys" :orgList="orgList" title="上级组织" />
       </div>
     </div>
   </div>

src/views/organizationManagement/components/organizationEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 11:26:07
- * @LastEditTime: 2022-03-16 15:27:43
+ * @LastEditTime: 2022-04-11 14:35:27
  * @LastEditors: your name
  * @Description:新增组织
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityPower.vue
@@ -52,7 +52,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="flex1 part">
-        <Organization :defaultProps="defaultProps" :data="data" nodekey="OrganId" @getTreeData="getTreeData" :checkedKeys="checkedKeys" :orgList="orgList" title="上级组织" />
+        <Organization :defaultProps="defaultProps" :data="data" node-key="OrganId" up-node-key="OrganUpid" @getTreeData="getTreeData" :checkedKeys="checkedKeys" :orgList="orgList" title="上级组织" />
       </div>
     </div>
   </div>

src/views/organizationManagement/components/organizationHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 09:27:43
- * @LastEditTime: 2022-03-30 14:33:30
+ * @LastEditTime: 2022-04-11 14:49:41
  * @LastEditors: your name
  * @Description: 权限管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\home.vue
@@ -277,7 +277,7 @@ export default {
     initCurrentKeyStep: {
       handler(arr) {
         if (arr.every(item => item)) {
-          this.currentKey = parseInt(sessionStorage.getItem('orgCurrentKey') ?? -1)
+          this.currentKey = Number(sessionStorage.getItem('orgCurrentKey') ?? -1)
         }
       },
       deep: true

src/views/staffManagement/compontents/staffAdd.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-03-30 14:45:41
+ * @LastEditTime: 2022-04-11 14:35:43
  * @LastEditors: your name
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
@@ -41,7 +41,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="r24 flex1 part">
-        <Organization ref="Organization" :defaultProps="defaultProps" :vice="true" :data="data" @getTreeData="getOrgan" @getTreeDataDuo="getTreeDataDuo" :checkedKeys="orgCheckedKeys" nodekey="OrganId" title="选择组织" />
+        <Organization ref="Organization" :defaultProps="defaultProps" :vice="true" :data="data" @getTreeData="getOrgan" @getTreeDataDuo="getTreeDataDuo" :checkedKeys="orgCheckedKeys" node-key="OrganId" up-node-key="OrganUpid" title="选择组织" />
       </div>
       <!--开启多对多-->
       <template v-if="OpenAuthData">

src/views/staffManagement/compontents/staffEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-03-30 14:49:06
+ * @LastEditTime: 2022-04-11 14:37:39
  * @LastEditors: your name
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
@@ -41,7 +41,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="r24 flex1 part">
-        <Organization ref="Organization" :defaultProps="defaultProps" :vice="true" :data="data" @getTreeData="getOrgan" @radioChange="radioChange" :checkedKeys="orgCheckedKeys" :checkedKeysDuo="checkedKeysDuo" @getTreeDataDuo="getTreeDataDuo" :orgList="orgList" nodekey="OrganId" title="选择组织" />
+        <Organization ref="Organization" :defaultProps="defaultProps" :vice="true" :data="data" @getTreeData="getOrgan" @radioChange="radioChange" :checkedKeys="orgCheckedKeys" :checkedKeysDuo="checkedKeysDuo" @getTreeDataDuo="getTreeDataDuo" :orgList="orgList" node-key="OrganId" up-node-key="OrganUpid" title="选择组织" />
       </div>
       <!--开启多对多-->
       <template v-if="OpenAuthData">

src/views/staffManagement/compontents/staffHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-03-18 10:27:34
+ * @LastEditTime: 2022-04-11 14:45:43
  * @LastEditors: your name
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
@@ -104,7 +104,6 @@ export default {
       pageNum: 1,
       PageSize: 20,
       loading: false,
-      keyWords: '',
       total: null,
       search: null,
       num: null