From f5c3e5e9254b7af10ddbc8b5cb81cd78f531e8d1 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期五, 10 六月 2022 14:01:00 +0800
Subject: [PATCH] Merge branch 'Phase3' of ssh://192.168.0.10:29418/pcalife/PAM into Phase3
---
PAMapp/components/Interview/InterviewAdd.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 511920e..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>
@@ -45,7 +47,7 @@
</el-input>
</template>
<template v-else>
- <div class="fs-20 mt-20">
+ <div class="fs-20 mt-20 text--break-all line-height">
{{content}}
</div>
</template>
@@ -79,7 +81,7 @@
@closePopUp="closePopup">
<div class="text--center mdTxt">{{confirmTxt}}嚗�</div>
<div class="text--center mdTxt">蝡���赤�嚗�</div>
- <div class="text--center mt-30" style="display:flex">
+ <div class="text--center mt-30 confirm-btn">
<el-button @click="closePopup">�����</el-button>
<el-button @click="showInterviewMsgPopup = true" type="primary">���赤�</el-button>
</div>
@@ -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;
@@ -262,5 +264,8 @@
z-index: 5;
}
}
-
+.confirm-btn{
+ display: flex;
+ justify-content: center;
+}
</style>
--
Gitblit v1.8.0