From 5b9d7be50c17dd77478abc26e1747975be578d12 Mon Sep 17 00:00:00 2001
From: "517612449@qq.com" <liuhao1234>
Date: Wed, 14 Sep 2022 10:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ElecEvaluation/ElecEvalReserve/index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
index 466af84..e171565 100644
--- a/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
+++ b/src/pages/ElecEvaluation/ElecEvalReserve/index.tsx
@@ -5,6 +5,8 @@ import { reserveList, roomList, cancelReserve } from './service';
 import '@/assets/ld_style.less';
 import { getURLInformation, isNotEmpty } from '@/utils/CommonUtils';
 import MeetingReservation from '@/components/ElecBidEvaluation/MeetingReservation';
+import moment from 'moment';
+import { dateTimeFormatter } from '@/utils/DateUtils';
 
 const { TabPane } = Tabs;
 const statusEnum = {
@@ -157,7 +159,7 @@ const Index: React.FC<{}> = () => {
               查看
             </Button>
             <Button
-              hidden={record.status > 0 && record.timeOut == '1'}
+              hidden={record.status == '0' && record.reserveEndDate <= moment().format(dateTimeFormatter)}
               type="text"
               onClick={() => cancel(record)}
               danger
@@ -235,7 +237,7 @@ const Index: React.FC<{}> = () => {
               查看
             </Button>
             <Button
-              hidden={record.status > 0 && record.timeOut == '1'}
+              hidden={record.reserveEndDate <= moment().format(dateTimeFormatter)}
               type="text"
               onClick={() => cancel(record)}
               danger