From 633a43b1bc57187983d8bbe85f2e835026cc37b6 Mon Sep 17 00:00:00 2001 From: Mila <Mila@pollex.com.tw> Date: 星期五, 21 一月 2022 17:05:24 +0800 Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3 --- PAMapp/pages/appointment/_appointmentId/index.vue | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue index fcc05b8..7f3c211 100644 --- a/PAMapp/pages/appointment/_appointmentId/index.vue +++ b/PAMapp/pages/appointment/_appointmentId/index.vue @@ -2,7 +2,9 @@ <div class="appointment-client-detail-page"> <div class="date-detail"> <div>{{ appointmentDetail.appointmentDate | formatDate }}����</div> - <div>{{ appointmentDetail.consultantReadTime | formatDate }}撌脰�</div> + <div>{{ appointmentDetail.consultantReadTime | formatDate }} + <span v-if="appointmentDetail.consultantReadTime">撌脰�</span> + </div> </div> <AppointmentProgress @@ -54,9 +56,13 @@ <el-button @click="inviteReview">��遛��漲</el-button> </div> - <div class="client-detail-action" v-else> + <div class="client-detail-action" v-if="showWhenAppointmentHasContacted"> <el-button @click="closeAppointment" >蝯��</el-button> <el-button @click="sendMsg" style="margin-left: 0px">�/蝝赤</el-button> + </div> + + <div class="client-detail-action" v-if="showWhenAppointmentHasCreate"> + <el-button @click="sendMsg">���赤�</el-button> </div> </section> @@ -71,11 +77,11 @@ </InterviewMsg> - <section class="mt-30"> + <section class="mt-30" v-if="!showWhenAppointmentHasCreate"> <AppointmentInterviewList :interviewList="appointmentDetail.interviewRecordDTOs" /> </section> - <section class="mt-30"> + <section class="mt-30" v-if="!showWhenAppointmentHasCreate"> <AppointmentRecordList :noticeLogs="appointmentDetail.appointmentNoticeLogs" /> </section> @@ -128,6 +134,15 @@ || this.appointmentDetail.communicateStatus === this.contactStatus.CANCEL; } + get showWhenAppointmentHasCreate(): boolean { + return this.appointmentDetail.communicateStatus === this.contactStatus.PICKED + || this.appointmentDetail.communicateStatus === this.contactStatus.RESERVED; + } + + get showWhenAppointmentHasContacted() :boolean { + return this.appointmentDetail.communicateStatus === this.contactStatus.CONTACTED; + } + get hopeContactTimeList(): any[] { return this.appointmentDetail.hopeContactTime.split("','") } -- Gitblit v1.8.0