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

src/components/rolelist/index.vue

@@ -114,7 +114,8 @@ export default {
       total: "",
       loading: false,
       asyncData: [],
-      msgDatas: []
+      msgDatas: [],
+      OpenGroup: null
     };
   },
   watch: {
@@ -177,11 +178,13 @@ export default {
           if (this.roleType == 'account') {
             this.getRoleData('UserId', 'UserName');
           }
-          if (this.roleType == "roleByUpId") {
-            this.getRoleDataByUpId("roleId");
-          }
-          if (this.roleType == "onlyRole") {
-            this.getRoleData('RoleId', 'RoleName');
+          if (!this.OpenGroup) {
+            if (this.roleType == "roleByUpId") {
+              this.getRoleDataByUpId("roleId");
+            }
+            if (this.roleType == "onlyRole") {
+              this.getRoleData('RoleId', 'RoleName');
+            }
           }
         }
       },
@@ -196,6 +199,11 @@ export default {
       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;
+  },
   methods: {
     // 选中
     handleBg (item, i) {

src/views/accountGroupManagement/components/accountGroupEdit.vue

@@ -211,11 +211,11 @@ export default {
     const { OpenRole } = obj
     this.openRole = OpenRole
     this.accountGroupTreeCheckedTemp = [this.GroupUpId]
-    this.groupIds.push(this.GroupUpId)
     this.queryIds.push(this.GroupUpId)
-    this.doesGroupExist && (this.GroupId = this.$route.query.GroupId)
+    this.doesGroupExist && (this.GroupId = Number(this.$route.query.GroupId))
   },
   mounted() {
+    this.groupIds.push(this.GroupUpId)
     if (this.doesGroupExist) {
       this.getGroupDetails()
     } else {
@@ -277,7 +277,8 @@ export default {
     },
     // 获取当前勾选的岗位
     getAccountGroupChecked(arr) {
-      if (arr && arr.length && arr[0] !== -1) {
+      if (arr && arr.length === 1 && arr[0] !== -1) {
+        console.log(arr)
         const GroupIds = arr.map(item => item.GroupId)
         this.accountGroupTreeCheckedTemp = GroupIds
         this.roleType = 'roleByUpId'
@@ -286,7 +287,8 @@ export default {
         this.queryIds = GroupIds
       } else {
         this.accountGroupTreeCheckedTemp = [-1]
-        this.roleType = 'onlyRole'
+        // this.roleType = 'onlyRole'
+        this.groupIds = []
         this.queryType = 'all'
       }
     },

src/views/accountManagement/components/accountEdit.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: Badguy
  * @Date: 2022-02-15 11:37:42
- * @LastEditTime: 2022-03-02 11:09:58
+ * @LastEditTime: 2022-03-10 18:34:30
  * @LastEditors: your name
  * @Description: 编辑账号
  * have a nice day!
@@ -335,7 +335,8 @@ export default {
         this.queryIds = GroupIds
       } else {
         this.accountGroupTreeCheckedTemp = [-1]
-        this.roleType = 'onlyRole'
+        // this.roleType = 'onlyRole'
+        this.groupIds = []
         this.queryType = 'all'
       }
     },

src/views/staffManagement/compontents/staffHome.vue

@@ -33,12 +33,12 @@
                   </div>
                 </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-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="ip-info flex1">是否有副岗：<span class="glr">{{item.HasDepJob == 1 ? '是':'否'}}</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 details">
@@ -400,7 +400,7 @@ export default {
         .glr {
           color: #909399;
           display: inline-block;
-          max-width: 60px;
+          // max-width: 60px;
           overflow: hidden;
           position: relative;
           white-space: nowrap;

src/views/systemManagement/index.vue

@@ -17,8 +17,8 @@
         <div class="boxList">
           <span class="ListName">是否允许职员关联多账号</span>
           <div class="riaStyle">
-            <el-radio v-model="FormData.UserOfficerMulti" :label="1">是</el-radio>
-            <el-radio v-model="FormData.UserOfficerMulti" :label="0">否</el-radio>
+            <el-radio disabled v-model="FormData.UserOfficerMulti" :label="1">是</el-radio>
+            <el-radio disabled v-model="FormData.UserOfficerMulti" :label="0">否</el-radio>
           </div>
           <div class="lineStyle"></div>
         </div>