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
fa421d08
authored
Dec 02, 2023
by
YunaiV
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐛
修复 tenant 在 IDEA 报错的问题
parent
a6deb69d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
18 deletions
+23
-18
src/api/system/tenantPackage/index.ts
+1
-1
src/views/system/tenant/TenantForm.vue
+9
-4
src/views/system/tenant/index.vue
+2
-2
src/views/system/tenantPackage/TenantPackageForm.vue
+6
-6
src/views/system/tenantPackage/index.vue
+5
-5
No files found.
src/api/system/tenantPackage/index.ts
View file @
fa421d08
...
...
@@ -38,5 +38,5 @@ export const deleteTenantPackage = (id: number) => {
}
// 获取租户套餐精简信息列表
export
const
getTenantPackageList
=
()
=>
{
return
request
.
get
({
url
:
'/system/tenant-package/
get-
simple-list'
})
return
request
.
get
({
url
:
'/system/tenant-package/simple-list'
})
}
src/views/system/tenant/TenantForm.vue
View file @
fa421d08
...
...
@@ -61,7 +61,7 @@
<el-radio-group
v-model=
"formData.status"
>
<el-radio
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key=
"dict.value"
:key=
"dict.value
as number
"
:label=
"dict.value"
>
{{
dict
.
label
}}
...
...
@@ -98,7 +98,10 @@ const formData = ref({
accountCount
:
undefined
,
expireTime
:
undefined
,
website
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
,
// 新增专属
username
:
undefined
,
password
:
undefined
})
const
formRules
=
reactive
({
name
:
[{
required
:
true
,
message
:
'租户名不能为空'
,
trigger
:
'blur'
}],
...
...
@@ -112,7 +115,7 @@ const formRules = reactive({
password
:
[{
required
:
true
,
message
:
'用户密码不能为空'
,
trigger
:
'blur'
}]
})
const
formRef
=
ref
()
// 表单 Ref
const
packageList
=
ref
([])
// 租户套餐
const
packageList
=
ref
([]
as
TenantPackageApi
.
TenantPackageVO
[]
)
// 租户套餐
/** 打开弹窗 */
const
open
=
async
(
type
:
string
,
id
?:
number
)
=>
{
...
...
@@ -171,7 +174,9 @@ const resetForm = () => {
accountCount
:
undefined
,
expireTime
:
undefined
,
website
:
undefined
,
status
:
CommonStatusEnum
.
ENABLE
status
:
CommonStatusEnum
.
ENABLE
,
username
:
undefined
,
password
:
undefined
}
formRef
.
value
?.
resetFields
()
}
...
...
src/views/system/tenant/index.vue
View file @
fa421d08
...
...
@@ -46,7 +46,7 @@
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key=
"dict.value"
:key=
"dict.value
as number
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
@@ -198,7 +198,7 @@ const queryParams = reactive({
})
const
queryFormRef
=
ref
()
// 搜索的表单
const
exportLoading
=
ref
(
false
)
// 导出的加载中
const
packageList
=
ref
([])
//租户套餐列表
const
packageList
=
ref
([]
as
TenantPackageApi
.
TenantPackageVO
[]
)
//租户套餐列表
/** 查询列表 */
const
getList
=
async
()
=>
{
...
...
src/views/system/tenantPackage/TenantPackageForm.vue
View file @
fa421d08
...
...
@@ -44,8 +44,8 @@
<el-radio-group
v-model=
"formData.status"
>
<el-radio
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key=
"dict.value"
:label=
"
parseInt(dict.value)
"
:key=
"dict.value
as number
"
:label=
"
dict.value
"
>
{{ dict.label }}
</el-radio>
...
...
@@ -113,7 +113,7 @@ const open = async (type: string, id?: number) => {
formData
.
value
=
res
// 设置选中
res
.
menuIds
.
forEach
((
menuId
:
number
)
=>
{
treeRef
.
value
.
setChecked
(
menuId
,
true
,
false
)
treeRef
.
value
!
.
setChecked
(
menuId
,
true
,
false
)
})
}
finally
{
formLoading
.
value
=
false
...
...
@@ -134,8 +134,8 @@ const submitForm = async () => {
try
{
const
data
=
formData
.
value
as
unknown
as
TenantPackageApi
.
TenantPackageVO
data
.
menuIds
=
[
...(
treeRef
.
value
.
getCheckedKeys
(
false
)
as
unknown
as
Array
<
number
>
),
// 获得当前选中节点
...(
treeRef
.
value
.
getHalfCheckedKeys
()
as
unknown
as
Array
<
number
>
)
// 获得半选中的父节点
...(
treeRef
.
value
!
.
getCheckedKeys
(
false
)
as
unknown
as
Array
<
number
>
),
// 获得当前选中节点
...(
treeRef
.
value
!
.
getHalfCheckedKeys
()
as
unknown
as
Array
<
number
>
)
// 获得半选中的父节点
]
if
(
formType
.
value
===
'create'
)
{
await
TenantPackageApi
.
createTenantPackage
(
data
)
...
...
@@ -171,7 +171,7 @@ const resetForm = () => {
/** 全选/全不选 */
const
handleCheckedTreeNodeAll
=
()
=>
{
treeRef
.
value
.
setCheckedNodes
(
treeNodeAll
.
value
?
menuOptions
.
value
:
[])
treeRef
.
value
!
.
setCheckedNodes
(
treeNodeAll
.
value
?
menuOptions
.
value
:
[])
}
/** 展开/折叠全部 */
...
...
src/views/system/tenantPackage/index.vue
View file @
fa421d08
...
...
@@ -23,7 +23,7 @@
<el-select
v-model=
"queryParams.status"
placeholder=
"请选择状态"
clearable
class=
"!w-240px"
>
<el-option
v-for=
"dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
:key=
"dict.value"
:key=
"dict.value
as number
"
:label=
"dict.label"
:value=
"dict.value"
/>
...
...
@@ -123,9 +123,9 @@ const list = ref([]) // 列表的数据
const
queryParams
=
reactive
({
pageNo
:
1
,
pageSize
:
10
,
name
:
null
,
status
:
null
,
remark
:
null
,
name
:
undefined
,
status
:
undefined
,
remark
:
undefined
,
createTime
:
[]
})
const
queryFormRef
=
ref
()
// 搜索的表单
...
...
@@ -134,7 +134,7 @@ const queryFormRef = ref() // 搜索的表单
const
getList
=
async
()
=>
{
loading
.
value
=
true
try
{
const
data
=
await
TenantPackageApi
.
getTenantPackagePage
(
queryParams
.
value
)
const
data
=
await
TenantPackageApi
.
getTenantPackagePage
(
queryParams
)
list
.
value
=
data
.
list
total
.
value
=
data
.
total
}
finally
{
...
...
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