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

src/App.vue

@@ -9,7 +9,7 @@
 <template>
   <div id="app">
     <!--全局休眠弹框-->
-    <Dialog :flag="false" customClass="dormancyDialog" width="496px">
+    <Dialog :flag="dialog" customClass="dormancyDialog" width="496px">
       <div class="dormancy">
         <div class="title">系统休眠，请输入密码解锁</div>
         <div class="content">

src/components/organization/index.vue

@@ -91,7 +91,7 @@ export default {
           name: "组织",
         },
         {
-          name: "岗位",
+          name: "职务",
         }
       ],
       checkedDatas: [],

src/components/rolelist/index.vue

@@ -113,9 +113,17 @@ export default {
       pageNum: 1,
       total: "",
       loading: false,
-      asyncData: []
+      asyncData: [],
+      OpenGroup: null,
+      OpenAuthData: null
     };
   },
+  created () {
+    const obj = this.$store.state.app.systemSet;
+    const { OpenGroup, UserOfficerMulti } = typeof obj === "string" ? JSON.parse(obj) : obj; //1是请求角色 0是请求用户
+    this.OpenGroup = OpenGroup;
+    this.OpenAuthData = UserOfficerMulti;
+  },
   watch: {
     radioCheck: {
       handler (num) {
@@ -125,14 +133,16 @@ export default {
     },
     roleType: {
       handler (msg) {
-        if (msg == 'account') {
-          this.getRoleData('UserId', 'UserName');
-        }
-        if (msg == "roleByUpId") {
-          this.getRoleDataByUpId("roleId");
-        }
-        if (msg == "onlyRole") {
-          this.getRoleData('RoleId', 'RoleName');
+        if (!this.OpenGroup || this.OpenAuthData) {
+          if (msg == 'account') {
+            this.getRoleData('UserId', 'UserName');
+          }
+          if (msg == "roleByUpId") {
+            this.getRoleDataByUpId("roleId");
+          }
+          if (msg == "onlyRole") {
+            this.getRoleData('RoleId', 'RoleName');
+          }
         }
       },
       deep: true,
@@ -166,7 +176,7 @@ export default {
     },
     asyncData: {
       handler (arr) {
-        if (arr && arr.length == 2) {
+        if (arr && arr.length >= 2) {
           if (this.roleType == "account") {
             this.checkBoxs("UserId");
           }
@@ -179,7 +189,9 @@ export default {
     },
     GroupIds: {
       handler () {
-        this.getRoleDataByUpId();
+        if (this.OpenGroup || !this.OpenAuthData) {
+          this.getRoleDataByUpId();
+        }
       },
       deep: true
     }
@@ -287,7 +299,6 @@ export default {
           });
           this.dataList = msgs;
           this.total = num;
-
           this.$emit('roleListChange', msgs)
 
           this.loading = false;

src/components/usergrouptree/index.vue

@@ -120,7 +120,7 @@ export default {
       const obj = {
         AuthCount: 0,
         GroupId: -1,
-        GroupName: '系统用户组',
+        GroupName: '岗位',
         GroupUpid: 0,
         QueryTarget: 0,
         Status: 0,

src/views/organizationManagement/components/organizationHome.vue

@@ -47,19 +47,19 @@
                         <div class="flex info">
                           <div class="icon">
                             <el-tooltip v-is="['organtree_btn_add_job']" effect="dark" content="新增职务" placement="bottom">
-                              <span title="新增职务" class="cap cap-job" @click="renderJob(data)" v-if="data.OrganId != -1"></span>
+                              <span class="cap cap-job" @click="renderJob(data)" v-if="data.OrganId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_add_officer']" effect="dark" content="新增职员" placement="bottom">
-                              <span title="新增职员" v-if="data.OrganId != -1" class="cap cap-member" @click="renderMember(data)"></span>
+                              <span v-if="data.OrganId != -1" class="cap cap-member" @click="renderMember(data)"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_update_organ']" effect="dark" content="编辑组织" placement="bottom">
-                              <span title="编辑组织" class="cap cap-edit" @click="renderEdit(data)" v-if="data.OrganId != -1"></span>
+                              <span class="cap cap-edit" @click="renderEdit(data)" v-if="data.OrganId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_add_organ']" effect="dark" content="新增组织" placement="bottom">
-                              <span title="新增组织" class="cap cap-sub" @click="renderAdd(data)"></span>
+                              <span class="cap cap-sub" @click="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>
@@ -114,19 +114,19 @@
                         <div class="flex info">
                           <div class="icon">
                             <el-tooltip v-is="['organtree_btn_add_job']" effect="dark" content="新增职务" placement="bottom">
-                              <span title="新增职务" class="cap cap-job" @click.stop="renderJob(data)" v-if="data.OrganId != -1"></span>
+                              <span class="cap cap-job" @click.stop="renderJob(data)" v-if="data.OrganId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_add_officer']" effect="dark" content="新增职员" placement="bottom">
-                              <span title="新增职员" v-if="data.OrganId != -1" class="cap cap-member" @click.stop="renderMember(data)"></span>
+                              <span v-if="data.OrganId != -1" class="cap cap-member" @click.stop="renderMember(data)"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_update_organ']" effect="dark" content="编辑组织" placement="bottom">
-                              <span title="编辑组织" class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.OrganId != -1"></span>
+                              <span class="cap cap-edit" @click.stop="renderEdit(data)" v-if="data.OrganId != -1"></span>
                             </el-tooltip>
 
                             <el-tooltip v-is="['organtree_btn_add_organ']" effect="dark" content="新增组织" placement="bottom">
-                              <span title="新增组织" class="cap cap-sub" @click.stop="renderAdd(data)"></span>
+                              <span class="cap cap-sub" @click.stop="renderAdd(data)"></span>
                             </el-tooltip>
                           </div>
                         </div>

src/views/staffManagement/compontents/staffAdd.vue

@@ -54,7 +54,7 @@
         <!--有岗位 无角色-->
         <template v-if="OpenGroup && !openRole">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" 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="权限树" />
@@ -77,7 +77,7 @@
         <!--有角色 有岗位-->
         <template v-if="openRole && OpenGroup">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
+            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="岗位树" />
           </div>
           <div class="r24 flex1 part">
             <Rolelist @checkChange="checkChange" :imageSize="120" :GroupIds="GroupIds" @checkClick="checkClick" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />
@@ -256,6 +256,9 @@ export default {
     if (this.openRole && !this.OpenGroup) {
       this.roleType = 'onlyRole';
     }
+    if (this.OpenAuthData) {
+      this.roleType = 'account';
+    }
   },
   methods: {
     //获取选中的树数据

src/views/staffManagement/compontents/staffEdit.vue

@@ -54,7 +54,7 @@
         <!--有岗位 无角色-->
         <template v-if="OpenGroup && !openRole">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" 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="权限树" />
@@ -77,7 +77,7 @@
         <!--有角色 有岗位-->
         <template v-if="openRole && OpenGroup">
           <div class="r24 flex1 part">
-            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="用户组树" />
+            <Usergroup @getTreeData="getUserGroup" :checkedKeys="userGroupKeys" title="岗位树" />
           </div>
           <div class="r24 flex1 part">
             <Rolelist @checkChange="checkChange" :imageSize="120" @checkClick="checkClick" :GroupIds="GroupIds" :roleType="roleType" :checkBoxList="roleCheckBoxs" :active="true" class="hucRole" :number="8" title="角色列表" />

src/views/staffManagement/compontents/staffHome.vue

@@ -34,7 +34,7 @@
                 </div>
                 <div class="flex time">
                   <div style="margin-right:20px;" class="time-msg flex1">上级组织：<span :title="item.OrganName" class="glr">{{item.OrganName}}</span></div>
-                  <div class="time-info flex1">岗位名称：<span :title="item.JobName" class="glr">{{item.JobName}}</span></div>
+                  <div class="time-info flex1">职务名称：<span :title="item.JobName" class="glr">{{item.JobName}}</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>