From 75e7047b4f121f39a39e4fa74449a2366f15310b Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期六, 05 八月 2023 16:56:33 +0800
Subject: [PATCH] Fixed: [弱掃] p10.1 Bad use of null-like value
---
PAMapp/components/Interview/InterviewAdd.vue | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 91961c7..171345f 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -6,23 +6,25 @@
</div>
<el-row class="mdTxt mb-10">
<el-col :xs="16" :sm="20">
- <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
- </el-col>
+ <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
+ </el-col>
<el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
<span
v-if="!isEdit"
- class="mr-10 text--primary text--underline cursor--pointer"
+ class="mr-10 text--primary cursor--pointer"
@click="showCancelPopUp = true"
- >��</span>
+ ><i class="icon-delet"></i></span>
<span
v-if="!isEdit"
- class="text--primary text--underline cursor--pointer"
+ class="text--primary cursor--pointer"
@click="isEdit = !isEdit"
- >蝺刻摩</span>
+ ><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