diff --git a/apps/web-antd/src/views/system/tenant/data.tsx b/apps/web-antd/src/views/system/tenant/data.tsx index f5b6b32a..4ce519d8 100644 --- a/apps/web-antd/src/views/system/tenant/data.tsx +++ b/apps/web-antd/src/views/system/tenant/data.tsx @@ -3,8 +3,6 @@ import type { VxeGridProps } from '#/adapter/vxe-table'; import { getPopupContainer } from '@vben/utils'; -import dayjs from 'dayjs'; - import { z } from '#/adapter/form'; export const querySchema: FormSchemaGetter = () => [ @@ -73,7 +71,7 @@ export const columns: VxeGridProps['columns'] = [ }, ]; -const defaultExpireTime = dayjs().add(365, 'days').startOf('day'); +// const defaultExpireTime = dayjs().add(365, 'days').startOf('day'); export const drawerSchema: FormSchemaGetter = () => [ { @@ -188,7 +186,7 @@ export const drawerSchema: FormSchemaGetter = () => [ valueFormat: 'YYYY-MM-DD HH:mm:ss', getPopupContainer, }, - defaultValue: defaultExpireTime, + // defaultValue: defaultExpireTime, fieldName: 'expireTime', help: `已经设置过期时间不允许重置为'无期限'\n即在开通时未设置无期限 以后都不允许设置`, label: '过期时间', diff --git a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue index 09e66fc5..f59241b7 100644 --- a/apps/web-antd/src/views/system/tenant/tenant-drawer.vue +++ b/apps/web-antd/src/views/system/tenant/tenant-drawer.vue @@ -108,6 +108,9 @@ const [BasicDrawer, drawerApi] = useVbenDrawer({ tenantInfo(id), setupPackageSelect(), ]); + record.expireTime = record.expireTime + ? (dayjs(record.expireTime) as any) + : undefined; await formApi.setValues(record); } else { await setupPackageSelect();