From 183af841175d7ceacc987b50ab6c2f80f6972df7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 08 三月 2023 20:09:21 +0800
Subject: [PATCH] fix 修复 用户注册页面与登录页面格式不符问题
---
ruoyi-ui/src/views/register.vue | 32 ++++++++++++++++++++++----------
ruoyi-ui/src/layout/components/Navbar.vue | 3 +--
2 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue
index 85fb1b5..072bf5a 100644
--- a/ruoyi-ui/src/layout/components/Navbar.vue
+++ b/ruoyi-ui/src/layout/components/Navbar.vue
@@ -82,8 +82,7 @@
userId: this.$store.getters.userId,
tenantId: undefined,
companyName: undefined,
- tenantList: [],
- userList: []
+ tenantList: []
}
},
components: {
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 478c164..83cf627 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -3,14 +3,15 @@
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</h3>
<el-form-item prop="tenantId">
- <el-input
- v-model="loginForm.tenantId"
- type="text"
- auto-complete="off"
- placeholder="绉熸埛缂栧彿"
- >
- <svg-icon slot="prefix" icon-class="input" class="el-input__icon input-icon" />
- </el-input>
+ <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="璐﹀彿">
@@ -77,7 +78,7 @@
</template>
<script>
-import { getCodeImg, register } from "@/api/login";
+import {getCodeImg, register, tenantList} from "@/api/login";
export default {
name: "Register",
@@ -119,11 +120,14 @@
code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
},
loading: false,
- captchaEnabled: true
+ captchaEnabled: true,
+ // 绉熸埛鍒楄〃
+ tenantList:[]
};
},
created() {
this.getCode();
+ this.getTenantList();
},
methods: {
getCode() {
@@ -135,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