diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts index 03c07098..32fbba23 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts +++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/data.ts @@ -28,13 +28,16 @@ export const querySchema: FormSchemaGetter = () => [ label: '预约状态', }, { - component: 'DatePicker', + component: 'RangePicker', componentProps: { - showTime: true, + showTime: { + format: 'HH:mm:ss' + }, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', + placeholder: ['开始时间', '结束时间'] }, - fieldName: 'visitingBeginTime', + fieldName: 'visitingTimeRange', label: '拜访时间', }, { @@ -178,12 +181,15 @@ export const modalSchema: FormSchemaGetter = () => [ }, { label: '拜访时间', - fieldName: 'visitingBeginTime', - component: 'DatePicker', + fieldName: 'visitingTimeRange', + component: 'RangePicker', componentProps: { - showTime: true, + showTime: { + format: 'HH:mm:ss' + }, format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', + placeholder: ['开始时间', '结束时间'] }, rules: 'required', }, @@ -203,7 +209,6 @@ export const modalSchema: FormSchemaGetter = () => [ label: '车牌号', fieldName: 'licensePlate', component: 'Input', - rules: 'required', }, // { // label: '人脸图片', diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue index fc08c046..4d769369 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue +++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/index.vue @@ -40,6 +40,12 @@ const gridOptions: VxeGridProps = { pageNum: page.currentPage, pageSize: page.pageSize, ...formValues, + // visitingBeginTime: new Date(formValues.visitingTimeRange[0]).getTime(), + // visitingEndTime: new Date(formValues.visitingTimeRange[1]).getTime(), + // visitingTimeRange: undefined, + visitingBeginTime: formValues.visitingTimeRange?.[0], + visitingEndTime: formValues.visitingTimeRange?.[1], + visitingTimeRange: undefined }); }, }, diff --git a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue index 1cc49f0a..f0b00ecf 100644 --- a/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue +++ b/apps/web-antd/src/views/property/visitorManagement/visitorInvitation/visitorInvitation-detail.vue @@ -14,11 +14,11 @@ dayjs.extend(relativeTime); const [BasicModal, modalApi] = useVbenModal({ onOpenChange: handleOpenChange, onClosed() { - unitDetail.value = null; + visitorInvitationDetail.value = null; }, }); -const unitDetail = shallowRef(null); +const visitorInvitationDetail = shallowRef(null); async function handleOpenChange(open: boolean) { if (!open) { @@ -27,50 +27,53 @@ async function handleOpenChange(open: boolean) { modalApi.modalLoading(true); const {id} = modalApi.getData() as { id: number | string }; const response = await visitorManagementInfo(id); - unitDetail.value = response; + visitorInvitationDetail.value = response; modalApi.modalLoading(false); }