fix(login): 隐藏登录页租户栏并同步调整校验规则
- 删除登录页 userlogin 组件中租户输入框的 el-form-item 及相关 DOM - 移除登录表单 loginRules 中 tenantId 的校验规则 - 保留 loginForm.tenantId 默认值和 getTenant 方法,保证后端兼容 - 说明接口正常时仍会覆盖默认 tenantId,方便后续启用租户栏另外开启配置
This commit is contained in:
+1
-1
@@ -81,7 +81,7 @@ app.use(ElementPlus, {
|
||||
});
|
||||
app.use(Avue, {
|
||||
axios,
|
||||
calcHeight: 10,
|
||||
calcHeight: -26,
|
||||
crudOption: {
|
||||
searchIcon: true,
|
||||
searchIndex: 4,
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<div class="login-main">
|
||||
<p class="login-title">
|
||||
{{ $t('login.title') }}{{ website.title }}
|
||||
<top-lang></top-lang>
|
||||
<!-- <top-lang></top-lang>-->
|
||||
</p>
|
||||
<!-- 原登录方式先注释保留备用
|
||||
<userLogin v-if="activeName === 'user'"></userLogin>
|
||||
|
||||
@@ -7,18 +7,6 @@
|
||||
:model="loginForm"
|
||||
label-width="0"
|
||||
>
|
||||
<el-form-item v-if="tenantMode" prop="tenantId">
|
||||
<el-input
|
||||
@keyup.enter="handleLogin"
|
||||
v-model="loginForm.tenantId"
|
||||
auto-complete="off"
|
||||
:placeholder="$t('login.tenantId')"
|
||||
>
|
||||
<template #prefix>
|
||||
<i class="icon-quanxian" />
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
<el-form-item prop="username">
|
||||
<el-input
|
||||
@keyup.enter="handleLogin"
|
||||
@@ -118,7 +106,6 @@ export default {
|
||||
image: 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7',
|
||||
},
|
||||
loginRules: {
|
||||
tenantId: [{ required: false, message: '请输入租户ID', trigger: 'blur' }],
|
||||
username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
|
||||
password: [
|
||||
{ required: true, message: '请输入密码', trigger: 'blur' },
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
<el-input v-model="shipForm.shipName" maxlength="20" show-word-limit />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-col :span="6">
|
||||
<el-form-item label="安放龙骨日期/建造完工日期" prop="keelLayingDate">
|
||||
<div class="date-range-inline">
|
||||
<el-date-picker
|
||||
@@ -169,13 +169,13 @@
|
||||
value-format="YYYY-MM-DD"
|
||||
@change="validateField('keelLayingDate')"
|
||||
/>
|
||||
<span>至</span>
|
||||
<el-date-picker
|
||||
v-model="shipForm.buildCompletionDate"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
@change="validateField('keelLayingDate')"
|
||||
/>
|
||||
<!-- <span>至</span>-->
|
||||
<!-- <el-date-picker-->
|
||||
<!-- v-model="shipForm.buildCompletionDate"-->
|
||||
<!-- type="date"-->
|
||||
<!-- value-format="YYYY-MM-DD"-->
|
||||
<!-- @change="validateField('keelLayingDate')"-->
|
||||
<!-- />-->
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
Reference in New Issue
Block a user