abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2 页面新增租户开关判断

Browse Source 
* update 更新 注册/登录/顶部栏 优化租户开关判断逻辑 ;
* update 更新 注册/登录/顶部栏 增加租户开关判断 ;
This commit is contained in:
MichelleChung 2023-03-30 02:22:07 +00:00 committed by 疯狂的狮子Li
parent a554b72190
commit 3333c42e23
3 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/layout/components/Navbar.vue
View File

@ -11,7 +11,7 @@
filterable
reserve-keyword
placeholder="请选择租户"
v-if="userId === 1"
v-if="userId === 1 && tenantEnabled"
@change="dynamicTenantEvent"
@clear="dynamicClearEvent">
<el-option
@ -91,6 +91,8 @@ const companyName = ref(undefined);
const tenantList = ref([]);
// 是否切换了租户
const dynamic = ref(false);
// 租户开关
const tenantEnabled = ref(true);
// 动态切换
function dynamicTenantEvent(tenantId) {
@ -114,7 +116,11 @@ function dynamicClearEvent() {
// 租户列表
function initTenantList() {
getTenantList().then(res => {
tenantList.value = res.data;
const vo = res.data;
tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = vo.voList;
}
});
}

14
src/views/login.vue
View File

@ -2,7 +2,7 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
<el-form-item prop="tenantId">
<el-form-item prop="tenantId" v-if="tenantEnabled">
<el-select v-model="loginForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
<el-option
v-for="item in tenantList"
@ -110,6 +110,8 @@ const register = ref(false);
const redirect = ref(undefined);
// 租户列表
const tenantList = ref([]);
// 租户开关
const tenantEnabled = ref(true);
function handleLogin() {
proxy.$refs.loginRef.validate(valid => {
@ -154,9 +156,13 @@ function getCode() {
function initTenantList() {
getTenantList().then(res => {
tenantList.value = res.data;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
const vo = res.data;
tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = vo.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
});
}

14
src/views/register.vue
View File

@ -2,7 +2,7 @@
<div class="register">
<el-form ref="registerRef" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">RuoYi-Vue-Plus多租户管理系统</h3>
<el-form-item prop="tenantId">
<el-form-item prop="tenantId" v-if="tenantEnabled">
<el-select v-model="registerForm.tenantId" filterable placeholder="请选择/输入公司名称" style="width: 100%">
<el-option
v-for="item in tenantList"
@ -135,6 +135,8 @@ const loading = ref(false);
const captchaEnabled = ref(true);
// 租户列表
const tenantList = ref([]);
// 租户开关
const tenantEnabled = ref(true);
function handleRegister() {
proxy.$refs.registerRef.validate(valid => {
@ -170,9 +172,13 @@ function getCode() {
function initTenantList() {
getTenantList().then(res => {
tenantList.value = res.data;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
const vo = res.data;
tenantEnabled.value = vo.tenantEnabled === undefined ? true : vo.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = vo.voList;
if (tenantList.value != null && tenantList.value.length !== 0) {
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
});
}