From 0e27da107dd3329b4d0c11ce7d0173c3bd1358e9 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期三, 19 一月 2022 19:06:52 +0800 Subject: [PATCH] Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3 --- PAMapp/components/Client/ClientCard.vue | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue index 2d417e0..f203dd0 100644 --- a/PAMapp/components/Client/ClientCard.vue +++ b/PAMapp/components/Client/ClientCard.vue @@ -170,7 +170,7 @@ </template> <script lang="ts"> -import { Vue, Component, Prop, Action, namespace, Watch } from 'nuxt-property-decorator'; +import { Vue, Component, Prop, namespace, Watch } from 'nuxt-property-decorator'; import appointmentService from '~/shared/services/appointment.service'; import myConsultantService from '~/shared/services/my-consultant.service'; @@ -180,7 +180,9 @@ import { Appointment, AppointmentMemoInfo } from '~/shared/models/appointment.model'; import { ContactStatus } from '~/shared/models/enum/contact-status'; -const localStorage = namespace('localStorage'); +const appointmentStore = namespace('appointment.store'); +const localStorage = namespace('localStorage'); + @Component({ filters: { formatNumber(index: number) { @@ -201,11 +203,17 @@ } }) export default class ClientList extends Vue { - @Action - updateMyAppointment!: (data: Appointment) => void; - @Prop() client!: Appointment; + + @appointmentStore.Action + updateMyAppointmentList!: (data: Appointment) => void; + + @appointmentStore.Action + getAppointmentDetail!: (appointmentId: number) => Promise<Appointment>; + + @appointmentStore.Getter + appointmentProgress!: ContactStatus; @localStorage.Mutation storageClearAppointmentIdFromMsg!: () => void; @@ -248,7 +256,9 @@ ////////////////////////////////////////////////////////////////////// viewAppointmentDetail(): void { - this.$router.push(`/appointment/${this.client.id}`); + this.getAppointmentDetail(this.client.id).then((_) => { + this.$router.push(`/appointment/${this.client.id}`); + }); } showAddInterviewDialog(): void { @@ -257,10 +267,6 @@ navigateToCloseAppointment(): void { this.$router.push(`/appointment/${this.client.id}/close`); - } - - makeAppointment(): void { - alert('MAKE AN APPOINTMENT!'); } inviteReview(): void { @@ -277,7 +283,7 @@ markAppointment() { myConsultantService.markAsContact(this.client.id).then(data => { - this.updateMyAppointment(data); + this.updateMyAppointmentList(data); this.isShowInformDialog = false; }) } @@ -288,7 +294,7 @@ appointmentService.recordRead(this.client.id).then((_) => { const updatedClient = {...this.client}; updatedClient.consultantReadTime = new Date().toString(); - this.updateMyAppointment(updatedClient); + this.updateMyAppointmentList(updatedClient); }); }; this.isEdit = false; @@ -349,7 +355,7 @@ this.memo = this.memoInfo.content; } - get newAppointment(): boolean { + get newAppointment(): boolean { return !this.client.consultantViewTime && this.client.communicateStatus === 'reserved'; } -- Gitblit v1.8.0