From 1592d266eb7cea3a096c17d4ae3c0d01c679da7b Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期五, 21 一月 2022 16:15:01 +0800
Subject: [PATCH] update: TODO#134585 串接 顧問主動發送滿意度 API
---
PAMapp/pages/appointment/_appointmentId/index.vue | 191 +++++++++++++++++++++--------------------------
1 files changed, 87 insertions(+), 104 deletions(-)
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index 43f55e6..c386f9f 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -1,13 +1,13 @@
<template>
<div class="appointment-client-detail-page">
<div class="date-detail">
- <!-- TODO: 閬����� step 憿舐內銝�� Date [Tomas, 2022/1/11] -->
- <div>{{ appointmentDetail.appointmentDate }}</div>
- <div>{{ appointmentDetail.consultantReadTime }}</div>
+ <div>{{ appointmentDetail.appointmentDate | formatDate }}</div>
+ <div>{{ appointmentDetail.consultantReadTime | formatDate }}</div>
</div>
+
<AppointmentProgress
class="mt-10"
- :currentStep="appointmentDetail.communicateStatus"
+ :currentStep="appointmentProgress"
></AppointmentProgress>
<section class="client-detail">
@@ -22,7 +22,7 @@
</div>
</div>
<div class="client-detail-info__information">
- <div>{{ appointmentDetail.age || '--' }}甇�</div>
+ <div>{{ appointmentDetail.age | toAgeLabel }}</div>
<div>{{ appointmentDetail.phone }}</div>
<div class="text--underline">
{{ appointmentDetail.email }}
@@ -31,108 +31,82 @@
</div>
<div class="client-detail-demand mt-10">
- <div class="client-detail-demand__demand-list">
+
+ <div class="client-detail-demand__demand-list mb-10">
<div class="client-detail-demand__demand-list-label">��瘙�</div>
- <div>{{ appointmentDetail.requirement }}</div>
+ <div class="client-detail-demand__demand-list-content">{{ appointmentDetail.requirement }}</div>
</div>
- <div class="client-detail-demand__hope-contact-time">
+
+ <div class="client-detail-demand__demand-list">
<div class="client-detail-demand__demand-list-label">�蝯�<br />��挾</div>
- <div>���� 17:00 ~ 19:00</div>
- <!-- TODO: 憭�蝯⊥�挾憒�� && 頝���� [Tomas. 2021/1/12] -->
- <!-- <div>{{ appointmentDetail.hopeContactTime }}</div> -->
+ <div class="client-detail-demand__demand-list-content">
+ <div v-for="(hopeContactTime, index) in hopeContactTimeList" :key="index"
+ :class="{'mt-10': index > 0, 'pb-10': true, 'hope-contact-time__line': index + 1 < hopeContactTimeList.length }">
+ <div v-for="(item, index) in getHopeContactTimeContent(hopeContactTime)" :key="index" :class="{'mt-10': index < 0 }">
+ {{ item }}
+ </div>
+ </div>
+ </div>
</div>
</div>
- <div class="client-detail-action">
- <!-- <el-button @click="closeAppointment" >蝯��</el-button>
- <el-button @click="sendMsg" style="margin-left: 0px">�/蝝赤</el-button> -->
- <el-button>��遛��漲</el-button>
+ <div class="client-detail-action" v-if="showWhenAppointmentHasClosed">
+ <el-button @click="inviteReview">��遛��漲</el-button>
+ </div>
+
+ <div class="client-detail-action" v-else>
+ <el-button @click="closeAppointment" >蝯��</el-button>
+ <el-button @click="sendMsg" style="margin-left: 0px">�/蝝赤</el-button>
</div>
</section>
- <section class="close-appointment-detail">
- <div class="close-appointment-detail-nav">
- <div class="mdTxt">蝯�撘�</div>
- <div class="mdTxt text--primary text--underline">蝺刻摩</div>
- </div>
- <span class="mt-10 mb-30">��漱</span>
+ <template v-if="showWhenAppointmentHasClosed">
+ <AppointmentClosedInfo :appointmentDetail="appointmentDetail" />
+ </template>
- <div class="mdTxt mb-10">靽頨思遢霅���</div>
- <div class="mb-30">A123456789</div>
- <div class="mdTxt mb-10">���誨蝣噗lan Code</div>
- <div class="mb-30">8888888</div>
- <div class="mdTxt mb-10">�脖辣����</div>
- <div class="mb-30">2021/12/2</div>
- <div class="mdTxt mb-10">��酉</div>
- <div class="">蝝赤4甈∴�恥�敺�迭��窄�憭Ｕ��</div>
-
- </section>
-
-
- <UiDialog
- :isVisible.sync="isVisibleDialog"
- class="msg-dialog">
- <div class="subTitle msg-dialog-title">蝝赤�</div>
-
- <div class="send-msg-nav">
- <div class="mdTxt">��摰�</div>
- <div class="mdTxt text--primary text--underline">蝺刻摩</div>
- </div>
-
- <el-input
- type="textarea"
- :rows="9"
- placeholder="蝝赤�"
- resize="none"
- validate-event = "false"
- v-model="interviewTxt">
- </el-input>
- <div class="mdTxt mt-30 mb-10">����赤��挾</div>
- <div class="date-input">
- 2022/01/10 09:00
- <i class="icon-calender icon"></i>
- </div>
-
- <div class="msg-dialog-btn">
- <el-button>���</el-button>
- </div>
- </UiDialog>
+ <InterviewMsg
+ :isVisible.sync="isVisibleDialog"
+ :client="appointmentDetail">
+ </InterviewMsg>
<section class="mt-30">
- <AppointmentInterviewList />
+ <AppointmentInterviewList :interviewList="appointmentDetail.interviewRecordDTOs" />
</section>
<section class="mt-30">
- <AppointmentRecordList />
+ <AppointmentRecordList :noticeLogs="appointmentDetail.appointmentNoticeLogs" />
</section>
</div>
</template>
<script lang="ts">
-import { Context } from '@nuxt/types';
-
import { Vue, Component } from 'vue-property-decorator';
+import { namespace } from 'nuxt-property-decorator';
-import appointmentService from '~/shared/services/appointment.service';
-import { AppointmentDetail } from '~/shared/models/appointment.model';
+import { Appointment } from '~/shared/models/appointment.model';
+import { ContactStatus } from '~/shared/models/enum/contact-status';
+
+import reviewsService from '~/shared/services/reviews.service';
+
+
+const appointmentStore = namespace('appointment.store');
@Component
export default class AppointmentDetailComponent extends Vue {
- appointmentDetail!: AppointmentDetail;
+ @appointmentStore.State('appointmentDetail')
+ appointmentDetail!: Appointment;
+
+ @appointmentStore.Getter('appointmentProgress')
+ appointmentProgress!: ContactStatus;
+
isVisibleDialog = false;
interviewTxt = "";
- //////////////////////////////////////////////////////////////////////
+ contactStatus = ContactStatus;
- async asyncData(context: Context) {
- const appointmentId = +context.route.params.appointmentId;
- return {
- appointmentDetail: await appointmentService.getAppointmentDetail(appointmentId).then((res) => res)
- }
- }
//////////////////////////////////////////////////////////////////////
@@ -140,8 +114,31 @@
this.$router.push(`/appointment/${this.appointmentDetail.id}/close`);
}
- sendMsg():void{
+ sendMsg():void {
this.isVisibleDialog = true;
+ }
+
+ editAppointmentHasClosed(): void{
+ this.$router.push(`/appointment/${this.appointmentDetail.id}/close`);
+ }
+
+ get showWhenAppointmentHasClosed(): boolean {
+ return this.appointmentDetail.communicateStatus === this.contactStatus.DONE
+ || this.appointmentDetail.communicateStatus === this.contactStatus.CLOSE
+ || this.appointmentDetail.communicateStatus === this.contactStatus.CANCEL;
+ }
+
+ get hopeContactTimeList(): any[] {
+ return this.appointmentDetail.hopeContactTime.split("','")
+ }
+
+ getHopeContactTimeContent(hopeContactTimeString: string): string[] {
+ const result = hopeContactTimeString.replace("'", '').split('��');
+ return result;
+ }
+
+ inviteReview(): void {
+ reviewsService.sendSatisfactionToClient(this.appointmentDetail.id).then(res => res);
}
}
</script>
@@ -206,41 +203,23 @@
display: flex;
}
.client-detail-demand__demand-list-label {
- @extend .mr-10;
- @extend .mdTxt;
@extend .mb-10;
+ @extend .mdTxt;
+ @extend .mr-10;
+ color : $DARK_BLUE;
+ flex-basis: auto;
+ min-width : 40px;
+ }
+ .client-detail-demand__demand-list-content {
+ text-align: justify;
+ text-justify: auto;
+ word-break: break-all;
}
}
.client-detail-action {
margin-left: 50px;
}
}
-}
-.msg-dialog-title{
- display: flex;
- justify-content: center;
- margin-bottom:30px;
- color: $PRIMARY_BLACK;
-}
-.send-msg-nav{
- display: flex;
- justify-content: space-between;
- margin-bottom: 10px;
- color: $PRIMARY_BLACK;
-}
-.el-dialog{
- width:90%
-}
-.el-textarea__inner{
- font-size: 20px;
- padding:10px;
- text-align: justify;
- font-weight: 500;
-}
-.msg-dialog-btn{
- margin-top: 30px;
- display: flex;
- justify-content: center;
}
.close-appointment-detail{
background-color: #fff;
@@ -256,4 +235,8 @@
justify-content: space-between;
flex: 1;
}
+.hope-contact-time__line {
+ border-bottom: 1px solid #CCCCCC;
+}
+
</style>
--
Gitblit v1.8.0