From 4ffb0acc35d85a78959edb97ef80e23a92cefc89 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 11 三月 2023 23:59:05 +0800
Subject: [PATCH] fix 修复 超管切换租户后 点击个人中心报错
---
ruoyi-ui/src/views/register.vue | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 1797599..83cf627 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -2,6 +2,17 @@
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</h3>
+ <el-form-item prop="tenantId">
+ <el-select v-model="registerForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
+ <el-option
+ v-for="item in tenantList"
+ :key="item.tenantId"
+ :label="item.companyName"
+ :value="item.tenantId">
+ </el-option>
+ <svg-icon slot="prefix" icon-class="company" class="el-input__icon input-icon" />
+ </el-select>
+ </el-form-item>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -61,13 +72,13 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-register-footer">
- <span>Copyright 漏 2018-2022 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
<script>
-import { getCodeImg, register } from "@/api/login";
+import {getCodeImg, register, tenantList} from "@/api/login";
export default {
name: "Register",
@@ -82,14 +93,18 @@
return {
codeUrl: "",
registerForm: {
+ tenantId: "",
username: "",
password: "",
confirmPassword: "",
code: "",
uuid: "",
- user_type: "sys_user"
+ userType: "sys_user"
},
registerRules: {
+ tenantId: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
+ ],
username: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
{ min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -105,11 +120,14 @@
code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
},
loading: false,
- captchaEnabled: true
+ captchaEnabled: true,
+ // 绉熸埛鍒楄〃
+ tenantList:[]
};
},
created() {
this.getCode();
+ this.getTenantList();
},
methods: {
getCode() {
@@ -121,6 +139,14 @@
}
});
},
+ getTenantList() {
+ tenantList().then(res => {
+ this.tenantList = res.data;
+ if (this.tenantList != null && this.tenantList.length !== 0) {
+ this.loginForm.tenantId = this.tenantList[0].tenantId;
+ }
+ });
+ },
handleRegister() {
this.$refs.registerForm.validate(valid => {
if (valid) {
--
Gitblit v1.9.3