Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

.gitignore

@@ -6,6 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 package-lock.json
 tests/**/coverage/
+dist.zip
 
 # Editor directories and files
 .idea

src/components/rolelist/index.vue

@@ -2,17 +2,43 @@
   <div class="bf-rolelist">
     <!-- 角色列表 -->
     <div class="cont">
-      <div v-if="title" class="paren_header">
+      <div
+        v-if="title"
+        class="paren_header"
+      >
         <p>{{ title }}</p>
       </div>
       <template v-if="dataList.length">
-        <div :class="active ? 'bgActive' : 'bgActivecheckbox'" class="paren_content">
+        <div
+          :class="active ? 'bgActive' : 'bgActivecheckbox'"
+          class="paren_content"
+        >
           <template v-if="!type">
-            <el-scrollbar class="scrollBar" style="height: 100%">
-              <el-row v-infinite-scroll="load" :infinite-scroll-distance="20" infinite-scroll-disabled="disabled" class="scCont scrollbar" :gutter="16">
-                <el-checkbox-group @change="checkChange" v-model="checkList">
-                  <el-col :span="number" v-for="(item, index) in dataList" :key="index">
-                    <div @click="handleBg(item, index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
+            <el-scrollbar
+              class="scrollBar"
+              style="height: 100%"
+            >
+              <el-row
+                v-infinite-scroll="load"
+                :infinite-scroll-distance="20"
+                infinite-scroll-disabled="disabled"
+                class="scCont scrollbar"
+                :gutter="16"
+              >
+                <el-checkbox-group
+                  @change="checkChange"
+                  v-model="checkList"
+                >
+                  <el-col
+                    :span="number"
+                    v-for="(item, index) in dataList"
+                    :key="index"
+                  >
+                    <div
+                      @click="handleBg(item, index)"
+                      :class="active && msg === index ? 'bgColor' : ''"
+                      class="cide"
+                    >
                       <div class="cide_header">
                         <p :title="item.name">{{ item.name }}</p>
                         <el-checkbox :label="index"></el-checkbox>
@@ -24,19 +50,43 @@
             </el-scrollbar>
           </template>
           <template v-if="total > 1">
-            <p class="center" v-if="loading">加载中...</p>
-            <p class="center" v-if="noMore">没有更多数据了~</p>
+            <p
+              class="center"
+              v-if="loading"
+            >加载中...</p>
+            <p
+              class="center"
+              v-if="noMore"
+            >没有更多数据了~</p>
           </template>
         </div>
       </template>
       <template v-else-if="mainData.length">
-        <div :class="active ? 'bgActive' : 'bgActivecheckbox'" class="paren_content">
+        <div
+          :class="active ? 'bgActive' : 'bgActivecheckbox'"
+          class="paren_content"
+        >
           <template v-if="type">
-            <el-scrollbar class="scrollBar" style="height: 100%">
+            <el-scrollbar
+              class="scrollBar"
+              style="height: 100%"
+            >
               <el-row :gutter="16">
-                <el-radio-group style="display: block" @change="radioChange" v-model="radio">
-                  <el-col :span="number" v-for="(item, index) in mainData" :key="index">
-                    <div @click.stop="handleBg(index)" :class="active && msg === index ? 'bgColor' : ''" class="cide">
+                <el-radio-group
+                  style="display: block"
+                  @change="radioChange"
+                  v-model="radio"
+                >
+                  <el-col
+                    :span="number"
+                    v-for="(item, index) in mainData"
+                    :key="index"
+                  >
+                    <div
+                      @click.stop="handleBg(index)"
+                      :class="active && msg === index ? 'bgColor' : ''"
+                      class="cide"
+                    >
                       <div class="cide_header">
                         <p>{{ item.name }}</p>
                         <el-radio :label="index"></el-radio>
@@ -50,59 +100,75 @@
         </div>
       </template>
       <template v-else>
-        <el-empty :imageSize="imageSize" description="暂无数据"></el-empty>
+        <el-empty
+          :imageSize="imageSize"
+          description="暂无数据"
+        ></el-empty>
       </template>
     </div>
   </div>
 </template>
 <script>
-import { GetAccountList } from "@/api/Account";
-import { GetRoleByGroup } from "@/api/AccountGroup";
-import { QueryRole } from '@/api/apiAuthority';
+import { GetAccountList } from '@/api/Account'
+import { GetRoleByGroup } from '@/api/AccountGroup'
+import { QueryRole } from '@/api/apiAuthority'
 export default {
   props: {
     title: {
       type: String,
-      default: "",
+      default: ''
     },
     type: {
       type: Boolean,
-      default: false,
+      default: false
     },
     number: {
       type: Number,
-      default: 3,
+      default: 3
     },
     active: {
       type: Boolean,
-      default: false,
+      default: false
     },
     checkBoxList: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     mainData: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
     radioCheck: {
       type: Number,
-      default: 0,
+      default: 0
     },
     imageSize: {
       type: Number,
-      default: 200,
+      default: 200
     },
     roleType: {
       type: String,
-      default: "",
+      default: ''
     },
+    needType: {
+      type: String,
+      default: ''
+    },
+    queryAll: {
+      type: String,
+      default: ''
+    },
+    needId: [String, Number],
     GroupIds: {
       type: Array,
-      default: () => [],
+      default: () => []
     },
+    selectedRoleId: {
+      type: Number,
+      default: 0
+    }
   },
-  data () {
+  data() {
     return {
       radio: null,
       checkList: [],
@@ -111,258 +177,273 @@ export default {
       msg: null,
       pageSize: 100,
       pageNum: 1,
-      total: "",
+      total: '',
       loading: false,
       asyncData: [],
       msgDatas: [],
       OpenGroup: null
-    };
+    }
   },
   watch: {
     radioCheck: {
-      handler (num) {
-        this.radio = num;
+      handler(num) {
+        this.radio = num
       },
-      deep: true,
+      deep: true
     },
     roleType: {
-      handler (msg) {
-        const obj = {};
-        obj[msg] = msg;
-        this.msgDatas.push(obj);
+      handler(msg) {
+        const obj = {}
+        obj[msg] = msg
+        this.msgDatas.push(obj)
       },
-      deep: true,
+      deep: true
     },
     dataList: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length) {
-          this.asyncData.push(true);
+          this.asyncData.push(true)
         }
       },
-      deep: true,
+      deep: true
     },
     checkBoxList: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length) {
-          this.asyncData.push(true);
+          this.asyncData.push(true)
         }
       },
-      deep: true,
+      deep: true
     },
     asyncData: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length >= 2) {
-          if (this.roleType == "account") {
-            this.checkBoxs("UserId");
+          if (this.roleType == 'account') {
+            this.checkBoxs('UserId')
           }
-          if (this.roleType == "onlyRole" || this.roleType == 'roleByUpId') {
-            this.checkBoxs("RoleId");
+          if (this.roleType == 'onlyRole' || this.roleType == 'roleByUpId' || this.roleType === 'groups') {
+            this.checkBoxs('RoleId')
           }
         }
       },
       deep: true
     },
     GroupIds: {
-      handler () {
-        const obj = {};
-        obj['GroupIds'] = 'GroupIds';
-        this.msgDatas.push(obj);
+      handler() {
+        const obj = {}
+        obj['GroupIds'] = 'GroupIds'
+        this.msgDatas.push(obj)
       },
       deep: true
     },
     msgDatas: {
-      handler (arr) {
+      handler(arr) {
         if (arr && arr.length >= 2) {
-          this.getRoleDataByUpId();
+          if (this.queryAll) {
+            this.getRoleData('RoleId', 'RoleName')
+          } else {
+            this.getRoleDataByUpId()
+          }
         } else {
           if (this.roleType == 'account') {
-            this.getRoleData('UserId', 'UserName');
+            this.getRoleData('UserId', 'UserName')
           }
-          if (!this.OpenGroup) {
-            if (this.roleType == "roleByUpId") {
-              this.getRoleDataByUpId("roleId");
+          if (!this.OpenGroup || this.needType) {
+            if (this.roleType == 'roleByUpId') {
+              this.getRoleDataByUpId('roleId')
             }
-            if (this.roleType == "onlyRole") {
-              this.getRoleData('RoleId', 'RoleName');
+            if (this.roleType == 'onlyRole') {
+              this.getRoleData('RoleId', 'RoleName')
             }
           }
         }
       },
       deep: true
+    },
+    selectedRoleId: {
+      handler(val) {
+        if (val === -1) {
+          this.msg = -1
+        }
+      }
     }
   },
   computed: {
-    noMore () {
-      return this.pageNum >= this.total;
-    },
-    disabled () {
-      return this.loading || this.noMore;
+    noMore() {
+      return this.pageNum >= this.total
     },
+    disabled() {
+      return this.loading || this.noMore
+    }
   },
-  created () {
-    const obj = this.$store.state.app.systemSet;
-    const { OpenGroup } = typeof obj === 'string' ? JSON.parse(obj) : obj;
-    this.OpenGroup = OpenGroup;
+  created() {
+    const obj = this.$store.state.app.systemSet
+    const { OpenGroup } = typeof obj === 'string' ? JSON.parse(obj) : obj
+    this.OpenGroup = OpenGroup
   },
   methods: {
     // 选中
-    handleBg (item, i) {
-      this.msg = i;
-      this.$emit("checkClick", item);
+    handleBg(item, i) {
+      this.msg = i
+      this.$emit('checkClick', item)
     },
     //多选框
-    checkChange (arr) {
-      const datas = this.formatChecks(arr);
+    checkChange(arr) {
+      const datas = this.formatChecks(arr)
       // if (this.roleType == 'account') {
       //   datas = this.formatChecks(arr, 'UserId');
       // }
-      this.$emit("checkChange", datas);
+      this.$emit('checkChange', datas)
     },
     //单选框
-    radioChange (val) {
-      this.$emit("radioChange", val);
+    radioChange(val) {
+      this.$emit('radioChange', val)
     },
     //格式化选中回调
-    formatChecks (arr, key) {
-      const datas = [];
+    formatChecks(arr, key) {
+      const datas = []
       // const ids = []
       this.dataList.forEach((item, index) => {
-        arr.forEach((p) => {
+        arr.forEach(p => {
           if (index == p) {
-            datas.push(item);
+            datas.push(item)
           }
-        });
-      });
+        })
+      })
       // datas.forEach(item => {
       //   ids.push(item[key])
       // })
-      return datas;
+      return datas
     },
     //多选框默认选中
-    checkBoxs (ids) {
-      const datas = [];
-      const type = typeof this.checkBoxList[0];
+    checkBoxs(ids) {
+      const datas = []
+      const type = typeof this.checkBoxList[0]
       if (type == 'object') {
         this.dataList.forEach((item, index) => {
-          this.checkBoxList.forEach((p) => {
+          this.checkBoxList.forEach(p => {
             if (item[ids] == p[ids]) {
-              datas.push(index);
+              datas.push(index)
             }
-          });
-        });
+          })
+        })
       } else {
         this.dataList.forEach((item, index) => {
-          this.checkBoxList.forEach((p) => {
+          this.checkBoxList.forEach(p => {
             if (item[ids] == p) {
-              datas.push(index);
+              datas.push(index)
             }
-          });
-        });
+          })
+        })
       }
-      this.checkList = datas;
+      this.checkList = datas
     },
-    checkRole () {
-      const datas = [];
+    checkRole() {
+      const datas = []
       this.dataList.forEach((item, index) => {
-        this.checkBoxList.forEach((p) => {
+        this.checkBoxList.forEach(p => {
           if (item.RoleId == p.RoleId) {
-            datas.push(index);
+            datas.push(index)
           }
-        });
-      });
-      this.checkList = datas;
+        })
+      })
+      this.checkList = datas
     },
     //获取列表
-    async getRoleData (ids, names) {
+    async getRoleData(ids, names) {
       try {
-        this.loading = true;
+        this.loading = true
         const obj = {
-          QueryName: "",
+          QueryName: '',
           PageIndex: this.pageNum,
-          PageSize: this.pageSize,
-        };
-        let result = null;
-        if (this.roleType == "account") {
-          result = await GetAccountList(obj);
+          PageSize: this.pageSize
         }
-        if (this.roleType == "onlyRole") {
-          result = await QueryRole(obj);
+        let result = null
+        if (this.roleType == 'account') {
+          result = await GetAccountList(obj)
+        }
+        if (this.roleType == 'onlyRole') {
+          result = await QueryRole(obj)
         }
         if (result.code === 0) {
-          const datas = result.returnData.records;
-          const num = result.returnData.pages;
-          this.arrsList.push(datas);
-          const arrs = this.arrsList.flat();
-          const msgs = _.unionBy(arrs, ids);
+          const datas = result.returnData.records
+          const num = result.returnData.pages
+          this.arrsList.push(datas)
+          const arrs = this.arrsList.flat()
+          const msgs = _.unionBy(arrs, ids)
           msgs.forEach(item => {
             item.name = item[names]
-          });
-          this.dataList = msgs;
-          this.total = num;
-          this.$emit('roleListChange', msgs)
-
-          this.loading = false;
+          })
+          if (this.needId) {
+            const yrts = msgs.filter(item => item.RoleId != this.needId)
+            this.dataList = yrts
+          } else {
+            this.dataList = msgs
+          }
+          this.total = num
+          this.loading = false
+          this.$emit('role-list-change', msgs)
         } else {
-          this.$message.error(result.message);
-          this.loading = false;
+          this.$message.error(result.message)
+          this.loading = false
         }
       } catch (error) {
-        console.log("出错了", error);
-        this.loading = false;
+        console.log('出错了', error)
+        this.loading = false
       }
     },
 
     //获取列表2
-    async getRoleDataByUpId () {
+    async getRoleDataByUpId() {
       try {
-        this.loading = true;
+        this.loading = true
         const obj = {
           GroupIds: this.GroupIds
-        };
-        const result = await GetRoleByGroup(obj);
+        }
+        const result = await GetRoleByGroup(obj)
         if (result.code === 0) {
-          const datas = result.returnData;
-          const msgs = [];
+          const datas = result.returnData
+          const msgs = []
           if (datas.length) {
             datas.forEach(item => {
               item.name = item.RoleName
               if (item.IsSelected) {
-                msgs.push(item);
+                msgs.push(item)
               }
             })
-            this.dataList = msgs;
+            this.dataList = msgs
           } else {
-            this.dataList = msgs;
+            this.dataList = msgs
           }
-          this.$emit('roleListChange', msgs)
+          this.$emit('role-list-change', msgs)
           // this.checkBoxs(this.dataList, "RoleId");
-          this.loading = false;
+          this.loading = false
         } else {
-          this.$message.error(result.message);
-          this.loading = false;
+          this.$message.error(result.message)
+          this.loading = false
         }
       } catch (error) {
-        console.log("出错了", error);
-        this.loading = false;
+        console.log('出错了', error)
+        this.loading = false
       }
     },
 
     //滚动加载数据
-    load () {
-      this.pageNum += 1;
+    load() {
+      this.pageNum += 1
       if (this.roleType == 'account') {
-        this.getRoleData('UserId', 'UserName');
+        this.getRoleData('UserId', 'UserName')
       }
       if (this.roleType == 'onlyRole') {
-        this.getRoleData('RoleId', 'RoleName');
+        this.getRoleData('RoleId', 'RoleName')
       }
-    },
-  },
-};
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
-@import "./rolelist.scss";
+@import './rolelist.scss';
 .paren_content {
   ::v-deep .el-radio__label {
     display: none;

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -68,13 +68,16 @@
               <RoleList
                 title="角色列表"
                 :role-type="roleType"
+                :needType="needType"
+                :queryAll="queryAll"
                 :group-ids="groupIds"
                 :check-box-list="roleListCheckedList"
                 :number="8"
                 :active="true"
+                :selected-role-id="currentSelectedRoleId"
                 @checkChange="getRoleListChecked"
                 @checkClick="selectRole"
-                @roleListChange="roleListCheckedChange"
+                @role-list-change="roleListCheckedFilter"
               />
             </div>
           </el-col>
@@ -165,15 +168,18 @@ export default {
       accountGroupTreeCheckedList: [], // 岗位树初始勾选项
       accountGroupTreeCheckedTemp: [], // 岗位树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
+      roleListCheckedCopy: [],
       roleListCheckedTemp: [], // 角色列表当前勾选项
       permissionTreeChckedKeys: [], // 权限树初始勾选项
       permissionTreeChckedTemp: [], // 权限树当前勾选项
       rulesOfCompetency: null, // 当前编辑的权限规则
       queryType: '',
+      queryAll: '',
       roleType: '',
+      needType: '',
       groupIds: [],
       queryIds: [],
-      currentSelectedRoleId: 0,
+      currentSelectedRoleId: -1,
       checkedRoles: [],
       editForm: {
         name: '',
@@ -210,16 +216,17 @@ export default {
     // console.log(obj)
     const { OpenRole } = obj
     this.openRole = OpenRole
-    this.accountGroupTreeCheckedTemp = [this.GroupUpId]
+    this.accountGroupTreeCheckedTemp.push(this.GroupUpId)
     this.queryIds.push(this.GroupUpId)
-    this.doesGroupExist && (this.GroupId = Number(this.$route.query.GroupId))
+    this.doesGroupExist && (this.GroupId = parseInt(this.$route.query.GroupId))
   },
   mounted() {
-    this.groupIds.push(this.GroupUpId)
+    this.GroupUpId !== -1 && this.groupIds.push(this.GroupUpId)
     if (this.doesGroupExist) {
       this.getGroupDetails()
     } else {
       this.roleType = 'onlyRole'
+      this.needType = 'yes'
       this.queryType = 'all'
     }
     this.accountGroupTreeCheckedList = [this.GroupUpId]
@@ -241,17 +248,25 @@ export default {
           RoleList &&
             RoleList.length &&
             RoleList.forEach(role => {
-              role.IsSelected && this.roleListCheckedTemp.push(role)
+              role.IsSelected &&
+                (this.roleListCheckedTemp.push(role),
+                this.roleListCheckedCopy.push(role),
+                this.roleListCheckedList.push(role.RoleId))
             })
-
           AuthList &&
             AuthList.length &&
             AuthList.forEach(auth => {
               this.permissionTreeChckedKeys.push(auth.AuthId)
               this.permissionTreeChckedTemp.push(auth)
             })
-          this.roleType = this.GroupUpId === -1 ? 'onlyRole' : 'roleByUpId'
-          this.queryType = this.GroupUpId === -1 ? 'all' : 'group'
+          if (this.GroupUpId === -1) {
+            this.needType = 'yes'
+            this.roleType = 'onlyRole'
+            this.queryType = 'all'
+          } else {
+            this.roleType = 'roleByUpId'
+            this.queryType = 'group'
+          }
         } else {
           this.$message.error(res.message)
         }
@@ -272,33 +287,44 @@ export default {
     },
     // 获取当前权限树勾选项
     getPermissionTreeChecked(arr) {
-      // console.log(arr)
       this.permissionTreeChckedTemp = arr.map(auth => auth.AuthList)
     },
     // 获取当前勾选的岗位
     getAccountGroupChecked(arr) {
-      if (arr && arr.length === 1 && arr[0] !== -1) {
-        console.log(arr)
+      if (arr.length === 1 && arr[0] !== -1) {
+        console.log(arr[0])
         const GroupIds = arr.map(item => item.GroupId)
         this.accountGroupTreeCheckedTemp = GroupIds
-        this.roleType = 'roleByUpId'
+        this.needType = ''
+        this.queryAll = ''
+        this.roleType = 'groups'
         this.groupIds = GroupIds
         this.queryType = 'group'
         this.queryIds = GroupIds
-      } else {
+      } else if (arr.length === 0) {
         this.accountGroupTreeCheckedTemp = [-1]
-        // this.roleType = 'onlyRole'
-        this.groupIds = []
+        this.accountGroupTreeCheckedList = [-1]
+        this.queryAll = 'yes'
+        this.needType = 'yes'
+        this.roleType = 'onlyRole'
+        this.roleListCheckedList = this.roleListCheckedCopy.map(role => role.RoleId)
         this.queryType = 'all'
       }
     },
     // 角色选取
     getRoleListChecked(arr) {
       this.roleListCheckedTemp = arr
+      this.roleListCheckedCopy = arr
     },
-    roleListCheckedChange(arr) {
-      this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role => arr.some(data => data.RoleId === role.RoleId))
-      this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
+    roleListCheckedFilter(arr) {
+      this.roleListCheckedTemp = this.roleListCheckedCopy.filter(
+        role => arr.findIndex(item => item.RoleId === role.RoleId) > -1
+      )
+      this.roleListCheckedList = this.roleListCheckedCopy.map(role => role.RoleId)
+      if (arr.findIndex(item => item.RoleId === this.currentSelectedRoleId) === -1) {
+        this.checkedRoles = []
+        this.currentSelectedRoleId = -1
+      }
     },
     // 获取当前编辑的权限规则
     getRulesOfCompetency(obj) {

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-01-08 09:27:43
- * @LastEditTime: 2022-03-10 16:02:46
+ * @LastEditTime: 2022-03-10 21:34:47
  * @LastEditors: your name
  * @Description: 用户组管理
  * @FilePath: \Foshan4A2.0\src\views\accountGroupManagement\components\home.vue
@@ -455,6 +455,17 @@ export default {
         if (res.code === 0) {
           this.$message.success(res.message)
           this.currDataArr[0].Status = val
+          if (!val) {
+            this.childrenData.forEach(data => {
+              data.Status = '2'
+              data.flag = false
+            })
+          }
+          this.dataArr.forEach(data => {
+            if (data.GroupUpid === id) {
+              data.Status = '2'
+            }
+          })
         } else {
           this.$message.error(res.message)
           this.currDataArr[0].flag = !val

src/views/accountGroupManagement/minixs/treeData.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-22 17:00:22
- * @LastEditTime: 2022-03-03 16:29:07
+ * @LastEditTime: 2022-03-10 19:03:10
  * @LastEditors: your name
  * @Description: 获取权限树
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\minixs\treeData.js
@@ -14,7 +14,7 @@ export default {
     return {
       dataList: {
         GroupId: -1,
-        GroupName: "系统权限组",
+        GroupName: "岗位",
         GroupUpid: -2,
         UserCount: 0,
         AuthCount: 0,
@@ -40,7 +40,7 @@ export default {
           })
           const obj = {
             GroupId: -1,
-            GroupName: "系统权限组",
+            GroupName: "岗位",
             GroupUpid: -2,
             UserCount: 0,
             AuthCount: 0,
@@ -52,7 +52,7 @@ export default {
           this.dataArr = result.returnData;
           this.dataArr.push({
             GroupId: -1,
-            GroupName: "系统权限组",
+            GroupName: "岗位",
             GroupUpid: -2,
             UserCount: 0,
             AuthCount: 0,

src/views/authorityManagement/components/authorityRoleAdd.vue

@@ -35,7 +35,7 @@
         <Rulesofcompetency @getData="getData" title="权限规则" />
       </div>
       <div v-is="['role_add_mutually_exclusive','role_add_mutually_exclusive_list']" class="flex1 part">
-        <Rolelist v-is="['role_add_mutually_exclusive']" @checkChange="checkChange" @checkClick="checkClick" :imageSize="80" :roleType="roleType" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Rolelist v-is="['role_add_mutually_exclusive']" @checkChange="checkChange" @checkClick="checkClick" :imageSize="80" needType="1" :roleType="roleType" :active="true" class="hucRole" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
         <Permissionlist v-is="['role_add_mutually_exclusive_list']" v-loading="permission" :imageSize="80" :RoleList="RoleList" :check="true" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>
     </div>

src/views/authorityManagement/components/authorityRoleEdit.vue

@@ -43,7 +43,7 @@
         <Rulesofcompetency v-loading="loading" element-loading-text="数据加载中" :authList="authList" :authTo="authTo" title="权限规则" />
       </div>
       <div v-is="['role_edit_mutually_exclusive','role_edit_mutually_exclusive_list']" class="flex1 part">
-        <Rolelist v-is="['role_edit_mutually_exclusive']" v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
+        <Rolelist v-is="['role_edit_mutually_exclusive']" v-loading="loading" element-loading-text="数据加载中" @checkChange="checkChange" @checkClick="checkClick" :roleType="roleType" needType="1" :needId="roleId" :checkBoxList="radioCheck" :active="true" class="hucRole" :imageSize="80" :number="8" style="height: 280px; overflow: hidden" title="互斥角色" />
 
         <Permissionlist v-is="['role_edit_mutually_exclusive_list']" v-loading="permission" element-loading-text="数据加载中" :check="true" :imageSize="80" :RoleList="RoleList" class="hucPower" style="margin-top: 24px" title="互斥角色已有权限列表" />
       </div>

src/views/staffManagement/compontents/staffAdd.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-02-28 17:14:39
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-11 00:52:13
+ * @LastEditors: your name
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
 -->
@@ -503,6 +503,12 @@ export default {
   min-height: 68vh;
   .part {
     height: 750px;
+    ::v-deep .paren_content {
+      height: 85%;
+      .cont > .paren_content {
+        height: 100% !important;
+      } 
+    }
   }
 }
 </style>

src/views/staffManagement/compontents/staffEdit.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-02-28 17:15:15
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-11 00:51:19
+ * @LastEditors: your name
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
 -->
@@ -629,6 +629,12 @@ export default {
   min-height: 68vh;
   .part {
     height: 750px;
+    ::v-deep .paren_content {
+      height: 85%;
+      .cont > .paren_content {
+        height: 100% !important;
+      } 
+    }
   }
 }
 </style>

src/views/staffManagement/compontents/staffHome.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 14:37:54
- * @LastEditTime: 2022-02-28 17:13:19
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-03-11 00:19:19
+ * @LastEditors: your name
  * @Description: 角色管理
  * @FilePath: \Foshan4A2.0\src\views\authorityManagement\components\authorityRole.vue
 -->
@@ -36,11 +36,13 @@
                   <div class="time-msg flex1">所属组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
                 </div>
                 <div class="flex ip">
-                  <div style="margin-right:20px;" class="ip-msg flex1">登录名：<span :title="item.LoginName" class="glr">{{item.LoginName}}</span></div>
                   <div class="time-info flex1">职务名称：<span :title="item.JobName" class="glr">{{item.JobName ? item.JobName : '暂无'}}</span></div>
                   <!-- <div class="ip-info flex1">是否有副岗：<span class="glr">{{item.HasDepJob == 1 ? '是':'否'}}</span></div> -->
                 </div>
-                <div class="power ip">权限：<span class="glr">{{item.AuthCount}}</span></div>
+                <div class="flex ip">
+                  <div class="ip-msg flex1">登录名：<span :title="item.LoginName" class="glr">{{item.LoginName}}</span></div>
+                  <div style="margin-right:20px;" class="power">权限：<span class="glr">{{item.AuthCount}}</span></div>
+                </div>
                 <div class="flex details">
                   <div class="details-msg">
                     状态：<span :class="item.Status == 1 ? 'success' : 'error'">{{item.Status == 1 ? '启用' : '停用'}}</span>