Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
a08e9bea
authored
Nov 06, 2023
by
YunaiV
Committed by
owen
Nov 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突
parent
82aed175
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
src/views/system/tenant/TenantForm.vue
+5
-5
src/views/system/tenant/index.vue
+1
-1
No files found.
src/views/system/tenant/TenantForm.vue
View file @
a08e9bea
...
@@ -54,8 +54,8 @@
...
@@ -54,8 +54,8 @@
value-format=
"x"
value-format=
"x"
/>
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"绑定域名"
prop=
"
domain
"
>
<el-form-item
label=
"绑定域名"
prop=
"
website
"
>
<el-input
v-model=
"formData.
domain
"
placeholder=
"请输入绑定域名"
/>
<el-input
v-model=
"formData.
website
"
placeholder=
"请输入绑定域名"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"租户状态"
prop=
"status"
>
<el-form-item
label=
"租户状态"
prop=
"status"
>
<el-radio-group
v-model=
"formData.status"
>
<el-radio-group
v-model=
"formData.status"
>
...
@@ -97,7 +97,7 @@ const formData = ref({
...
@@ -97,7 +97,7 @@ const formData = ref({
contactMobile
:
undefined
,
contactMobile
:
undefined
,
accountCount
:
undefined
,
accountCount
:
undefined
,
expireTime
:
undefined
,
expireTime
:
undefined
,
domain
:
undefined
,
website
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
})
})
const
formRules
=
reactive
({
const
formRules
=
reactive
({
...
@@ -107,7 +107,7 @@ const formRules = reactive({
...
@@ -107,7 +107,7 @@ const formRules = reactive({
status
:
[{
required
:
true
,
message
:
'租户状态不能为空'
,
trigger
:
'blur'
}],
status
:
[{
required
:
true
,
message
:
'租户状态不能为空'
,
trigger
:
'blur'
}],
accountCount
:
[{
required
:
true
,
message
:
'账号额度不能为空'
,
trigger
:
'blur'
}],
accountCount
:
[{
required
:
true
,
message
:
'账号额度不能为空'
,
trigger
:
'blur'
}],
expireTime
:
[{
required
:
true
,
message
:
'过期时间不能为空'
,
trigger
:
'blur'
}],
expireTime
:
[{
required
:
true
,
message
:
'过期时间不能为空'
,
trigger
:
'blur'
}],
domain
:
[{
required
:
true
,
message
:
'绑定域名不能为空'
,
trigger
:
'blur'
}],
website
:
[{
required
:
true
,
message
:
'绑定域名不能为空'
,
trigger
:
'blur'
}],
username
:
[{
required
:
true
,
message
:
'用户名称不能为空'
,
trigger
:
'blur'
}],
username
:
[{
required
:
true
,
message
:
'用户名称不能为空'
,
trigger
:
'blur'
}],
password
:
[{
required
:
true
,
message
:
'用户密码不能为空'
,
trigger
:
'blur'
}]
password
:
[{
required
:
true
,
message
:
'用户密码不能为空'
,
trigger
:
'blur'
}]
})
})
...
@@ -170,7 +170,7 @@ const resetForm = () => {
...
@@ -170,7 +170,7 @@ const resetForm = () => {
contactMobile
:
undefined
,
contactMobile
:
undefined
,
accountCount
:
undefined
,
accountCount
:
undefined
,
expireTime
:
undefined
,
expireTime
:
undefined
,
domain
:
undefined
,
website
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
}
}
formRef
.
value
?.
resetFields
()
formRef
.
value
?.
resetFields
()
...
...
src/views/system/tenant/index.vue
View file @
a08e9bea
...
@@ -125,7 +125,7 @@
...
@@ -125,7 +125,7 @@
width=
"180"
width=
"180"
:formatter=
"dateFormatter"
:formatter=
"dateFormatter"
/>
/>
<el-table-column
label=
"绑定域名"
align=
"center"
prop=
"
domain
"
width=
"180"
/>
<el-table-column
label=
"绑定域名"
align=
"center"
prop=
"
website
"
width=
"180"
/>
<el-table-column
label=
"租户状态"
align=
"center"
prop=
"status"
>
<el-table-column
label=
"租户状态"
align=
"center"
prop=
"status"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.COMMON_STATUS"
:value=
"scope.row.status"
/>
<dict-tag
:type=
"DICT_TYPE.COMMON_STATUS"
:value=
"scope.row.status"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment