From 5213215c65e34219ed0a17650289697e120ba456 Mon Sep 17 00:00:00 2001
From: lapuda <577732344@qq.com>
Date: Thu, 23 Jul 2026 20:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=9B=B4=E6=96=B0=E6=8B=9B?=
 =?UTF-8?q?=E8=81=98=E4=BC=9A=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=92=8C=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Detail/components/FairInfoTab.tsx         |  6 ++--
 .../components/CompanyFairDetailModal.tsx     |  6 ++--
 .../Outdoorfair/components/EditModal.tsx      | 30 +++++++++++++++----
 3 files changed, 30 insertions(+), 12 deletions(-)

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<Props> = ({ fairInfo, onFairUpdate }) => {
           </Descriptions.Item>
           <Descriptions.Item label="展位数量">{fairInfo.boothCount}</Descriptions.Item>
           <Descriptions.Item label="举办时间">{fairInfo.holdTime}</Descriptions.Item>
-          <Descriptions.Item label="截止时间">{fairInfo.endTime}</Descriptions.Item>
-          <Descriptions.Item label="开放申请">{fairInfo.applyStartTime}</Descriptions.Item>
-          <Descriptions.Item label="截止申请">{fairInfo.applyEndTime}</Descriptions.Item>
+          <Descriptions.Item label="结束时间">{fairInfo.endTime}</Descriptions.Item>
+          <Descriptions.Item label="报名开始时间">{fairInfo.applyStartTime}</Descriptions.Item>
+          <Descriptions.Item label="报名截止时间">{fairInfo.applyEndTime}</Descriptions.Item>
           <Descriptions.Item label="线上申请">
             {fairInfo.onlineApply ? '是' : '否'}
           </Descriptions.Item>
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<Props> = ({ fair, open, onCancel }) => (
           <Descriptions.Item label="展位数量">{fair.boothCount ?? '--'}</Descriptions.Item>
           <Descriptions.Item label="已预定摊位数">{fair.reservedBoothCount ?? 0}</Descriptions.Item>
           <Descriptions.Item label="举办时间">{fair.holdTime || '--'}</Descriptions.Item>
-          <Descriptions.Item label="截止时间">{fair.endTime || '--'}</Descriptions.Item>
-          <Descriptions.Item label="开放申请">{fair.applyStartTime || '--'}</Descriptions.Item>
-          <Descriptions.Item label="截止申请">{fair.applyEndTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="结束时间">{fair.endTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="报名开始时间">{fair.applyStartTime || '--'}</Descriptions.Item>
+          <Descriptions.Item label="报名截止时间">{fair.applyEndTime || '--'}</Descriptions.Item>
           <Descriptions.Item label="线上申请">
             <Tag color={fair.onlineApply ? 'green' : 'default'}>{fair.onlineApply ? '是' : '否'}</Tag>
           </Descriptions.Item>
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<EditModalProps> = ({
     }
   };
 
+  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 (
     <ModalForm
       title={values ? '编辑线下招聘会' : '新增线下招聘会'}
@@ -270,25 +284,29 @@ const EditModal: React.FC<EditModalProps> = ({
         />
         <ProFormDateTimePicker
           name="endTime"
-          label="截止时间"
+          label="结束时间"
           width="md"
-          rules={[{ required: true, message: '请选择截止时间' }]}
+          rules={[{ required: true, message: '请选择招聘会结束时间' }]}
           fieldProps={{ format: 'YYYY-MM-DD HH:mm:ss' }}
         />
       </ProForm.Group>
       <ProForm.Group>
         <ProFormDateTimePicker
           name="applyStartTime"
-          label="开放申请"
+          label="报名开始时间"
           width="md"
-          rules={[{ required: true, message: '请选择开放申请时间' }]}
+          rules={[{ required: true, message: '请选择报名开始时间' }]}
           fieldProps={{ format: 'YYYY-MM-DD HH:mm:ss' }}
         />
         <ProFormDateTimePicker
           name="applyEndTime"
-          label="截止申请"
+          label="报名截止时间"
           width="md"
-          rules={[{ required: true, message: '请选择截止申请时间' }]}
+          dependencies={['holdTime']}
+          rules={[
+            { required: true, message: '请选择报名截止时间' },
+            { validator: validateRegistrationDeadline },
+          ]}
           fieldProps={{ format: 'YYYY-MM-DD HH:mm:ss' }}
         />
       </ProForm.Group>