From f8ab133a7dc20562c25a092a402266f5e7b0b296 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期一, 24 一月 2022 10:29:38 +0800 Subject: [PATCH] Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3 --- PAMapp/components/Interview/InterviewMsg.vue | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/PAMapp/components/Interview/InterviewMsg.vue b/PAMapp/components/Interview/InterviewMsg.vue index 9695183..12dbf80 100644 --- a/PAMapp/components/Interview/InterviewMsg.vue +++ b/PAMapp/components/Interview/InterviewMsg.vue @@ -20,9 +20,11 @@ </el-input> <div v-if="client.phone"> - <div class="mdTxt mt-30 mb-10">����赤��挾</div> + <div class="mdTxt mt-30 mb-10 required">����赤��挾</div> <DateTimePicker @changeDateTime="interviewTime = $event" + :isPastDateDisabled="true" + :defaultValue="defaultValue" ></DateTimePicker> </div> @@ -33,7 +35,8 @@ </el-dialog> <PopUpFrame - :isOpen.sync="isShowSuccessAlert"> + :isOpen.sync="isShowSuccessAlert" + @closePopUp="closeAllDialog"> <div class="text--middle invite-review"> <div class="mb-30 mt-10">撌脩��赤�</div> <div class="text--primary text--middle cursor--pointer text--underline" @click="closeAllDialog " :size="'250px'">������</div> @@ -42,7 +45,7 @@ </div> </template> <script lang="ts"> -import { Vue, Component, Prop, PropSync, Emit, Action, namespace } from 'nuxt-property-decorator'; +import { Vue, Component, Prop, PropSync, Emit, namespace } from 'nuxt-property-decorator'; import appointmentService from '~/shared/services/appointment.service'; import { Appointment, ToInformAppointment } from '~/shared/models/appointment.model'; @@ -54,11 +57,11 @@ @Component export default class InterviewMsg extends Vue { - @Action - storeMyAppointmentList!: () => Promise<number>; - @appointmentStore.Action updateAppointmentDetail!: (id: number) => Appointment; + + @appointmentStore.Action + getMyAppointmentList!: () => Promise<Appointment[]>; @PropSync('isVisible') dialogVisible!: boolean; @@ -68,6 +71,9 @@ @Prop() client!: Appointment; + + @Prop() + defaultValue!: string; @Emit('closeDialog') closeDialog() { @@ -97,14 +103,14 @@ }; appointmentService.informAppointment(appointmentInformation).then((_) => { this.isShowSuccessAlert = true ; - this.updateAppointmentDetail(this.client.id); }); } closeAllDialog() { this.isShowSuccessAlert = false ; this.dialogVisible = false; - this.storeMyAppointmentList(); + this.updateAppointmentDetail(this.client.id); + this.getMyAppointmentList(); } get isBtnDisabled() :Boolean { @@ -118,6 +124,15 @@ <style lang="scss" > .interview-msg-component{ + .required { + position: relative; + &::before { + content: '*'; + position: absolute; + color: #FF0000; + transform: translate(-12px, 0); + } + } .msg-dialog-title{ display: flex; justify-content: center; -- Gitblit v1.8.0