9.1 预约修改
This commit is contained in:
@ -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;
|
||||
|
Reference in New Issue
Block a user