调整

src/api/AccountGroup.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 账号组树查询
+// 岗位树查询
 export function GetGroupTree (params) {
   return request({
     url: '/api/fs4a/GetGroupTree/v1',
@@ -10,7 +10,7 @@ export function GetGroupTree (params) {
   })
 }
 
-//账号组新增
+//岗位新增
 export function SaveGroup (params) {
   return request({
     url: '/api/fs4a/SaveGroup/v1',
@@ -20,7 +20,7 @@ export function SaveGroup (params) {
   })
 }
 
-//账号组删除
+//岗位删除
 export function DeleteGroup (params) {
   return request({
     url: '/api/fs4a/DeleteGroup/v1',
@@ -30,7 +30,7 @@ export function DeleteGroup (params) {
   })
 }
 
-//账号组详情
+//岗位详情
 export function GetGroupDetails (params) {
   return request({
     url: '/api/fs4a/GetGroupDetails/v1',
@@ -40,7 +40,7 @@ export function GetGroupDetails (params) {
   })
 }
 
-//账号组修改状态
+//岗位修改状态
 export function ChangeGroupStatus (params) {
   return request({
     url: '/api/fs4a/ChangeGroupStatus/v1',
@@ -50,7 +50,7 @@ export function ChangeGroupStatus (params) {
   })
 }
 
-// 根据账号组获取权限树
+// 根据岗位获取权限树
 export function GetAuthTreeByGroup (params) {
   return request({
     url: '/api/fs4a/GetAuthTreeByGroup/v1',
@@ -60,7 +60,7 @@ export function GetAuthTreeByGroup (params) {
   })
 }
 
-// 修改保存账号组
+// 修改保存岗位
 export function EditGroup (params) {
   return request({
     url: '/api/fs4a/EditGroup/v1',
@@ -70,7 +70,7 @@ export function EditGroup (params) {
   })
 }
 
-//根据账号组获取角色
+//根据岗位获取角色
 export function GetRoleByGroup (params) {
   return request({
     url: '/api/fs4a/GetRoleByGroup/v1',

src/api/jobApi.js

@@ -69,3 +69,12 @@ export function GetRoleByJob (params) {
     data: params,
   })
 }
+
+//根据组织查询职员列表
+export function GetOfficerListByOrganId (params) {
+  return request({
+    url: '/api/fs4a/GetOfficerListByOrganId/v1',
+    method: 'post',
+    data: params,
+  })
+}

src/components/organization/index.vue

@@ -13,7 +13,7 @@
       <div class="paren_content">
         <div class="dptBox" v-show="active == 0">
           <el-scrollbar style="height: 100%">
-            <el-tree :data="data" :check-strictly="true" show-checkbox @node-click="nodeClick" @check-change="currentChange" :props="defaultProps" :default-checked-keys="checkedKeys" :expand-on-click-node="false" :node-key="nodekey" ref="tree" highlight-current>
+            <el-tree :data="data" :check-strictly="true" default-expand-all 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>

src/components/permissiontree/index.vue

@@ -41,7 +41,7 @@
       <div class="paren_cont">
         <el-scrollbar style="height: 100%">
           <!-- <el-tree :data="data" show-checkbox :check-strictly="true" @check-change="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="AuthId" default-expand-all ref="tree" highlight-current> -->
-          <el-tree :data="data" show-checkbox @check-change="currentChange" @node-click="handleNodeClick" :defaultProps="defaultProps" :expand-on-click-node="false" node-key="AuthId" ref="tree" highlight-current>
+          <el-tree :data="data" show-checkbox @check-change="currentChange" default-expand-all @node-click="handleNodeClick" :defaultProps="defaultProps" node-key="AuthId" ref="tree" highlight-current>
             <span class="custom-tree-node" slot-scope="{ data }">
               {{ data.AuthName }}
               <div class="logup">

src/components/usergrouptree/index.vue

@@ -13,7 +13,7 @@
     </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" :expand-on-click-node="false" node-key="GroupId" highlight-current @check-change="currentChange">
+        <el-tree ref="tree" :data="data" show-checkbox :check-strictly="true" :default-props="defaultProps" default-expand-all node-key="GroupId" highlight-current @check-change="currentChange">
           <span slot-scope="{ data }" class="custom-tree-node">
             {{ data.GroupName }}
           </span>

src/router/routes/routes-file-five.js

@@ -11,13 +11,13 @@ import Layout from '@/layout'
 const accountGroupRoutes = {
   path: '/accountGroup',
   component: Layout,
-  meta: { roles: ['group_menu'], title: '账号组管理' },
+  meta: { roles: ['group_menu'], title: '岗位管理' },
   children: [
     {
       path: '/accountGroup',
       component: () => import('@/views/accountGroupManagement/index'),
       meta: {
-        title: '账号组管理'
+        title: '岗位管理'
       },
       children: [
         {
@@ -25,7 +25,7 @@ const accountGroupRoutes = {
           name: 'accountGroupHome',
           component: () => import('@/views/accountGroupManagement/components/accountGroupHome'),
           meta: {
-            title: '账号组管理',
+            title: '岗位管理',
             roles: ['group_page']
           }
         },
@@ -34,7 +34,7 @@ const accountGroupRoutes = {
           name: 'accountGroupAdd',
           component: () => import('@/views/accountGroupManagement/components/accountGroupEdit'),
           meta: {
-            title: '新增账号组'
+            title: '新增岗位'
           }
         },
         {
@@ -42,7 +42,7 @@ const accountGroupRoutes = {
           name: 'accountGroupEdit',
           component: () => import('@/views/accountGroupManagement/components/accountGroupEdit'),
           meta: {
-            title: '编辑账号组',
+            title: '编辑岗位',
             doesGroupExist: true
           }
         }

src/router/routes/routes-file-three.js

@@ -19,13 +19,13 @@ import Layout from '@/layout'
 const organizationRoutes = {
   path: '/jobs',
   component: Layout,
-  meta: { roles: ['job_menu'], title: '岗位管理' },
+  meta: { roles: ['job_menu'], title: '职务管理' },
   children: [
     {
       path: '/jobs',
       name: 'Jobs',
       component: () => import('@/views/jobsManagement/list.vue'),
-      meta: { title: '岗位管理', roles: ['job_page'] }
+      meta: { title: '职务管理', roles: ['job_page'] }
     },
     {
       path: 'add',

src/styles/index.scss

@@ -80,6 +80,10 @@ li {
   margin-right: 0;
 }
 
+.cursor {
+  cursor: pointer;
+}
+
 // main-container global css
 .app-container {
   padding: 20px;

src/utils/validate.js

@@ -14,7 +14,7 @@
  * @param {string} path
  * @returns {Boolean}
  */
-export function isExternal(path) {
+export function isExternal (path) {
   return /^(https?:|mailto:|tel:)/.test(path)
 }
 
@@ -22,7 +22,7 @@ export function isExternal(path) {
  * @param {string} str
  * @returns {Boolean}
  */
-export function validUsername(str) {
+export function validUsername (str) {
   const valid_map = ['admin', 'editor']
   return valid_map.indexOf(str.trim()) >= 0
 }
@@ -31,13 +31,13 @@ export function validUsername(str) {
  * @param {string} str
  * @returns {Object}
  */
-export function orgTree(str) {
+export function orgTree (str) {
   const valid_map = ['admin', 'editor']
   return valid_map.indexOf(str.trim()) >= 0
 }
 
-//  账号组树构造
-export function translateDataToTreeAll(data, parentKey, parentIDKey) {
+//  岗位树构造
+export function translateDataToTreeAll (data, parentKey, parentIDKey) {
   let parent = data.filter((value) => Number(value[parentKey]) <= 0);// 父数据
   let children = data.filter((value) => Number(value[parentKey]) > 0);// 子数据
   //console.log('--parent', parent)
@@ -61,7 +61,7 @@ export function translateDataToTreeAll(data, parentKey, parentIDKey) {
   return parent;
 }
 
-export function deteleObject(obj) {
+export function deteleObject (obj) {
   var uniques = [];
   var stringify = {};
   for (var i = 0; i < obj.length; i++) {
@@ -84,20 +84,20 @@ export function deteleObject(obj) {
 }
 
 // 随机长度
-function randomNum(start, end) {
+function randomNum (start, end) {
   return Math.floor(Math.random() * (Number(end) - Number(start)) + start)
 }
 
 //字母随机
-function randomAlp(arr, count) {
-    let shuffled = arr.slice(0), i = arr.length, min = i - count, temp, index;
-    while (i-- > min) {
-        index = Math.floor((i + 1) * Math.random());
-        temp = shuffled[index];
-        shuffled[index] = shuffled[i];
-        shuffled[i] = temp;
-    }
-    return shuffled.slice(min);
+function randomAlp (arr, count) {
+  let shuffled = arr.slice(0), i = arr.length, min = i - count, temp, index;
+  while (i-- > min) {
+    index = Math.floor((i + 1) * Math.random());
+    temp = shuffled[index];
+    shuffled[index] = shuffled[i];
+    shuffled[i] = temp;
+  }
+  return shuffled.slice(min);
 }
 
 /**
@@ -107,13 +107,13 @@ function randomAlp(arr, count) {
  * @returns {Object}
  * 4位密码规则 1111 = 大写 小写 特殊字符 数字 都开启
  */
-export function pwdProduce(minLen, maxLen, struc) {
+export function pwdProduce (minLen, maxLen, struc) {
   // 密码规则转化
   const pwdStruc = typeof (struc) === 'string' ? struc.split('') : `${struc}`.split('')
   // 字母
   const alphabet = 'abcdefghijklmnopqrstuvwxyz'
   // 特殊字符
-  const special = ['~','!','@','#','$','%','^','&','*','_','+','.']
+  const special = ['~', '!', '@', '#', '$', '%', '^', '&', '*', '_', '+', '.']
   //数字
   const numbers = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"]
   // 密码随机长度
@@ -125,36 +125,36 @@ export function pwdProduce(minLen, maxLen, struc) {
   if (pwdStruc.length) {
     let typeLong = Number(pwdStruc[0]) + Number(pwdStruc[1]) + Number(pwdStruc[2]) + Number(pwdStruc[3]);
     let passLong = Math.ceil(pwdLen / typeLong);
-    let dis="";
-    if(pwdStruc[0]==1){
+    let dis = "";
+    if (pwdStruc[0] == 1) {
       let arr = alphabet.toLocaleUpperCase().split('');
-      let v = randomAlp(arr,passLong);
-      for(let i = 0 ; i < passLong ; i++){
-        dis+=v[i]
+      let v = randomAlp(arr, passLong);
+      for (let i = 0; i < passLong; i++) {
+        dis += v[i]
       }
     }
-    if(pwdStruc[1]==1){
+    if (pwdStruc[1] == 1) {
       let arr = alphabet.split('');
-      let v = randomAlp(arr,passLong);
-      for(let i = 0 ; i < passLong ; i++){
-        dis+=v[i]
+      let v = randomAlp(arr, passLong);
+      for (let i = 0; i < passLong; i++) {
+        dis += v[i]
       }
     }
-    if(pwdStruc[2]==1){
+    if (pwdStruc[2] == 1) {
       let arr = special
-      let v = randomAlp(arr,passLong);
-      for(let i = 0 ; i < passLong ; i++){
-        dis+=v[i]
+      let v = randomAlp(arr, passLong);
+      for (let i = 0; i < passLong; i++) {
+        dis += v[i]
       }
     }
-    if(pwdStruc[3]==1){
+    if (pwdStruc[3] == 1) {
       let arr = numbers
-      let v = randomAlp(arr,passLong);
-      for(let i = 0 ; i < passLong ; i++){
-        dis+=v[i]
+      let v = randomAlp(arr, passLong);
+      for (let i = 0; i < passLong; i++) {
+        dis += v[i]
       }
     }
-   return dis
+    return dis
     //缓存当前的密码规则
     // pwdStruc.forEach((item, index) => {
     //   if (item == 1) {

src/views/accountGroupManagement/components/accountGroupAdd copy.vue

@@ -2,33 +2,18 @@
   <div class="bf-postmanagementadd">
     <div class="postmanagementadd_header">
       <div class="postmanagementadd_top">
-        <p>新增账号组</p>
+        <p>新增岗位</p>
         <div class="btn">
           <el-button @click="saveAuth" type="primary">保存</el-button>
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
-        <el-form
-          :inline="true"
-          ref="addFrom"
-          :rules="rules"
-          class="form"
-          :model="addFrom"
-        >
-          <el-form-item prop="name" label="账号组名称">
-            <el-input
-              maxlength="16"
-              placeholder="账号组名称"
-              v-model="addFrom.name"
-            ></el-input>
+        <el-form :inline="true" ref="addFrom" :rules="rules" class="form" :model="addFrom">
+          <el-form-item prop="name" label="岗位名称">
+            <el-input maxlength="16" placeholder="岗位名称" v-model="addFrom.name"></el-input>
           </el-form-item>
           <el-form-item label="描述" style="margin-left: 40px">
-            <el-input
-              maxlength="200"
-              style="width: 640px"
-              placeholder="请输入描述"
-              v-model="addFrom.textarea2"
-            ></el-input>
+            <el-input maxlength="200" style="width: 640px" placeholder="请输入描述" v-model="addFrom.textarea2"></el-input>
           </el-form-item>
         </el-form>
       </div>
@@ -38,38 +23,17 @@
       <el-row :gutter="24" v-if="this.openRole != 0">
         <el-col :span="8">
           <div class="part">
-            <Organization
-              title="上级账号组"
-              :data="dataObj"
-              :checkedKeys="[GroupId]"
-              :defaultProps="defaultProps"
-              nodekey="GroupId"
-              @getTreeData="getTreeData"
-            />
+            <Organization title="上级岗位" :data="dataObj" :checkedKeys="[GroupId]" :defaultProps="defaultProps" nodekey="GroupId" @getTreeData="getTreeData" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <rolelist
-              title="角色列表"
-              @checkChange="checkChange"
-              @radioChanges="radioChanges"
-              :dataList="roleList"
-              :roleType="roleType"
-              :GroupIds="GroupIds"
-              :number="8"
-            />
+            <rolelist title="角色列表" @checkChange="checkChange" @radioChanges="radioChanges" :dataList="roleList" :roleType="roleType" :GroupIds="GroupIds" :number="8" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <permissionlist
-              title="权限列表"
-              :RoleList="powerList"
-              :check="true"
-              class="hucPower"
-              @Competen="Competen"
-            />
+            <permissionlist title="权限列表" :RoleList="powerList" :check="true" class="hucPower" @Competen="Competen" />
           </div>
         </el-col>
       </el-row>
@@ -77,24 +41,12 @@
       <el-row :gutter="24" v-else>
         <el-col :span="8">
           <div class="part">
-            <Organization
-              title="上级账号组"
-              :data="dataObj"
-              :defaultProps="defaultProps"
-              :nodekey="'GroupId'"
-              @getTreeData="getTreeData"
-            />
+            <Organization title="上级岗位" :data="dataObj" :defaultProps="defaultProps" :nodekey="'GroupId'" @getTreeData="getTreeData" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="part">
-            <Permissiontree
-              @nodeClick="nodeClick"
-              @getTreeData="getTreeDatas"
-              :queryType="queryType"
-              :queryId="queryId"
-              title="权限树"
-            />
+            <Permissiontree @nodeClick="nodeClick" @getTreeData="getTreeDatas" :queryType="queryType" :queryId="queryId" title="权限树" />
           </div>
         </el-col>
         <el-col :span="8">
@@ -136,15 +88,15 @@ export default {
     rolelist,
     permissionlist,
   },
-  data() {
+  data () {
     return {
-      roleType:"",
+      roleType: "",
       checkedAuthList: [],
       GroupId: this.$route.query.GroupId,
       butPreser: "保存",
       openRole: 0,
       OpenGroup: 0,
-      data: [], //账号组
+      data: [], //岗位
       TacList: [], //登录策略
       AuthList: [], //授权信息
       roleList: [], //角色
@@ -158,7 +110,7 @@ export default {
       rules: {
         //表单验证
         name: [
-          { required: true, message: "请输入账号组名称", trigger: "blur" },
+          { required: true, message: "请输入岗位名称", trigger: "blur" },
         ],
       },
       defaultProps: {
@@ -171,13 +123,13 @@ export default {
       queryId: "",
       queryType: "group",
       objID: "",
-      GroupIds:[],
+      GroupIds: [],
     };
   },
   computed: {
     ...mapGetters(["systemSet"]),
   },
-  created() {
+  created () {
     const { GroupId } = this.$route.query;
     this.AppId = GroupId;
     this.UpId = GroupId;
@@ -194,7 +146,7 @@ export default {
     this.OpenGroup = OpenGroup;
     if (OpenRole) {
       this.title = "角色";
-      this.GroupIds=[GroupId];
+      this.GroupIds = [GroupId];
 
     }
     if (this.UpId == -1) {
@@ -204,7 +156,7 @@ export default {
   },
   watch: {
     dataList: {
-      handler(val) {
+      handler (val) {
         const arr = [val];
         if (arr.length) {
           this.decompose(arr, this.UpId);
@@ -220,7 +172,7 @@ export default {
   },
   methods: {
     //获取选中的树数据
-    getTreeData(arr) {
+    getTreeData (arr) {
       this.checkTrees = arr;
       this.checkTrees.forEach((item) => {
         if (item[0]) {
@@ -237,10 +189,10 @@ export default {
       }
     },
     //获取权限规则
-    getData(obj) {
+    getData (obj) {
       this.rulesObj = obj;
     },
-    async radioChanges(data) {
+    async radioChanges (data) {
       try {
         let params = {
           RoleId: data,
@@ -256,17 +208,17 @@ export default {
       }
     },
     //权限树点击
-    nodeClick(obj) {
+    nodeClick (obj) {
       const arr = this.$store.getters.authArrs;
       arr.push(obj);
       this.$store.dispatch("auth/changeAuthArrs", arr);
     },
     //获取权限树回调
-    getTreeDatas(arr) {
+    getTreeDatas (arr) {
       this.checkedAuthList = arr;
     },
     //获取指定数据
-    decompose(data, id) {
+    decompose (data, id) {
       for (let i = 0; i < data.length; i++) {
         if (data[i].GroupId == id) {
           this.dataObj = data[i];
@@ -278,7 +230,7 @@ export default {
       }
     },
     //角色列表
-    async queryRole() {
+    async queryRole () {
       try {
         const res = await getUserOne({
           GroupId: this.objID,
@@ -302,7 +254,7 @@ export default {
       }
     },
     //所有角色列表
-    async RoleBox() {
+    async RoleBox () {
       try {
         const res = await QueryRole({
           QueryName: "",
@@ -320,11 +272,11 @@ export default {
         console.log("出错了", error);
       }
     },
-    Competen(data) {
+    Competen (data) {
       this.$emit("Competen", data);
     },
     //角色选取
-    checkChange(arr) {
+    checkChange (arr) {
       let datas = [];
       const arrs = [];
       datas = arr;
@@ -338,7 +290,7 @@ export default {
       });
       this.checkRoles = arrs;
     },
-    async saveAuth() {
+    async saveAuth () {
       this.checkedAuthList.forEach((item) => {
         this.treeData1.push(item.AuthList);
       });
@@ -370,7 +322,7 @@ export default {
       }
     },
   },
-  mounted(){
+  mounted () {
     this.roleType = "roleByUpId"
   }
 };

src/views/accountGroupManagement/components/accountGroupAdd.vue

@@ -10,15 +10,15 @@
   <div class="accountGroup">
     <div class="addApp-form">
       <div class="addApp-form-title flex">
-        <div class="title">新增账号组</div>
+        <div class="title">新增岗位</div>
         <div v-is="['group_btn_save']" class="btn">
           <el-button @click="saveBtn('form')" type="primary">保存</el-button>
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
         <el-form :inline="true" ref="form" :rules="rules" class="form" :model="form">
-          <el-form-item prop="name" label="账号组名称">
-            <el-input placeholder="请输入账号组名称" maxlength="32" v-model="form.name"></el-input>
+          <el-form-item prop="name" label="岗位名称">
+            <el-input placeholder="请输入岗位名称" maxlength="32" v-model="form.name"></el-input>
           </el-form-item>
           <el-form-item label="描述">
             <el-input style="width: 640px" maxlength="200" placeholder="请输入描述" v-model="form.app"></el-input>
@@ -28,7 +28,7 @@
     </div>
     <div class="power-content flex-wrap">
       <div class="r24 flex1 part">
-        <Organization :defaultProps="defaultProps" :data="data" nodekey="GroupId" :checkedKeys="checkedKeys" title="上级账号组" />
+        <Organization :defaultProps="defaultProps" :data="data" nodekey="GroupId" :checkedKeys="checkedKeys" title="上级岗位" />
       </div>
       <!--有角色-->
       <template v-if="OpenRole">
@@ -75,13 +75,13 @@ export default {
   data () {
     return {
       form: {
-        //账号组表单
+        //岗位表单
         name: '',
         app: ''
       },
       rules: {
         //表单验证
-        name: [{ required: true, message: '请输入账号组名称', trigger: 'blur' }]
+        name: [{ required: true, message: '请输入岗位名称', trigger: 'blur' }]
       },
       OpenRole: null,
       AppId: null,
@@ -97,7 +97,7 @@ export default {
       rulesObj: {}, //权限规则
       checkTrees: [], //权限树选中
       GroupIds: [], //角色列表
-      checkedKeys: [], //账号组选中
+      checkedKeys: [], //岗位选中
       RoleList: [] //权限列表
     }
   },

src/views/accountGroupManagement/components/accountGroupEdit copy.vue

@@ -2,15 +2,15 @@
   <div class="bf-postmanagementadd">
     <div class="postmanagementadd_header">
       <div class="postmanagementadd_top">
-        <div class="tltleLeft">编辑账号组</div>
+        <div class="tltleLeft">编辑岗位</div>
         <div class="btn" style="margin-top: 20px">
           <el-button @click="editAuth" type="primary">保存</el-button>
         </div>
       </div>
       <div class="addApp-form-content dialog-public-background">
         <el-form :inline="true" ref="addFrom" :rules="rules" class="form" :model="addFrom">
-          <el-form-item prop="name" label="账号组名称">
-            <el-input maxlength="16" placeholder="账号组名称" v-model="addFrom.name"></el-input>
+          <el-form-item prop="name" label="岗位名称">
+            <el-input maxlength="16" placeholder="岗位名称" v-model="addFrom.name"></el-input>
           </el-form-item>
           <el-form-item label="描述" style="margin-left: 40px">
             <el-input style="width: 640px" placeholder="请输入描述" maxlength="200" v-model="addFrom.textarea2"></el-input>
@@ -23,7 +23,7 @@
       <el-row :gutter="24" v-if="this.openRole != 0">
         <el-col :span="8">
           <div class="part">
-            <Organization title="所属账号组" :data="data" :defaultProps="defaultProps" :checkedKeys="[GroupUpid]" :nodekey="'GroupId'" :checkedIdList="checkedIdList" @getTreeData="getTreeData" :type="true" />
+            <Organization title="所属岗位" :data="data" :defaultProps="defaultProps" :checkedKeys="[GroupUpid]" :nodekey="'GroupId'" :checkedIdList="checkedIdList" @getTreeData="getTreeData" :type="true" />
           </div>
         </el-col>
         <el-col :span="8">
@@ -41,7 +41,7 @@
       <el-row :gutter="24" v-else>
         <el-col :span="8">
           <div class="part">
-            <Organization title="所属账号组" :data="dataObj" :defaultProps="defaultProps" :nodekey="'GroupId'" :checkedKeys="[GroupUpid]" :checkedIdList="checkedIdList" @getTreeData="getTreeData" />
+            <Organization title="所属岗位" :data="dataObj" :defaultProps="defaultProps" :nodekey="'GroupId'" :checkedKeys="[GroupUpid]" :checkedIdList="checkedIdList" @getTreeData="getTreeData" />
           </div>
         </el-col>
         <el-col :span="8">
@@ -114,7 +114,7 @@ export default {
       OpenGroup: 0,
       checkRole: [],
       powerT: [],
-      data: [], //上级账号组
+      data: [], //上级岗位
       checkedIdList: [],
       checkTrees: [], //上级权限选中的树数据
       powerTree: [], //选中的权限树数据
@@ -130,7 +130,7 @@ export default {
       rules: {
         //表单验证
         name: [
-          { required: true, message: "请输入账号组名称", trigger: "blur" },
+          { required: true, message: "请输入岗位名称", trigger: "blur" },
         ],
       },
       defaultProps: {
@@ -230,7 +230,7 @@ export default {
         }
       }
     },
-    //账号组详情
+    //岗位详情
     async getDeaitls () {
       try {
         const res = await GetGroupDetails({
@@ -316,7 +316,7 @@ export default {
         console.log("出错了", error);
       }
     },
-    //删除账号组
+    //删除岗位
     // async deleteAuth() {
     //   this.dialogVisible = true;
     // },
@@ -356,7 +356,7 @@ export default {
     Competen (data) {
       this.$emit("Competen", data);
     },
-    //账号组修改保存
+    //岗位修改保存
     async editAuth () {
       this.checkedAuthList.forEach((item) => {
         this.treeData1.push(item.AuthList);

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -9,8 +9,8 @@
       </div>
       <div class="addApp-form-content dialog-public-background">
         <el-form ref="editForm" :inline="true" :rules="rules" class="form" :model="editForm">
-          <el-form-item prop="name" label="账号组名称">
-            <el-input v-model="editForm.name" maxlength="32" placeholder="账号组名称" />
+          <el-form-item prop="name" label="岗位名称">
+            <el-input v-model="editForm.name" maxlength="32" placeholder="岗位名称" />
           </el-form-item>
           <el-form-item label="描述" style="margin-left: 40px">
             <el-input v-model="editForm.desc" style="width: 640px" placeholder="请输入描述" maxlength="200" />
@@ -22,7 +22,7 @@
       <el-row :gutter="24">
         <el-col :span="8">
           <div class="part">
-            <AccountGroupTree title="上级账号组" nodekey="GroupId" :check-disabled="doesGroupExist" :type="true" :defaultProps="defaultProps" :checkedKeys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
+            <AccountGroupTree title="上级岗位" nodekey="GroupId" :check-disabled="doesGroupExist" :type="true" :defaultProps="defaultProps" :checkedKeys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <!-- 开启角色 -->
@@ -96,13 +96,13 @@ export default {
   // mixins: [treeData],
   data () {
     return {
-      doesGroupExist: this.$route.meta.doesGroupExist, // 控制账号组新增/编辑
+      doesGroupExist: this.$route.meta.doesGroupExist, // 控制岗位新增/编辑
       GroupId: 0,
       GroupUpId: parseInt(this.$route.query.GroupUpId),
       // dialogVisible: false,
       openRole: 0,
-      accountGroupTreeCheckedList: [], // 账号组树初始勾选项
-      accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
+      accountGroupTreeCheckedList: [], // 岗位树初始勾选项
+      accountGroupTreeCheckedTemp: [], // 岗位树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
       permissionTreeChckedKeys: [], // 权限树初始勾选项
@@ -122,7 +122,7 @@ export default {
       rules: {
         // 表单验证
         name: [
-          { required: true, message: '请输入账号组名称', trigger: 'blur' },
+          { required: true, message: '请输入岗位名称', trigger: 'blur' },
           { min: 1, max: 32, message: '长度在 1到 32 个字符', trigger: 'blur' }
         ]
       },
@@ -135,7 +135,7 @@ export default {
   computed: {
     ...mapGetters(['systemSet']),
     pageTitle () {
-      return this.doesGroupExist ? '编辑账号组' : '新增账号组'
+      return this.doesGroupExist ? '编辑岗位' : '新增岗位'
     }
   },
   created () {
@@ -164,7 +164,7 @@ export default {
     this.accountGroupTreeCheckedList = [this.GroupUpId]
   },
   methods: {
-    // 账号组详情
+    // 岗位详情
     async getGroupDetails () {
       try {
         const res = await GetGroupDetails({
@@ -214,7 +214,7 @@ export default {
       // console.log(arr)
       this.permissionTreeChckedTemp = arr.map(auth => auth.AuthList)
     },
-    // 获取当前勾选的账号组
+    // 获取当前勾选的岗位
     getAccountGroupChecked (arr) {
       if (arr && arr.length && arr[0] !== -1) {
         const GroupIds = arr.map(item => item.GroupId)
@@ -259,7 +259,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    // 删除账号组
+    // 删除岗位
     // async deleteAuth() {
     //   this.dialogVisible = true;
     // },
@@ -284,7 +284,7 @@ export default {
     Competen (data) {
       console.log(data)
     },
-    // 账号组编辑保存
+    // 岗位编辑保存
     async handleSaveEdit () {
       const params = {
         AuthList: this.permissionTreeChckedTemp,

src/views/accountGroupManagement/components/accountGroupHome.vue

@@ -19,7 +19,7 @@
       <el-row :gutter="24" class="bodyContent">
         <el-col :span="6" class="bodyPart">
           <div class="grid-content">
-            <div class="title">账号组树</div>
+            <div class="title">岗位树</div>
             <div class="contentTree">
               <el-tree ref="tree" :data="dataListTree" :props="defaultProps" node-key="GroupId" :filter-node-method="filterNode" highlight-current :default-expanded-keys="[currentKey]" @node-click="handleNodeClick">
               </el-tree>
@@ -28,7 +28,7 @@
         </el-col>
         <el-col :span="18" class="bodyPart">
           <div class="grid-contentTop">
-            <div class="title" style="margin-bottom: 15px">当前账号组</div>
+            <div class="title" style="margin-bottom: 15px">当前岗位</div>
             <div class="content">
               <el-empty :image-size="100" style="padding: 0" v-if="currDataArr.length < 1"></el-empty>
               <el-row>
@@ -41,12 +41,12 @@
                       <el-col :span="12">
                         <div class="flex info">
                           <div class="icon">
-                            <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" content="编辑账号组" placement="bottom">
-                              <span title="编辑账号组" class="cap cap-edit" @click="renderEdit(data)" v-if="data.GroupId != -1"></span>
+                            <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" content="编辑岗位" placement="bottom">
+                              <span title="编辑岗位" class="cap cap-edit" @click="renderEdit(data)" v-if="data.GroupId != -1"></span>
                             </el-tooltip>
 
-                            <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" content="新增账号组" placement="bottom">
-                              <span title="新增账号组" class="cap cap-sub" @click="renderAdd(data)"></span>
+                            <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" content="新增岗位" placement="bottom">
+                              <span title="新增岗位" class="cap cap-sub" @click="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>
@@ -82,7 +82,7 @@
             </div>
           </div>
           <div class="grid-contentBottom">
-            <div class="title">下级账号组</div>
+            <div class="title">下级岗位</div>
             <div class="content">
               <el-empty :image-size="150" v-if="childrenData.length < 1"></el-empty>
               <el-row :gutter="24">
@@ -126,12 +126,12 @@
                               ></span
                             ></el-tooltip> -->
 
-                            <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" content="编辑账号组" placement="bottom">
-                              <span title="编辑账号组" class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.GroupId != -1"></span>
+                            <el-tooltip v-is="['grouptree_btn_update_group']" effect="dark" content="编辑岗位" placement="bottom">
+                              <span title="编辑岗位" class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.GroupId != -1"></span>
                             </el-tooltip>
 
-                            <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" content="新增账号组" placement="bottom">
-                              <span title="新增账号组" class="cap cap-sub" @click.stop="renderAdd(data)"></span>
+                            <el-tooltip v-is="['grouptree_btn_add_group']" effect="dark" content="新增岗位" placement="bottom">
+                              <span title="新增岗位" class="cap cap-sub" @click.stop="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>

src/views/accountGroupManagement/minixs/roleData.js

@@ -14,7 +14,7 @@ export default {
     }
   },
   methods: {
-    // 根据账号组获取角色
+    // 根据岗位获取角色
     async getRoleByGroup (id) {
       try {
         const res = await GetRoleByGroup({

src/views/accountManagement/components/accountEdit.vue

@@ -27,68 +27,28 @@
         </div> -->
         <div v-is="['userupdate_btn_save']">
           <!-- <button type="submmit" class="btn-delete" @click="delate">删除</button> -->
-          <button
-            type="submmit"
-            class="btn-save"
-            @click="handleClickSave('accountForm')"
-          >保存</button>
+          <button type="submmit" class="btn-save" @click="handleClickSave('accountForm')">保存</button>
         </div>
       </div>
       <div class="title-content">
-        <el-form
-          ref="accountForm"
-          label-width="80px"
-          :inline="true"
-          :model="accountForm"
-          :rules="formRules"
-        >
+        <el-form ref="accountForm" label-width="80px" :inline="true" :model="accountForm" :rules="formRules">
           <el-row :gutter="40">
             <el-col :span="5">
-              <el-form-item
-                label="账号名称"
-                prop="name"
-              >
-                <el-input
-                  v-model="accountForm.name"
-                  maxlength="32"
-                  placeholder="请输入名称"
-                  size="small"
-                />
+              <el-form-item label="账号名称" prop="name">
+                <el-input v-model="accountForm.name" maxlength="32" placeholder="请输入名称" size="small" />
               </el-form-item>
             </el-col>
             <el-col :span="5">
-              <el-form-item
-                label="登录密码"
-                prop="pwd"
-              >
-                <el-input
-                  v-model="accountForm.pwd"
-                  placeholder="*******"
-                  size="small"
-                  disabled
-                />
+              <el-form-item label="登录密码" prop="pwd">
+                <el-input v-model="accountForm.pwd" placeholder="*******" size="small" disabled />
               </el-form-item>
             </el-col>
-            <el-col
-              v-is="['userupdate_btn_re_pwd']"
-              :span="2"
-            >
-              <button
-                class="btn-reset-pwd"
-                @click="resetPwd"
-              >重置密码</button>
+            <el-col v-is="['userupdate_btn_re_pwd']" :span="2">
+              <button class="btn-reset-pwd" @click="resetPwd">重置密码</button>
             </el-col>
             <el-col :span="8">
-              <el-form-item
-                label="描述"
-                prop="desc"
-              >
-                <el-input
-                  v-model="accountForm.desc"
-                  maxlength="128"
-                  placeholder="描述内容···"
-                  size="small"
-                />
+              <el-form-item label="描述" prop="desc">
+                <el-input v-model="accountForm.desc" maxlength="128" placeholder="描述内容···" size="small" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -98,189 +58,80 @@
 
     <div class="content">
       <!-- 用户组和角色未开启 -->
-      <el-row
-        v-if="!openGroup && !openRole"
-        :gutter="24"
-      >
+      <el-row v-if="!openGroup && !openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card content-card-lg">
-            <PermissionTree
-              title="权限树"
-              :query-type="queryType"
-              :checked-keys="permissionTreeChckedKeys"
-              @getTreeData="getPermissionTreeChecked"
-            />
+            <PermissionTree title="权限树" :query-type="queryType" :checked-keys="permissionTreeChckedKeys" @getTreeData="getPermissionTreeChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card content-card-lg">
-            <RulesOfCompetency
-              title="权限规则"
-              margin-b="20px"
-              @getData="getRulesOfCompetency"
-            />
+            <RulesOfCompetency title="权限规则" margin-b="20px" @getData="getRulesOfCompetency" />
           </div>
         </el-col>
-        <el-col
-          v-is="['account_edit_login_setting']"
-          :span="8"
-        >
+        <el-col v-is="['account_edit_login_setting']" :span="8">
           <div class="content-card content-card-lg">
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 角色和用户组都开启 -->
-      <el-row
-        v-if="openGroup && openRole"
-        :gutter="24"
-      >
+      <el-row v-if="openGroup && openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card content-card-xl">
-            <AccountGroupTree
-              title="所属账号组"
-              nodekey="GroupId"
-              :default-props="accountGroupTreeProps"
-              :checked-keys="accountGroupTreeCheckedList"
-              @getTreeData="getAccountGroupChecked"
-            />
+            <AccountGroupTree title="所属岗位" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
-        <el-col
-          v-is="['account_edit_role_list']"
-          :span="8"
-        >
+        <el-col v-is="['account_edit_role_list']" :span="8">
           <div class="content-card content-card-xl">
-            <RoleList
-              title="角色列表"
-              :role-type="roleType"
-              :group-ids="groupIds"
-              :check-box-list="roleListCheckedList"
-              :number="8"
-              :active="true"
-              @checkChange="getRoleListChecked"
-              @checkClick="selectRole"
-              @roleListChange="roleListCheckedChange"
-            />
+            <RoleList title="角色列表" :role-type="roleType" :group-ids="groupIds" :check-box-list="roleListCheckedList" :number="8" :active="true" @checkChange="getRoleListChecked" @checkClick="selectRole" @roleListChange="roleListCheckedChange" />
           </div>
         </el-col>
-        <el-col
-          v-is="['account_edit_auth_list']"
-          :span="8"
-        >
+        <el-col v-is="['account_edit_auth_list']" :span="8">
           <div class="content-card content-card-sm">
-            <PermissionList
-              title="权限列表"
-              class="permission-list"
-              :role-list="checkedRoles"
-              :check="true"
-              @Competen="Competen"
-            />
+            <PermissionList title="权限列表" class="permission-list" :role-list="checkedRoles" :check="true" @Competen="Competen" />
           </div>
-          <div
-            v-is="['account_edit_login_setting']"
-            class="content-card content-card-xs"
-          >
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+          <div v-is="['account_edit_login_setting']" class="content-card content-card-xs">
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 只开启用户组 -->
-      <el-row
-        v-if="openGroup && !openRole"
-        :gutter="24"
-      >
+      <el-row v-if="openGroup && !openRole" :gutter="24">
         <el-col :span="8">
           <div class="content-card content-card-xxl">
-            <AccountGroupTree
-              title="所属账号组"
-              nodekey="GroupId"
-              :default-props="accountGroupTreeProps"
-              :checked-keys="accountGroupTreeCheckedList"
-              @getTreeData="getAccountGroupChecked"
-            />
+            <AccountGroupTree title="所属岗位" nodekey="GroupId" :default-props="accountGroupTreeProps" :checked-keys="accountGroupTreeCheckedList" @getTreeData="getAccountGroupChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card content-card-xxl">
-            <PermissionTree
-              title="权限树"
-              :query-type="queryType"
-              :query-ids="queryIds"
-              :checked-keys="permissionTreeChckedKeys"
-              @getTreeData="getPermissionTreeChecked"
-            />
+            <PermissionTree title="权限树" :query-type="queryType" :query-ids="queryIds" :checked-keys="permissionTreeChckedKeys" @getTreeData="getPermissionTreeChecked" />
           </div>
         </el-col>
         <el-col :span="8">
           <div class="content-card content-card-md">
-            <RulesOfCompetency
-              title="权限规则"
-              margin-b="20px"
-              @getData="getRulesOfCompetency"
-            />
+            <RulesOfCompetency title="权限规则" margin-b="20px" @getData="getRulesOfCompetency" />
           </div>
-          <div
-            v-is="['account_edit_login_setting']"
-            class="content-card content-card-xs"
-          >
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+          <div v-is="['account_edit_login_setting']" class="content-card content-card-xs">
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
       <!-- 只开启角色 -->
-      <el-row
-        v-if="!openGroup && openRole"
-        :gutter="24"
-      >
-        <el-col
-          v-is="['account_edit_role_list']"
-          :span="8"
-        >
+      <el-row v-if="!openGroup && openRole" :gutter="24">
+        <el-col v-is="['account_edit_role_list']" :span="8">
           <div class="content-card content-card-lg">
-            <RoleList
-              title="角色列表"
-              :role-type="roleType"
-              :check-box-list="roleListCheckedList"
-              :number="8"
-              :active="true"
-              @checkChange="getRoleListChecked"
-              @checkClick="selectRole"
-            />
+            <RoleList title="角色列表" :role-type="roleType" :check-box-list="roleListCheckedList" :number="8" :active="true" @checkChange="getRoleListChecked" @checkClick="selectRole" />
           </div>
         </el-col>
-        <el-col
-          v-is="['account_edit_auth_list']"
-          :span="8"
-        >
+        <el-col v-is="['account_edit_auth_list']" :span="8">
           <div class="content-card content-card-lg">
-            <PermissionList
-              title="权限列表"
-              :role-list="checkedRoles"
-              :check="true"
-              class="permission-list"
-              @Competen="Competen"
-            />
+            <PermissionList title="权限列表" :role-list="checkedRoles" :check="true" class="permission-list" @Competen="Competen" />
           </div>
         </el-col>
-        <el-col
-          v-is="['account_edit_login_setting']"
-          :span="8"
-        >
+        <el-col v-is="['account_edit_login_setting']" :span="8">
           <div class="content-card content-card-lg">
-            <LoginPolicy
-              :checked-list="loginPolicyCheckedList"
-              @getCheckedList="getLoginPolicyChecked"
-            />
+            <LoginPolicy :checked-list="loginPolicyCheckedList" @getCheckedList="getLoginPolicyChecked" />
           </div>
         </el-col>
       </el-row>
@@ -326,7 +177,7 @@ export default {
     PermissionList
     // Dialog
   },
-  data() {
+  data () {
     return {
       doesAccountExist: this.$route.meta.doesAccountExist, // 控制账号新增/编辑
       userId: '',
@@ -340,8 +191,8 @@ export default {
       rulesOfCompetency: null, // 当前编辑的权限规则
       loginPolicyCheckedList: [], // 登录策略初始勾选项
       loginPolicyCheckedTemp: [], // 登录策略当前勾选项
-      accountGroupTreeCheckedList: [], // 账号组树初始勾选项
-      accountGroupTreeCheckedTemp: [], // 账号组树当前勾选项
+      accountGroupTreeCheckedList: [], // 岗位树初始勾选项
+      accountGroupTreeCheckedTemp: [], // 岗位树当前勾选项
       roleListCheckedList: [], // 角色列表初始勾选项
       roleListCheckedTemp: [], // 角色列表当前勾选项
       roleType: '',
@@ -372,11 +223,11 @@ export default {
   },
   computed: {
     ...mapGetters(['systemSet']),
-    pageTitle() {
+    pageTitle () {
       return this.doesAccountExist ? '编辑账号' : '新增账号'
     }
   },
-  created() {
+  created () {
     // 获取系统配置
     let obj
     if (typeof this.systemSet === 'string') {
@@ -392,7 +243,7 @@ export default {
     this.pwdLengthBegin = PwdLengthBegin
     this.pwdLengthEnd = PwdLengthEnd
   },
-  mounted() {
+  mounted () {
     if (this.doesAccountExist) {
       this.userId = this.$route.query.userId
       this.getAccountInfo()
@@ -404,7 +255,7 @@ export default {
   },
   methods: {
     // 获取当前账号信息
-    async getAccountInfo() {
+    async getAccountInfo () {
       try {
         const res = await getAccountDetails({
           UserId: this.userId
@@ -458,23 +309,23 @@ export default {
       }
     },
     // 随机生成密码
-    resetPwd() {
+    resetPwd () {
       this.accountForm.pwd = pwdProduce(this.pwdLengthBegin, this.pwdLengthEnd, this.pwdStruc)
     },
     // 获取当前权限树勾选项
-    getPermissionTreeChecked(arr) {
+    getPermissionTreeChecked (arr) {
       this.permissionTreeChckedTemp = arr.map(auth => auth.AuthList)
     },
     // 获取当前编辑的权限规则
-    getRulesOfCompetency(obj) {
+    getRulesOfCompetency (obj) {
       this.rulesOfCompetency = obj
     },
     // 获取当前勾选的登录策略
-    getLoginPolicyChecked(arr) {
+    getLoginPolicyChecked (arr) {
       this.loginPolicyCheckedTemp = arr
     },
-    // 获取当前勾选的账号组
-    getAccountGroupChecked(arr) {
+    // 获取当前勾选的岗位
+    getAccountGroupChecked (arr) {
       if (arr && arr.length && arr[0] !== -1) {
         const GroupIds = arr.map(item => item.GroupId)
         this.accountGroupTreeCheckedTemp = GroupIds
@@ -489,15 +340,15 @@ export default {
       }
     },
     // 获取当前勾选的角色列表
-    getRoleListChecked(arr) {
+    getRoleListChecked (arr) {
       this.roleListCheckedTemp = arr
     },
-    roleListCheckedChange(arr) {
+    roleListCheckedChange (arr) {
       this.roleListCheckedTemp = this.roleListCheckedTemp.filter(role => arr.some(data => data.RoleId === role.RoleId))
       this.roleListCheckedList = this.roleListCheckedTemp.map(role => role.RoleId)
     },
     // 点击角色后显示对应权限列表
-    async selectRole(data) {
+    async selectRole (data) {
       if (this.currentSelectedRoleId === data.RoleId) return
       try {
         const params = {
@@ -515,11 +366,11 @@ export default {
       }
     },
     // 修改权限规则
-    Competen(data) {
+    Competen (data) {
       console.log(data)
     },
     // 账号编辑保存
-    handleClickSave(formName) {
+    handleClickSave (formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.handleSaveEdit()
@@ -529,7 +380,7 @@ export default {
         }
       })
     },
-    handleSaveEdit() {
+    handleSaveEdit () {
       const params = {
         AuthList: this.permissionTreeChckedTemp,
         GroupList: this.accountGroupTreeCheckedTemp.map(groupId => ({ GroupId: groupId })),
@@ -550,7 +401,7 @@ export default {
       }
     },
     // 编辑账号
-    async saveEditAccount(params) {
+    async saveEditAccount (params) {
       try {
         const res = await editAccount(params)
         if (res.code === 0) {
@@ -567,7 +418,7 @@ export default {
       }
     },
     // 新增账号
-    async saveAddAccount(params) {
+    async saveAddAccount (params) {
       try {
         const res = await addAccount(params)
         if (res.code === 0) {

src/views/authorityManagement/components/authorityPowerAdd.vue

@@ -51,7 +51,7 @@
           <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
-      <!--有账号组-->
+      <!--有岗位-->
       <template v-else-if="OpenGroup">
         <div class="r24 flex1 part">
           <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />

src/views/authorityManagement/components/authorityPowerEdit.vue

@@ -51,7 +51,7 @@
           <Rolelist @checkChange="checkChange" :roleType="roleType" :checkBoxList="checkBoxList" :number="8" title="角色" />
         </div>
       </template>
-      <!--有账号组-->
+      <!--有岗位-->
       <template v-else-if="OpenGroup">
         <div class="r24 flex1 part">
           <Rulesofcompetency @getData="getData" :authTo="authTo" title="权限规则" />

src/views/dashboard/components/analysis.vue

@@ -160,7 +160,7 @@ export default {
             hoverAnimation: false,
             data: [
               { value: 0, name: '账号数' },
-              { value: 0, name: '账号组数' },
+              { value: 0, name: '岗位数' },
             ]
           },
           {

src/views/dashboard/index.vue

@@ -75,7 +75,7 @@ export default {
         },
         {
           id: 2,
-          name: "账号组管理",
+          name: "岗位管理",
           value: 2,
         },
         {

src/views/jobsManagement/list.vue

@@ -75,6 +75,7 @@
 import Search from "@/layout/components/Search";
 import Dialog from "@/layout/components/Dialog";
 import { GetJobList, ChangeJobStatus, DeleteJob } from "@/api/jobApi";
+import { organgitpost } from "@/api/postInterface";
 export default {
   data () {
     return {
@@ -99,19 +100,28 @@ export default {
       total: '',
       loading: false,
       dataList: [],
-      index: null
+      index: null,
+      OrganId: null,
+      orgType: null
     };
   },
   components: { Search, Dialog },
   created () {
-    if (this.$route.query.keyWords) {
-      this.serachinfo = this.$route.query.keyWords;
+    const { OrganId, orgType, keyWords } = this.$route.query;
+    if (OrganId && orgType == 'org') {
+      this.OrganId = OrganId;
+      this.orgType = orgType;
+      this.getJobListByOrgan(OrganId);
+    } else {
+      if (keyWords) {
+        this.serachinfo = keyWords;
+      }
+      this.AccountList({
+        QueryName: this.serachinfo,
+        PageSize: this.pageSize,
+        PageIndex: this.pageNum
+      });
     }
-    this.AccountList({
-      QueryName: this.serachinfo,
-      PageSize: this.pageSize,
-      PageIndex: this.pageNum
-    });
   },
   computed: {
     noMore () {
@@ -122,6 +132,30 @@ export default {
     }
   },
   methods: {
+    //根据组织查询岗位
+    async getJobListByOrgan (OrganId) {
+      try {
+        const result = await organgitpost({
+          OrganId: OrganId
+        });
+        if (result.code === 0) {
+          const datas = result.returnData;
+          datas.forEach((element, index) => {
+            if (element.Status == 1) {
+              element["Flag"] = true;
+            } else {
+              element["Flag"] = false;
+            }
+            datas[index] = element;
+          });
+          this.listData = datas;
+        } else {
+          this.$message.error(result.message);
+        }
+      } catch (error) {
+        console.log("出错了", error);
+      }
+    },
     //查询
     getSearchData (val) {
       this.listData = [];
@@ -203,7 +237,7 @@ export default {
     async AccountList (obj) {
       try {
         this.loading = true;
-        const result = await GetJobList(obj);
+        let result = await GetJobList(obj);
         if (result.code === 0) {
           const datas = result.returnData.records;
           datas.forEach((element, index) => {

src/views/login/index.vue

@@ -179,6 +179,7 @@ export default {
               this.loading = false;
             })
             .catch(() => {
+              this.getCheckCode();
               this.loading = false;
             });
         } else {

src/views/organizationManagement/components/organizationAdd.vue

@@ -174,7 +174,7 @@ export default {
     checkClick (item) {
       this.roleAuths(item.RoleId);
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId);
     },

src/views/organizationManagement/components/organizationEdit.vue

@@ -137,8 +137,8 @@ export default {
       handler (val) {
         const arr = [val];
         this.data = arr;
-        this.decompose(arr, this.OrganUpid);
-        this.data = [this.dataObj];
+        // this.decompose(arr, this.OrganUpid);
+        // this.data = [this.dataObj];
         this.checkedKeys = [this.OrganUpid];
       },
       deep: true,
@@ -207,7 +207,7 @@ export default {
     checkClick (item) {
       this.roleAuths(item.RoleId);
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId);
     },

src/views/organizationManagement/components/organizationHome.vue

@@ -65,12 +65,16 @@
                         </div>
                       </el-col>
                       <el-col :span="8" v-if="data.OrganId != -1">
-                        <span class="msg">岗位：</span>
-                        <span>{{ data.JobCount }}</span>
+                        <span @click="toJob(data)" class="cursor">
+                          <span class="msg">职务：</span>
+                          <span>{{ data.JobCount }}</span>
+                        </span>
                       </el-col>
                       <el-col :span="8" v-if="data.OrganId != -1">
-                        <span class="msg">职员：</span>
-                        <span>{{ data.OfficerCount }}</span>
+                        <span @click="toOfficer(data)" class="cursor">
+                          <span class="msg">职员：</span>
+                          <span>{{ data.OfficerCount }}</span>
+                        </span>
                       </el-col>
                       <!-- <el-col :span="8" v-if="data.OrganId != -1">
                         <span class="msg">权限：</span>
@@ -128,12 +132,16 @@
                         </div>
                       </el-col>
                       <el-col :span="8" v-if="data.OrganId != -1">
-                        <span class="msg">岗位：</span>
-                        <span>{{ data.JobCount }}</span>
+                        <span @click="toJob(data)" class="cursor">
+                          <span class="msg">职务：</span>
+                          <span>{{ data.JobCount }}</span>
+                        </span>
                       </el-col>
                       <el-col :span="8" v-if="data.OrganId != -1">
-                        <span class="msg">职员：</span>
-                        <span>{{ data.OfficerCount }}</span>
+                        <span @click="toOfficer(data)" class="cursor">
+                          <span class="msg">职员：</span>
+                          <span>{{ data.OfficerCount }}</span>
+                        </span>
                       </el-col>
                       <!-- <el-col :span="8" v-if="data.OrganId != -1">
                         <span class="msg">权限：</span>
@@ -395,6 +403,20 @@ export default {
       this.$refs.tree.setCurrentKey(dataNew.OrganId);
       this.currentKey = dataNew.OrganId;
     },
+    //岗位点击
+    toJob (data) {
+      this.$router.push({
+        path: "/jobs",
+        query: { OrganUpid: data.OrganUpid, OrganId: data.OrganId, orgType: 'org' },
+      });
+    },
+    //职员点击
+    toOfficer (data) {
+      this.$router.push({
+        path: "/staff",
+        query: { OrganUpid: data.OrganUpid, OrganId: data.OrganId, orgType: 'org' },
+      });
+    }
   },
 };
 </script>

src/views/organizationManagement/minixs/roleData.js

@@ -47,7 +47,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根据组织获取账号组
+    //根据组织获取岗位
     async getGroupByOrgan (id) {
       try {
         let params = {
@@ -67,7 +67,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根组织获取账号组
+    //根组织获取岗位
     async getGroupTree (name = '') {
       try {
         let params = {
@@ -87,7 +87,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根据账号组查询权限列表
+    //根据岗位查询权限列表
     async groupAuths (id) {
       try {
         let params = {

src/views/organizationManagement/minixs/treeData.js

@@ -10,7 +10,7 @@ import { translateDataToTreeAll } from '@/utils/validate'
 import { tissueTreeList } from '@/api/postInterface'
 
 export default {
-  data() {
+  data () {
     return {
       dataList: {
         AuthCount: 0,
@@ -26,11 +26,11 @@ export default {
       dataArr: []
     }
   },
-  created() {
+  created () {
     // this.getOrganTree()
   },
   methods: {
-    async getOrganTree(name = '') {
+    async getOrganTree (name = '') {
       try {
         const result = await tissueTreeList({
           "QueryName": name
@@ -48,6 +48,7 @@ export default {
             OrganUpid: -2,
             QueryTarget: "0",
             Type: 0,
+            disabled: true,
             children: translateDataToTreeAll(result.returnData, 'OrganUpid', 'OrganId')
           }
           this.dataList = obj
@@ -61,6 +62,7 @@ export default {
             OrganUpid: -2,
             QueryTarget: "0",
             Type: 0,
+            disabled: true,
           }
           )
         } else {
@@ -73,6 +75,7 @@ export default {
             OrganUpid: -2,
             QueryTarget: "0",
             Type: 0,
+            disabled: true,
             children: []
           }
           this.dataList = obj
@@ -85,6 +88,7 @@ export default {
             OrganUpid: -2,
             QueryTarget: "0",
             Type: 0,
+            disabled: true,
           }
           )
         }

src/views/staffManagement/compontents/staffAdd.vue

@@ -48,7 +48,7 @@
       </template>
       <!--未开启多对多-->
       <template v-else>
-        <!--有账号组 无角色-->
+        <!--有岗位 无角色-->
         <template v-if="OpenGroup && !openRole">
           <div class="r24 flex1 part">
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
@@ -61,7 +61,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 512px)" :imageSize="20" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--有角色 无账号组-->
+        <!--有角色 无岗位-->
         <template v-if="openRole && !OpenGroup">
           <div class="r24 flex1 part">
             <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
@@ -71,7 +71,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 376px)" :imageSize="120" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--有角色 有账号组-->
+        <!--有角色 有岗位-->
         <template v-if="openRole && OpenGroup">
           <div class="r24 flex1 part">
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
@@ -84,7 +84,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 376px)" :imageSize="120" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--无账号组 无角色-->
+        <!--无岗位 无角色-->
         <template v-if="!OpenGroup && !openRole">
           <div class="r24 flex1 part">
             <Permissiontree ref="Permissiontree" :queryType="queryType" :queryId="treeId" :checkedKeys="checkedBoxs" :isMainJob="isMainJob" @nodeClick="nodeClick" @getTreeData="getTreeData" title="权限树" />
@@ -318,7 +318,7 @@ export default {
       })
       this.GroupIds = datas;
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId)
     },

src/views/staffManagement/compontents/staffEdit copy.vue

@@ -404,7 +404,7 @@ export default {
         this.groupCheckBoxs = datas;
       }
     },
-    //根据岗位获取账号组
+    //根据岗位获取岗位
     async getNewGroupByJob (id) {
       console.log(this.mainCheckData)
       try {
@@ -623,7 +623,7 @@ export default {
     checkClick (item) {
       this.roleAuths(item.RoleId);
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId)
     },

src/views/staffManagement/compontents/staffEdit.vue

@@ -48,7 +48,7 @@
       </template>
       <!--未开启多对多-->
       <template v-else>
-        <!--有账号组 无角色-->
+        <!--有岗位 无角色-->
         <template v-if="OpenGroup && !openRole">
           <div class="r24 flex1 part">
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
@@ -61,7 +61,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 512px)" :imageSize="20" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--有角色 无账号组-->
+        <!--有角色 无岗位-->
         <template v-if="openRole && !OpenGroup">
           <div class="r24 flex1 part">
             <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
@@ -71,7 +71,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 376px)" :imageSize="120" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--有角色 有账号组-->
+        <!--有角色 有岗位-->
         <template v-if="openRole && OpenGroup">
           <div class="r24 flex1 part">
             <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
@@ -84,7 +84,7 @@
             <Loginpolicy style="margin-top: 24px; height: calc(100% - 24px - 376px)" :imageSize="120" :checkedList="checkedList" @getCheckedList="getCheckedList" title="登录策略" />
           </div>
         </template>
-        <!--无账号组 无角色-->
+        <!--无岗位 无角色-->
         <template v-if="!OpenGroup && !openRole">
           <div class="r24 flex1 part">
             <Permissiontree ref="Permissiontree" :queryType="queryType" :queryId="treeId" :checkedKeys="checkedBoxs" :isMainJob="isMainJob" @nodeClick="nodeClick" @getTreeData="getTreeData" title="权限树" />
@@ -440,7 +440,7 @@ export default {
       })
       this.GroupIds = datas;
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId)
     },

src/views/staffManagement/compontents/staffEdit_copy.vue

@@ -608,7 +608,7 @@ export default {
     checkClick (item) {
       this.roleAuths(item.RoleId);
     },
-    //账号组点击回调
+    //岗位点击回调
     checkGroup (item) {
       this.groupAuths(item.GroupId)
     },

src/views/staffManagement/compontents/staffHome.vue

@@ -82,6 +82,7 @@ import Search from '@/layout/components/Search'
 import Dialog from '@/layout/components/Dialog'
 import roleData from '../minixs/roleData'
 import { staffStart } from '@/api/postInterface'
+import { GetOfficerListByOrganId } from '@/api/jobApi'
 export default {
   name: 'AuthorityRole',
   components: { Search, Dialog },
@@ -104,14 +105,21 @@ export default {
     }
   },
   created () {
-    if (this.$route.query.keyWords) {
-      this.keyWords = this.$route.query.keyWords;
+    const { OrganId, orgType, keyWords } = this.$route.query;
+    if (OrganId && orgType == 'org') {
+      this.OrganId = OrganId;
+      this.orgType = orgType;
+      this.getJobListByOrgan(OrganId);
+    } else {
+      if (keyWords) {
+        this.keyWords = keyWords;
+      }
+      this.gueryRole({
+        QueryName: this.keyWords,
+        PageSize: this.PageSize,
+        PageIndex: this.pageNum
+      });
     }
-    this.gueryRole({
-      QueryName: this.keyWords,
-      PageSize: this.PageSize,
-      PageIndex: this.pageNum
-    });
   },
   computed: {
     noMore () {
@@ -122,6 +130,22 @@ export default {
     }
   },
   methods: {
+    //根据组织查询职员
+    async getJobListByOrgan (OrganId) {
+      try {
+        const res = await GetOfficerListByOrganId({
+          OrganId: OrganId
+        });
+        if (res.code === 0) {
+          const datas = res.returnData
+          this.arrs = datas
+        } else {
+          this.$message.error(res.message)
+        }
+      } catch (error) {
+        console.log('出错了', error)
+      }
+    },
     //删除
     checkRemove (item, num) {
       this.flag = true

src/views/staffManagement/minixs/treeData.js

@@ -102,7 +102,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根据组织获取账号组
+    //根据组织获取岗位
     async getGroupByOrgan (id) {
       try {
         let params = {
@@ -122,7 +122,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根据岗位获取账号组
+    //根据岗位获取岗位
     async getGroupByJob (id, index) {
       try {
         let params = {
@@ -157,7 +157,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根组织获取账号组
+    //根组织获取岗位
     async getGroupTree (name = '') {
       try {
         let params = {
@@ -177,7 +177,7 @@ export default {
         console.log('出错了', error)
       }
     },
-    //根据账号组查询权限列表
+    //根据岗位查询权限列表
     async groupAuths (id) {
       try {
         let params = {

src/views/systemManagement/index.vue

@@ -7,7 +7,7 @@
           <el-button v-is="['system_btn_save']" v-show="isShow" @click="save()">保存</el-button>
         </div>
         <div class="boxList">
-          <span class="ListName">是否开启账号组</span>
+          <span class="ListName">是否开启岗位</span>
           <div class="riaStyle">
             <el-radio v-model="FormData.OpenGroup" :label="1">是</el-radio>
             <el-radio v-model="FormData.OpenGroup" :label="0">否</el-radio>