liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9.1 预约修改

Browse Source
This commit is contained in:
jl-zhoujl2
2022-09-01 10:30:39 +08:00
parent 286e3f1840
commit 49c37c91db
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/ElecBidEvaluation/BidEvalAppointment.tsx
View File

@ -174,8 +174,8 @@ const BidEvalAppointment: React.FC<BidEvalAppointmentProps> = (props) => {
<h3 className='first-title'>{type == "0" ? "已选择评标室" : "已预约评标室"}</h3> <h3 className='first-title'>{type == "0" ? "已选择评标室" : "已预约评标室"}</h3>
<Descriptions size="middle"> <Descriptions size="middle">
<Descriptions.Item label="评标室名称">{values?.areaName}</Descriptions.Item> <Descriptions.Item label="评标室名称">{values?.areaName}</Descriptions.Item>
<Descriptions.Item label="联系人">{values?.contactName}</Descriptions.Item> {values?.contactName && <Descriptions.Item label="联系人">{values?.contactName}</Descriptions.Item>}
<Descriptions.Item label="联系电话">{values?.contactTel}</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="可容纳人数">{values?.areaNumber ? values?.areaNumber : values?.numberInMeeting}</Descriptions.Item>
<Descriptions.Item label="预计评标开始时间">{moment(values?.reserveStartDate).format(dateTimeFormatter)}</Descriptions.Item> <Descriptions.Item label="预计评标开始时间">{moment(values?.reserveStartDate).format(dateTimeFormatter)}</Descriptions.Item>
<Descriptions.Item label="预计评标结束时间">{moment(values?.reserveEndDate).format(dateTimeFormatter)}</Descriptions.Item> <Descriptions.Item label="预计评标结束时间">{moment(values?.reserveEndDate).format(dateTimeFormatter)}</Descriptions.Item>

16
src/pages/Tender/ProjectManager/JudgingPanel/List/index.tsx
View File

@ -426,12 +426,20 @@ const JudgingPanel: React.FC<{}> = () => {
if (verify) { if (verify) {
verify = checkMan(count, parseInt(formVals.expertNumber)); verify = checkMan(count, parseInt(formVals.expertNumber));
} }
const st = formVals.startTime.format('yyyy-MM-DD HH:mm:ss'); const st = moment(formVals.startTime).format('yyyy-MM-DD HH:mm:ss');
const et = formVals.endTime.format('yyyy-MM-DD HH:mm:ss'); const et = moment(formVals.endTime).format('yyyy-MM-DD HH:mm:ss');
if (st > et || st == et) {//校验时间 if (st > et || st == et) {//校验时间
verify = false; verify = false;
message.error("预计开始时间应早于预计结束时间") 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) { if (verify) {
activeKeySet('2'); activeKeySet('2');
} }
@ -930,8 +938,8 @@ const JudgingPanel: React.FC<{}> = () => {
params.reserveStatus = 1; params.reserveStatus = 1;
const evalRoomReserveVO = { const evalRoomReserveVO = {
...selectEvalData, ...selectEvalData,
reserveStartDate: moment(selectEvalData.reserveStartDate).format('yyyy-MM-DD HH:mm:ss'), reserveStartDate: params.startTime,
reserveEndDate: moment(selectEvalData.reserveEndDate).format('yyyy-MM-DD HH:mm:ss'), reserveEndDate: params.endTime,
reserveSectionList: juryRoomList.map((item: any) => ({ sectionId: item.sectionId, assessRoomId: item.roomId })), reserveSectionList: juryRoomList.map((item: any) => ({ sectionId: item.sectionId, assessRoomId: item.roomId })),
} }
params["evalRoomReserveVO"] = evalRoomReserveVO; params["evalRoomReserveVO"] = evalRoomReserveVO;