diff --git a/src/api/base/common.ts b/src/api/base/common.ts index ecbabf7d..e5268e63 100644 --- a/src/api/base/common.ts +++ b/src/api/base/common.ts @@ -7,7 +7,7 @@ export function getSystemDictionary(code: string) { return res.map(item => ({ ...item, label: item.dictValue, - value: item.dictKey, + value: +item.dictKey, })) }) } diff --git a/src/api/system/dept/types.ts b/src/api/system/dept/types.ts index a0ed3c46..d78795c1 100644 --- a/src/api/system/dept/types.ts +++ b/src/api/system/dept/types.ts @@ -7,6 +7,7 @@ export interface Department { deptTypeName: string children?: Department[] hasChildren: boolean + deptCategory: string } export interface LazyGetDeptListParams { diff --git a/src/views/system/region/index.vue b/src/views/system/region/index.vue index 9c3c1094..3505882e 100644 --- a/src/views/system/region/index.vue +++ b/src/views/system/region/index.vue @@ -52,14 +52,14 @@ function onSelectRegion(_, { nativeEvent, node }: { nativeEvent: PointerEvent, n sort: undefined, remark: undefined, subCode: undefined, - regionLevel: +res.regionLevel === 5 ? 5 : (+res.regionLevel + 1).toString(), + regionLevel: +res.regionLevel === 5 ? 5 : (+res.regionLevel + 1), } } else { value = { ...res, subCode: res.code.replace(res.parentCode, ''), - regionLevel: res.regionLevel.toString(), + regionLevel: res.regionLevel, } } diff --git a/src/views/system/user/UserFormModal.vue b/src/views/system/user/UserFormModal.vue index bcf71eca..9641a72a 100644 --- a/src/views/system/user/UserFormModal.vue +++ b/src/views/system/user/UserFormModal.vue @@ -26,7 +26,7 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data isUpdate.value = true setFieldsValue({ ...data, - userType: data.userType.toString(), + userType: data.userType, deptId: data.deptId.split(','), postId: data.postId.split(','), roleId: data.roleId.split(','),