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 = (props) => {

{type == "0" ? "已选择评标室" : "已预约评标室"}

{values?.areaName} - {values?.contactName} - {values?.contactTel} + {values?.contactName && {values?.contactName}} + {values?.contactTel && {values?.contactTel}} {values?.areaNumber ? values?.areaNumber : values?.numberInMeeting} {moment(values?.reserveStartDate).format(dateTimeFormatter)} {moment(values?.reserveEndDate).format(dateTimeFormatter)} 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;