Skip to content

Commit fa421d0

Browse files
committed
🐛 修复 tenant 在 IDEA 报错的问题
1 parent a6deb69 commit fa421d0

File tree

5 files changed

+23
-18
lines changed

5 files changed

+23
-18
lines changed

src/api/system/tenantPackage/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ export const deleteTenantPackage = (id: number) => {
3838
}
3939
// 获取租户套餐精简信息列表
4040
export const getTenantPackageList = () => {
41-
return request.get({ url: '/system/tenant-package/get-simple-list' })
41+
return request.get({ url: '/system/tenant-package/simple-list' })
4242
}

src/views/system/tenant/TenantForm.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<el-radio-group v-model="formData.status">
6262
<el-radio
6363
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
64-
:key="dict.value"
64+
:key="dict.value as number"
6565
:label="dict.value"
6666
>
6767
{{ dict.label }}
@@ -98,7 +98,10 @@ const formData = ref({
9898
accountCount: undefined,
9999
expireTime: undefined,
100100
website: undefined,
101-
status: CommonStatusEnum.ENABLE
101+
status: CommonStatusEnum.ENABLE,
102+
// 新增专属
103+
username: undefined,
104+
password: undefined
102105
})
103106
const formRules = reactive({
104107
name: [{ required: true, message: '租户名不能为空', trigger: 'blur' }],
@@ -112,7 +115,7 @@ const formRules = reactive({
112115
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
113116
})
114117
const formRef = ref() // 表单 Ref
115-
const packageList = ref([]) // 租户套餐
118+
const packageList = ref([] as TenantPackageApi.TenantPackageVO[]) // 租户套餐
116119
117120
/** 打开弹窗 */
118121
const open = async (type: string, id?: number) => {
@@ -171,7 +174,9 @@ const resetForm = () => {
171174
accountCount: undefined,
172175
expireTime: undefined,
173176
website: undefined,
174-
status: CommonStatusEnum.ENABLE
177+
status: CommonStatusEnum.ENABLE,
178+
username: undefined,
179+
password: undefined
175180
}
176181
formRef.value?.resetFields()
177182
}

src/views/system/tenant/index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
>
4747
<el-option
4848
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
49-
:key="dict.value"
49+
:key="dict.value as number"
5050
:label="dict.label"
5151
:value="dict.value"
5252
/>
@@ -198,7 +198,7 @@ const queryParams = reactive({
198198
})
199199
const queryFormRef = ref() // 搜索的表单
200200
const exportLoading = ref(false) // 导出的加载中
201-
const packageList = ref([]) //租户套餐列表
201+
const packageList = ref([] as TenantPackageApi.TenantPackageVO[]) //租户套餐列表
202202
203203
/** 查询列表 */
204204
const getList = async () => {

src/views/system/tenantPackage/TenantPackageForm.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<el-radio-group v-model="formData.status">
4545
<el-radio
4646
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
47-
:key="dict.value"
48-
:label="parseInt(dict.value)"
47+
:key="dict.value as number"
48+
:label="dict.value"
4949
>
5050
{{ dict.label }}
5151
</el-radio>
@@ -113,7 +113,7 @@ const open = async (type: string, id?: number) => {
113113
formData.value = res
114114
// 设置选中
115115
res.menuIds.forEach((menuId: number) => {
116-
treeRef.value.setChecked(menuId, true, false)
116+
treeRef.value!.setChecked(menuId, true, false)
117117
})
118118
} finally {
119119
formLoading.value = false
@@ -134,8 +134,8 @@ const submitForm = async () => {
134134
try {
135135
const data = formData.value as unknown as TenantPackageApi.TenantPackageVO
136136
data.menuIds = [
137-
...(treeRef.value.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
138-
...(treeRef.value.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点
137+
...(treeRef.value!.getCheckedKeys(false) as unknown as Array<number>), // 获得当前选中节点
138+
...(treeRef.value!.getHalfCheckedKeys() as unknown as Array<number>) // 获得半选中的父节点
139139
]
140140
if (formType.value === 'create') {
141141
await TenantPackageApi.createTenantPackage(data)
@@ -171,7 +171,7 @@ const resetForm = () => {
171171
172172
/** 全选/全不选 */
173173
const handleCheckedTreeNodeAll = () => {
174-
treeRef.value.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
174+
treeRef.value!.setCheckedNodes(treeNodeAll.value ? menuOptions.value : [])
175175
}
176176
177177
/** 展开/折叠全部 */

src/views/system/tenantPackage/index.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
2424
<el-option
2525
v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
26-
:key="dict.value"
26+
:key="dict.value as number"
2727
:label="dict.label"
2828
:value="dict.value"
2929
/>
@@ -123,9 +123,9 @@ const list = ref([]) // 列表的数据
123123
const queryParams = reactive({
124124
pageNo: 1,
125125
pageSize: 10,
126-
name: null,
127-
status: null,
128-
remark: null,
126+
name: undefined,
127+
status: undefined,
128+
remark: undefined,
129129
createTime: []
130130
})
131131
const queryFormRef = ref() // 搜索的表单
@@ -134,7 +134,7 @@ const queryFormRef = ref() // 搜索的表单
134134
const getList = async () => {
135135
loading.value = true
136136
try {
137-
const data = await TenantPackageApi.getTenantPackagePage(queryParams.value)
137+
const data = await TenantPackageApi.getTenantPackagePage(queryParams)
138138
list.value = data.list
139139
total.value = data.total
140140
} finally {

0 commit comments

Comments
 (0)