From dae77c6087f0e9c7db8d4ec57242a0226d324552 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期二, 01 八月 2023 09:18:00 +0800 Subject: [PATCH] Merge branch '2023_CR2' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into 2023_CR2 --- PAMapp/components/Interview/InterviewAdd.vue | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue index 231053d..171345f 100644 --- a/PAMapp/components/Interview/InterviewAdd.vue +++ b/PAMapp/components/Interview/InterviewAdd.vue @@ -21,8 +21,10 @@ ><i class="icon-edit"></i></span> </el-col> </el-row> + <template v-if="!interviewId || isEdit"> <DateTimePicker + :disabledBeforeSpecificDate="appointmentDetail.appointmentDate" @changeDateTime="interviewTime = $event" :defaultValue="defaultValue" ></DateTimePicker> @@ -186,7 +188,7 @@ this.confirmTxt = confirmTxt; this.updateAppointmentDetail(+this.appointmentId); - if (new Date(this.interviewTime).getTime() >= new Date().getTime()) { + if (new Date(this.interviewTime).getTime() >= new Date().getTime() && (!this.appointmentDetail.appointmentClosedInfo)) { this.showFutureDateConfirmPopup = true; } else { this.showConfirmPopup = true; -- Gitblit v1.8.0