Merge branch 'dev' of ssh://10.10.101.21/source/sso-parent into dev3

sso-manage-console-web/src/components/accounts/enterprises/EnterpriseMembers.vue

@@ -266,6 +266,7 @@
           .catch(error)
       },
       routeToUserDetail (user) {
+        this.$store.commit(types.CHOOSE_USER, user)
         const routeLocation = {name: 'UserBasicInfo', params: user, replace: true}
         this.$router.push(routeLocation)
       }

sso-manage-console-web/src/components/accounts/users/UserBasicInfo.vue

@@ -218,6 +218,8 @@
   }
   .el-button--info {
     width: 150px;
+    background-color: #4E8EFC;
+    border-color: #4E8EFC;
   }
   .el-button--primary.is-disabled {
     background-color: #D2D2D2;

sso-manage-console-web/src/components/accounts/users/UserOfEnterprise.vue

@@ -8,10 +8,10 @@
           style="width: 100%">
           <el-table-column
             label="操作"
-            width="150">
+            width="120">
             <template slot-scope="scope">
-              <span v-if="scope.row.adminUU === enterpriseList[0].adminUU" >管理员</span>
-              <el-button type="text" size="small" v-if="scope.row.adminUU !== enterpriseList[0].adminUU"
+              <span v-if="scope.row.adminUU === userInfo.userUU" >管理员</span>
+              <el-button type="text" size="small" v-if="scope.row.adminUU !== userInfo.userUU"
                          @click="handleClick(scope.row)">解除绑定
               </el-button>
             </template>
@@ -19,7 +19,7 @@
           <el-table-column
             prop="spaceName"
             label="企业名称"
-            width="170">
+            width="140">
             <template slot-scope="scope">
               <el-button type="text" size="small" @click="routeToEnterpriseDetail(scope.row)">
                 {{ scope.row.spaceName }}
@@ -29,12 +29,12 @@
           <el-table-column
             prop="businessCode"
             label="企业营业执照号"
-            width="150">
+            width="140">
           </el-table-column>
           <el-table-column
-            prop="adminUU"
+            prop="spaceUU"
             label="企业UU号"
-            width="130">
+            width="120">
           </el-table-column>
           <el-table-column
             prop="admin.vipName"
@@ -49,12 +49,12 @@
           <el-table-column
             prop="admin.userUU"
             label="企业管理员UU号"
-            width="130">
+            width="120">
           </el-table-column>
           <el-table-column
             prop="admin.mobile"
             label="企业管理员手机号"
-            width="140">
+            width="130">
           </el-table-column>
           <el-table-column
             prop="admin.email"
@@ -190,7 +190,7 @@
     },
     computed: {
       userInfo () {
-        return this.$store.state.enterprises.savedEnterprise
+        return this.$store.state.accounts.savedUser
       }
     },
     methods: {
@@ -229,8 +229,7 @@
       unbindUser (enterprise) {
         const params = { userUU: this.userInfo.userUU }
 
-        const success = (space) => {
-          this.$store.commit(types.CHOOSE_USER, space)
+        const success = () => {
           this.fetchData()
 
           this.$message.success('保存成功')
@@ -249,7 +248,7 @@
         this.bindUserInfo = {}
       },
       searchAndSelectAdmin () {
-        const params = { userUU: this.enterpriseList[0].admin.userUU, key: this.key, keyword: this.keyword }
+        const params = { userUU: this.userInfo.userUU, key: this.key, keyword: this.keyword }
 
         const error = error => {
           console.log(error)
@@ -261,7 +260,7 @@
             if (enterpriseList && enterpriseList.length > 0) {
               this.bindUserInfo = enterpriseList[0]
             } else {
-              this.$message.info('没有找到对应非当前企业的用户信息！')
+              this.$message.info('没有找到对应非当前用户的企业信息！')
             }
           })
           .catch(error)
@@ -291,7 +290,7 @@
         this.$router.push(routeLocations)
       },
       routeToUserDetail (user) {
-        this.$store.commit(types.CHOOSE_ENTERPRISE, user)
+        this.$store.commit(types.CHOOSE_USER, user)
         const routeLocation = {name: 'UserBasicInfo', params: user, replace: true}
         this.$router.push(routeLocation)
       }