From b4d6944076f1df6eedaae35c4c2a7072fe988e8a Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期二, 30 四月 2024 15:34:02 +0800 Subject: [PATCH] update: package-lock.json --- PAMapp/components/Client/ClientCard.vue | 65 +++++++++++++++++++++++--------- 1 files changed, 47 insertions(+), 18 deletions(-) diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue index 6afbe92..5889940 100644 --- a/PAMapp/components/Client/ClientCard.vue +++ b/PAMapp/components/Client/ClientCard.vue @@ -54,7 +54,6 @@ ></el-avatar> <div class="satisfaction" v-if="!hideReviews"> <template v-if="client.satisfactionScore"> - TODO:���遛��漲 <i class="icon-star pam-icon icon--yellow satisfaction"></i> <span>{{client.satisfactionScore}}</span> </template> @@ -78,12 +77,12 @@ v-else-if="client.communicateStatus === contactStatus.CONTACTED"> 蝯�� </div> - <div + <!-- <div class="invite-msg smTxt_bold" @click.stop="inviteReview" v-else-if="!client.satisfactionScore"> ��遛��漲 - </div> + </div> --> <div class="date xsTxt text--black" @@ -119,7 +118,8 @@ <p>�批嚗�<span>{{gender}}</span></p> <p>撟湧翩嚗�<span>{{client.age | toAgeLabel }}</span></p> <p>�璆哨��<span>{{client.job}}</span></p> - <p>��瘙��<span>{{client.requirement.split(',').join('��')}}</span></p> + <p>隢株岷�撘��<span>{{client.consultationMethod | toConsultationMethod }}</span></p> + <p>��瘙��<span>{{ client.requirement ? client.requirement.split(',').join('��') : '--' }}</span></p> <p v-for="(item, index) in hopeContactTime" :key="index" >��蝯⊥�挾{{index + 1 | formatNumber}}嚗�<span>{{ item | formatHopeContactTime}}</span></p> @@ -179,6 +179,7 @@ import { ElRow } from 'element-ui/types/row'; import { Appointment, AppointmentMemoInfo } 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'); const localStorage = namespace('localStorage'); @@ -210,7 +211,10 @@ updateMyAppointmentList!: (data: Appointment) => void; @appointmentStore.Action - setAppointmentDetail!: (appointmentId: number) => Promise<Appointment>; + getAppointmentDetail!: (appointmentId: number) => Promise<Appointment>; + + @appointmentStore.Action + updateAppointmentDetail!: (id: number) => Appointment; @appointmentStore.Getter appointmentProgress!: ContactStatus; @@ -256,7 +260,11 @@ ////////////////////////////////////////////////////////////////////// viewAppointmentDetail(): void { - this.setAppointmentDetail(this.client.id).then((_) => { + this.getAppointmentDetail(this.client.id).then((_) => { + const unread = !this.client.consultantReadTime; + if (unread) { + this.readAppointment(); + } this.$router.push(`/appointment/${this.client.id}`); }); } @@ -266,11 +274,15 @@ } navigateToCloseAppointment(): void { - this.$router.push(`/appointment/${this.client.id}/close`); + this.getAppointmentDetail(this.client.id).then((_) => { + this.$router.push(`/appointment/${this.client.id}/close`); + }); } inviteReview(): void { - this.isShowInviteReviewDialog = true ; + reviewsService.sendSatisfactionToClient(this.client.id).then(res => { + this.isShowInviteReviewDialog = true ; + }) } openDetail() { @@ -289,17 +301,29 @@ } closeInformDialog(): void { - const unread = !this.client.consultantReadTime; - if (unread) { - appointmentService.recordRead(this.client.id).then((_) => { - const updatedClient = {...this.client}; - updatedClient.consultantReadTime = new Date().toString(); - this.updateMyAppointmentList(updatedClient); - }); - }; + this.readAppointment(); this.isEdit = false; this.clearAppointmentIdFromMsg(); } + + private async readAppointment(): Promise<void> { + try { + const response = await appointmentService.recordRead(this.client.id); + if (response !== null) { + const updatedClient = { ...this.client }; + updatedClient.consultantReadTime = new Date().toString(); + this.updateMyAppointmentList(updatedClient); + this.updateAppointmentDetail(this.client.id); + } else { + throw new Error('appointmentService.recordRead returned null-like value.'); + } + } catch (error) { + console.error('An error occurred while reading appointment:', error); + // �隞亙甇方���隤斗����身�� + throw error; + } + } + private clearAppointmentIdFromMsg() { this.storageClearAppointmentIdFromMsg(); @@ -369,7 +393,7 @@ } get requirements() { - return this.client.requirement.split(','); + return this.client.requirement ? this.client.requirement.split(',') : []; } get gender() { @@ -451,10 +475,14 @@ .professionals { overflow : hidden; text-overflow: ellipsis; - white-space : nowrap; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; .professionalsTxt { font-size : 12px; margin-right: 5px; + + } .noProfessionalsTxt { color : $PRUDENTIAL_GREY; @@ -502,6 +530,7 @@ display: flex; } .invite-msg{ + width: 96px; color: $PRIMARY_RED; @extend .text--underline; } -- Gitblit v1.8.0