From 539b20ab881abe8b9059d2fc7ab83722f28ee2aa Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 02 八月 2023 14:18:34 +0800
Subject: [PATCH] Fixed: <iframe> 安全性規範，使用 sandbox
---
PAMapp/components/Interview/InterviewAdd.vue | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewAdd.vue b/PAMapp/components/Interview/InterviewAdd.vue
index 3a7ded0..171345f 100644
--- a/PAMapp/components/Interview/InterviewAdd.vue
+++ b/PAMapp/components/Interview/InterviewAdd.vue
@@ -5,8 +5,9 @@
<span>{{interviewRecord.lastModifiedDate | formatDate}} ��</span>
</div>
<el-row class="mdTxt mb-10">
- <el-col :xs="16" :sm="20" v-if="interviewId">蝝赤����</el-col>
- <el-col :xs="16" :sm="20" class="required" v-else>蝝赤����</el-col>
+ <el-col :xs="16" :sm="20">
+ <span :class="{'required': !interviewId || isEdit}">蝝赤����</span>
+ </el-col>
<el-col :xs="8" :sm="4" class="text--right" v-if="interviewId">
<span
v-if="!isEdit"
@@ -20,19 +21,21 @@
><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>
</template>
<template v-else>
- <div class="mdTxt lighter mt-20">
+ <div class="fs-20 mt-20">
{{formatInterviewDate}}
</div>
</template>
- <div class="mdTxt mb-10 mt-30">蝝赤蝝����</div>
+ <div class="mdTxt mb-10 mt-30" :class="{'required': !interviewId || isEdit}">蝝赤蝝����</div>
<template v-if="!interviewId || isEdit">
<el-input
type="textarea"
@@ -44,7 +47,7 @@
</el-input>
</template>
<template v-else>
- <div class="mdTxt lighter mt-20">
+ <div class="fs-20 mt-20 text--break-all line-height">
{{content}}
</div>
</template>
@@ -78,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>
@@ -185,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;
@@ -250,5 +253,19 @@
font-size: 20px;
}
}
+.required {
+ position: relative;
+ &::before {
+ content: '*';
+ position: absolute;
+ color: #FF0000;
+ transform: translate(-12px, 0);
+ z-index: 5;
+ }
+ }
+.confirm-btn{
+ display: flex;
+ justify-content: center;
+}
</style>
--
Gitblit v1.8.0