diff --git a/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx b/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx index 3062542..45d709c 100644 --- a/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx +++ b/src/pages/Jobfair/Outdoorfair/Detail/components/FairInfoTab.tsx @@ -139,9 +139,9 @@ const FairInfoTab: React.FC = ({ fairInfo, onFairUpdate }) => { {fairInfo.boothCount} {fairInfo.holdTime} - {fairInfo.endTime} - {fairInfo.applyStartTime} - {fairInfo.applyEndTime} + {fairInfo.endTime} + {fairInfo.applyStartTime} + {fairInfo.applyEndTime} {fairInfo.onlineApply ? '是' : '否'} diff --git a/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx b/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx index cd3312b..c32d68c 100644 --- a/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx +++ b/src/pages/Jobfair/Outdoorfair/components/CompanyFairDetailModal.tsx @@ -35,9 +35,9 @@ const CompanyFairDetailModal: React.FC = ({ fair, open, onCancel }) => ( {fair.boothCount ?? '--'} {fair.reservedBoothCount ?? 0} {fair.holdTime || '--'} - {fair.endTime || '--'} - {fair.applyStartTime || '--'} - {fair.applyEndTime || '--'} + {fair.endTime || '--'} + {fair.applyStartTime || '--'} + {fair.applyEndTime || '--'} {fair.onlineApply ? '是' : '否'} diff --git a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx index 7a9e10a..8fbb5d5 100644 --- a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx +++ b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx @@ -10,6 +10,7 @@ import { } from '@ant-design/pro-components'; import { Button, Divider, Form, Image, Input, message, Modal, Space, Upload } from 'antd'; import { PlusOutlined, UploadOutlined } from '@ant-design/icons'; +import dayjs from 'dayjs'; import type { OutdoorFairItem, OutdoorFairForm, @@ -140,6 +141,19 @@ const EditModal: React.FC = ({ } }; + const validateRegistrationDeadline = (_rule: unknown, value: unknown) => { + const holdTime = form.getFieldValue('holdTime'); + if (!value || !holdTime) { + return Promise.resolve(); + } + const deadline = dayjs(value as any); + const fairHoldTime = dayjs(holdTime); + if (!deadline.isValid() || !fairHoldTime.isValid() || !deadline.isAfter(fairHoldTime)) { + return Promise.resolve(); + } + return Promise.reject(new Error('报名截止时间不能晚于招聘会举办时间')); + }; + return ( = ({ />