From 49c37c91dbf22cd386770e18f4a352d609c084da Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 1 Sep 2022 10:30:39 +0800
Subject: [PATCH] =?UTF-8?q?9.1=20=E9=A2=84=E7=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ElecBidEvaluation/BidEvalAppointment.tsx     |  4 ++--
 .../ProjectManager/JudgingPanel/List/index.tsx   | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx
index 980793b..ec5d0ae 100644
--- a/src/components/ElecBidEvaluation/BidEvalAppointment.tsx
+++ b/src/components/ElecBidEvaluation/BidEvalAppointment.tsx
@@ -174,8 +174,8 @@ const BidEvalAppointment: React.FC<BidEvalAppointmentProps> = (props) => {
                     <h3 className='first-title'>{type == "0" ? "已选择评标室" : "已预约评标室"}</h3>
                     <Descriptions size="middle">
                         <Descriptions.Item label="评标室名称">{values?.areaName}</Descriptions.Item>
-                        <Descriptions.Item label="联系人">{values?.contactName}</Descriptions.Item>
-                        <Descriptions.Item label="联系电话">{values?.contactTel}</Descriptions.Item>
+                        {values?.contactName && <Descriptions.Item label="联系人">{values?.contactName}</Descriptions.Item>}
+                        {values?.contactTel && <Descriptions.Item label="联系电话">{values?.contactTel}</Descriptions.Item>}
                         <Descriptions.Item label="可容纳人数">{values?.areaNumber ? values?.areaNumber : values?.numberInMeeting}</Descriptions.Item>
                         <Descriptions.Item label="预计评标开始时间">{moment(values?.reserveStartDate).format(dateTimeFormatter)}</Descriptions.Item>
                         <Descriptions.Item label="预计评标结束时间">{moment(values?.reserveEndDate).format(dateTimeFormatter)}</Descriptions.Item>
diff --git a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
index da6ac1d..1504273 100644
--- a/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
+++ b/src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
@@ -426,12 +426,20 @@ const JudgingPanel: React.FC<{}> = () => {
       if (verify) {
         verify = checkMan(count, parseInt(formVals.expertNumber));
       }
-      const st = formVals.startTime.format('yyyy-MM-DD HH:mm:ss');
-      const et = formVals.endTime.format('yyyy-MM-DD HH:mm:ss');
+      const st = moment(formVals.startTime).format('yyyy-MM-DD HH:mm:ss');
+      const et = moment(formVals.endTime).format('yyyy-MM-DD HH:mm:ss');
       if (st > et || st == et) {//校验时间
         verify = false;
         message.error("预计开始时间应早于预计结束时间")
       }
+      if (selectEvalData?.reserveStatus == "1") {//预约了评标室
+        const selectStartTime = moment(selectEvalData.reserveStartDate).format('yyyy-MM-DD HH:mm:ss');
+        const selectEndTime = moment(selectEvalData.reserveEndDate).format('yyyy-MM-DD HH:mm:ss');
+        if (selectStartTime != st || selectEndTime != et) {
+          verify = false;
+          message.error("预约时间需与选择评标室中的预约时间相等");
+        }
+      }
       if (verify) {
         activeKeySet('2');
       }
@@ -930,8 +938,8 @@ const JudgingPanel: React.FC<{}> = () => {
               params.reserveStatus = 1;
               const evalRoomReserveVO = {
                 ...selectEvalData,
-                reserveStartDate: moment(selectEvalData.reserveStartDate).format('yyyy-MM-DD HH:mm:ss'),
-                reserveEndDate: moment(selectEvalData.reserveEndDate).format('yyyy-MM-DD HH:mm:ss'),
+                reserveStartDate: params.startTime,
+                reserveEndDate: params.endTime,
                 reserveSectionList: juryRoomList.map((item: any) => ({ sectionId: item.sectionId, assessRoomId: item.roomId })),
               }
               params["evalRoomReserveVO"] = evalRoomReserveVO;