src/views/login/index.vue

@@ -510,18 +510,6 @@ export default {
         this.loginByRole(this.$store.state.user.roles[0].Id)
         return
       }
-      if (
-        Array.isArray(this.$store.state.user.roles) &&
-        this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
-          .length ===
-          this.$store.state.user.roles.length - 1
-      ) {
-        let role = this.$store.state.user.roles.find(
-          (item) => !item.IsUserRoleDisabled
-        )
-        this.loginByRole(role.Id)
-        return
-      }
       return (this.toggleRoleVisible = true)
     },
     cancel() {

src/views/system/user/components/UserInfo.vue

@@ -73,8 +73,7 @@
       </el-form-item>
       <el-form-item
         :label="$t('system:userlist:table:UserType')"
-        prop="Roles"
+        prop="UserTypeId"
-        v-if="type === 0"
       >
         <div style="display: flex; align-items: center">
           <el-select
@@ -86,6 +85,7 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
+            v-if="type === 0"
           >
             <template v-for="userType of userTypeOptions">
               <el-option
@@ -96,14 +96,6 @@
               />
             </template>
           </el-select>
-        </div>
-      </el-form-item>
-      <el-form-item
-        :label="$t('system:userlist:table:UserType')"
-        prop="userTypeId"
-        v-else
-      >
-        <div style="display: flex; align-items: center">
           <el-select
             ref="userType"
             v-model="Roles"
@@ -113,6 +105,7 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
+            v-else
           >
             <template v-for="userType of userTypeOptions">
               <el-option

src/views/trials/trials-myinfo/account.vue

@@ -119,7 +119,7 @@
               v-for="item in roles"
               :key="item.Id"
               :label="item.Id"
-              :disabled="item.IsUserRoleDisabled"
+              :disabled="item.isUserRoleDisabled"
               style="margin-bottom: 10px"
             >
               {{ item.UserTypeShortName }}
@@ -210,7 +210,6 @@ export default {
   },
   computed: {
     roles() {
-      console.log(this.$store.state.user.roles, 'this.$store.state.user.roles')
       return this.$store.state.user.roles
     },
     hasRole() {