优化

src/api/branch.js

@@ -29,5 +29,10 @@ export const editBranch = params => { return axios.post(`${base}/mdp/sys/branch/
 export const addBranchNoAuth = params => { return axios.post(`${base}/mdp/sys/branch/addBranchNoAuth`, params); };
 
 
+//新增一条管理端机构表（机构下面若干部门）
+export const calcBranchUsers = params => { return axios.get(`${base}/mdp/sys/branch/calcBranchUsers`, params); };
+
+
+
 //新增一条企业入驻审核流程
 export const addUserJoinBranchRequire = params => { return axios.post(`${base}/mdp/sys/userJoinBranchRequire/add`, params); };

src/views/layout/components/UserInfo.vue

@@ -32,25 +32,27 @@
                             </span>
                         </div>    
                         <div class="topBox_num">
-                            <span>账号数量（1 / 25）个</span>    
+                            <span @click="calcBranchUsers">账号数量（ {{branchUsersCount.currUsers }} / {{branchUsersCount.maxUsers}} ）个 <i class="el-icon-refresh-right"></i></span>    
                         </div>                    
                     </div>
                 </div>
 
                 <div class="middleBox">
-                    <p class="middleBox_username">用户名称：<b>{{userInfo.username}}</b> </p>
+                    <p class="middleBox_username">用户名称：<b>{{userInfo.username}}</b> </p> 
                     <div class="middleBox_role">
-                        <span>我的岗位：</span>
-                        <span class="middleBox_role_name" v-for="post in myPosts" :key="post.postName">
-                            <a> {{role.postName}} , </a>
+                        <span>我的角色：</span>
+                        <span class="middleBox_role_name">
+                            <a> {{getMyRoleNames()}} </a>
                         </span>
                     </div>
                 </div>
 
                 <div class="bottomBox2">
-                    <p @click="switchUser">切换账户</p>
-                    <p>团队管理</p>
-                    <p @click="logout">退出登录</p>
+                    <!--<p class="el-icon-menu" @click="handleCommand('myWork')">我的工作台</p> -->
+                    <p class="el-icon-user" @click="switchUser">切换账户</p> 
+                    <p class="el-icon-edit" @click="handleCommand('updateUserInfo')">账户明细</p>
+                    <p class="el-icon-user-solid">团队管理</p>
+                    <p @click="logout" class="el-icon-switch-button">退出登录</p>
                 </div>
 
             </div> 
@@ -102,6 +104,8 @@ import { mapGetters } from 'vuex'
 import dayjs from 'dayjs'
 
 import {  queryMyUsers,switchUser } from '@/api/login';
+
+import {  calcBranchUsers } from '@/api/branch';
 import BranchAdd from "@/views/mdp/sys/branch/BranchEdit";
 
 export default {
@@ -110,6 +114,10 @@ export default {
             branchAddVisible:false,
             phonenoUsers:[],
             phonenoUsersVisible:false,
+            branchUsersCount:{
+                currUsers:1,
+                maxUsers:100
+            }
 
         }
     },
@@ -133,7 +141,15 @@ export default {
     },
     
     methods: {
-        
+        calcBranchUsers(){
+            calcBranchUsers().then(res=>this.branchUsersCount=res.data.data)
+        },
+        getMyRoleNames(){
+            if(this.roles && this.roles.length>0){
+                var myRoles=this.roles.filter(i=>i.roleid.indexOf('SCOPE')<0);
+                return myRoles.map(i=>i.rolename).join(",")
+            }
+        },
         switchUser(){   
             queryMyUsers().then(res0=>{  
                 if(res0.data.tips.isOk){
@@ -150,13 +166,20 @@ export default {
         },
         handleCommand(command){
             if(command=='updateUserInfo'){
-                this.$router.push({path:'/updateUserInfo'})
+                this.$router.push({path:'/my/work/updateUserInfo'})
+            }
+            if(command=='myWork'){
+                this.$router.push({path:'/my/work/index'})
             }
         },  
         upgradeToBranchAccount(){
             //跳转到购买模块页面
             this.branchAddVisible=true;
         },
+        
+        afterAddSubmit(){
+
+        },
         toLogin(user) {
                 this.$prompt('请输入密码', '提示', {
                 confirmButtonText: '确定',
@@ -200,7 +223,7 @@ export default {
         BranchAdd
     },
     mounted() {
-
+        this.calcBranchUsers();
     }
 }
 </script>
@@ -281,6 +304,7 @@ export default {
             }
             .topBox_num {
                 font-size: 14px;
+                cursor: pointer;
             }
         }
     }

src/views/login/components/login.vue

@@ -267,10 +267,12 @@ export default {
                     loginParams.branchId=params.branchId
                 }
                 this.$store.dispatch("LoginByUserloginid",loginParams).then(res => {
+                    debugger;
                     this.loading = false 
                     if(res.data.tips.isOk==true){
                         this.loading = true;
                         this.$store.dispatch('GetUserInfo').then((res2)=>{ 
+                            debugger;
                             this.loading = false
                             if(res2.data.tips.isOk==true){ 
                                 this.userDeptid=res2.data.userInfo.deptid