职员修改

src/components/rolelist/index.vue

@@ -21,7 +21,7 @@
               </el-checkbox-group>
             </el-row>
           </template>
-          <template v-if="roleType && roleType == 'account'">
+          <template v-if="roleType && (roleType == 'account' || roleType == 'onlyRole')">
             <p class="center" v-if="loading">加载中...</p>
             <p class="center" v-if="noMore">没有更多数据了~</p>
           </template>
@@ -54,7 +54,7 @@
 <script>
 import { GetAccountList } from "@/api/Account";
 import { GetRoleByGroup } from "@/api/AccountGroup";
-
+import { QueryRole } from '@/api/apiAuthority';
 export default {
   props: {
     title: {
@@ -122,13 +122,23 @@ export default {
         if (msg == "roleByUpId") {
           this.getRoleDataByUpId("roleId");
         }
+        if (msg == "onlyRole") {
+          this.getRoleData('RoleId', 'RoleName');
+        }
       },
       deep: true,
     },
     dataList: {
       handler (arr) {
+        console.log(arr, this.checkBoxList)
         if (this.roleType == "account") {
-          this.checkBoxs(arr, "UserId");
+          this.checkBoxs(arr, this.checkBoxList, "UserId");
+        }
+        if (this.roleType == "role") {
+          this.checkRole(arr);
+        }
+        if (this.roleType == "onlyRole") {
+          this.checkRole(arr);
         }
       },
       deep: true,
@@ -146,6 +156,8 @@ export default {
           });
           this.checkList = datas;
         }
+        // console.log(this.dataList)
+        // this.checkBoxs(this.dataList, arr, "RoleId");
       },
       deep: true,
     },
@@ -199,10 +211,10 @@ export default {
       return datas;
     },
     //多选框默认选中
-    checkBoxs (arr, ids) {
+    checkBoxs (arr, msgs, ids) {
       const datas = [];
       arr.forEach((item, index) => {
-        this.checkBoxList.forEach((p) => {
+        msgs.forEach((p) => {
           if (item[ids] == p) {
             datas.push(index);
           }
@@ -210,6 +222,17 @@ export default {
       });
       this.checkList = datas;
     },
+    checkRole (arr) {
+      const datas = [];
+      arr.forEach((item, index) => {
+        this.checkBoxList.forEach((p) => {
+          if (item.RoleId == p.RoleId) {
+            datas.push(index);
+          }
+        });
+      });
+      this.checkList = datas;
+    },
     //获取列表
     async getRoleData (ids, names) {
       try {
@@ -223,6 +246,9 @@ export default {
         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;
@@ -277,6 +303,9 @@ export default {
       if (this.roleType == 'account') {
         this.getRoleData('UserId', 'UserName');
       }
+      if (this.roleType == 'onlyRole') {
+        this.getRoleData('RoleId', 'RoleName');
+      }
     },
   },
 };

src/views/staffManagement/compontents/staffEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-02-10 14:49:20
- * @LastEditTime: 2022-02-11 17:07:56
+ * @LastEditTime: 2022-02-14 11:14:55
  * @LastEditors: Please set LastEditors
  * @Description: 编辑职员
  * @FilePath: \Foshan4A4.0\src\views\staffManagement\compontents\staffEdit.vue
@@ -51,7 +51,7 @@
         <!--有账号组 无角色-->
         <template v-if="OpenGroup && !openRole">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" title="用户组树" />
+            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
           </div>
           <div class="r24 flex1 part">
             <Permissiontree ref="Permissiontree" :queryType="queryType" :queryId="treeId" :checkedKeys="checkedBoxs" :isMainJob="isMainJob" @nodeClick="nodeClick" @getTreeData="getTreeData" title="权限树" />
@@ -64,7 +64,7 @@
         <!--有角色 无账号组-->
         <template v-if="openRole && !OpenGroup">
           <div class="r24 flex1 part">
-            <Rolelist @checkChange="checkChange" @checkClick="checkClick" :checkBoxList="roleCheckBoxs" :dataList="arrs" :active="true" class="hucRole" :number="8" title="角色列表" />
+            <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
           </div>
           <div class="flex1 part">
             <Permissionlist style="height: 376px" :imageSize="120" :RoleList="RoleList" :check="true" class="hucPower" title="权限列表" />
@@ -74,7 +74,7 @@
         <!--有角色 有账号组-->
         <template v-if="openRole && OpenGroup">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" title="用户组树" />
+            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
           </div>
           <div class="r24 flex1 part">
             <Rolelist @checkChange="checkChange" :GroupIds="GroupIds" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
@@ -198,6 +198,7 @@ export default {
       onCheckedArr: [],//当前显示选中权限组
       alljobArr: [],//全部岗位
       GroupIds: [], //当前选中的用户组
+      userGroupKeys: [] //当前回调选中的用户组
     };
   },
   computed: {
@@ -285,6 +286,9 @@ export default {
           if (this.OpenAuthData) {
             this.roleType = 'account';
           }
+          if (this.openRole && !this.OpenGroup && !this.OpenAuthData) {
+            this.roleType = 'onlyRole';
+          }
           if (AuthList && AuthList.length) {
             AuthList.forEach((item) => {
               this.authId.push(item.AuthId);
@@ -294,30 +298,19 @@ export default {
             this.checkedBoxs = this.authId;
           }
           if (RoleList && RoleList.length) {
-            const [checkRoles, checkBoxs] = [[], []];
-            RoleList.forEach((item, index) => {
-              if (item.IsSelected == 1) {
-                checkRoles.push(item);
-                checkBoxs.push(index);
-              }
-            });
-            if (checkRoles.length && checkBoxs.length) {
-              this.checkRoles = checkRoles;
-              this.roleAuths(RoleList[0].RoleId);
+            this.roleCheckBoxs = RoleList;
+            this.checkRoles = RoleList;
+            if (this.openRole && this.OpenGroup) {
+              this.roleType = 'role';
             }
           }
           if (GroupList && GroupList.length) {
-            const [checkRoles, checkBoxs] = [[], []];
-            GroupList.forEach((item, index) => {
-              if (item.IsSelected == 1) {
-                checkRoles.push(item);
-                checkBoxs.push(index);
-              }
-            });
-            if (checkRoles.length && checkBoxs.length) {
-              this.checkRoles = checkRoles;
-              this.groupAuths(GroupList[0].GroupId);
-            }
+            const datas = [];
+            GroupList.forEach(item => {
+              datas.push(item.GroupId);
+            })
+            this.userGroupKeys = datas;
+            this.GroupIds = datas;
           }
           if (UserList && UserList.length) {
             const datas = [];
@@ -513,21 +506,24 @@ export default {
         const datas = [];
         const checks = [];
         const GroupIds = [];
-        this.checkTrees.forEach((item) => {
-          datas.push(item.AuthList);
-        });
-        this.GroupIds.forEach(item => {
-          const obj = {
-            GroupId: item
-          }
-          GroupIds.push(obj);
-        });
-        this.checkRoles.forEach(item => {
-          item.IsSelected = 1;
-          checks.push(item);
-        });
-        if (this.OpenGroup && !this.openRole) {
-          this.checkRoles = this.onCheckedArr;
+        if (this.checkTrees.length) {
+          this.checkTrees.forEach((item) => {
+            datas.push(item.AuthList);
+          });
+        }
+        if (this.GroupIds.length) {
+          this.GroupIds.forEach(item => {
+            const obj = {
+              GroupId: item
+            }
+            GroupIds.push(obj);
+          });
+        }
+        if (this.checkRoles.length) {
+          this.checkRoles.forEach(item => {
+            item.IsSelected = 1;
+            checks.push(item);
+          });
         }
         const res = await newstaffmod({
           OfficerName: this.form.name,
@@ -538,7 +534,7 @@ export default {
           AuthList: this.openRole ? [] : datas,
           TacList: this.loginCheckBoxs,
           DepJobList: this.lessChecksData,
-          GroupList: this.OpenGroup || (this.openRole && this.OpenGroup) ? GroupIds : [],
+          GroupList: GroupIds.length ? GroupIds : [],
           JobId: this.JobId,
           Status: Number(this.Status),
           OrganId: this.AppId,