From 31f6ff0ebbf3d374e6e0acdeda72bccdd86de2d5 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期四, 10 二月 2022 14:16:15 +0800 Subject: [PATCH] update#134662: [ 顧問管理流程 ] 編輯顧問個人資料 : 所在地區,無產生選擇器 --- PAMapp/components/Consultant/ConsultantCard.vue | 39 ++++++++++++++++++++++----------------- 1 files changed, 22 insertions(+), 17 deletions(-) diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue index 8ea5a64..d318031 100644 --- a/PAMapp/components/Consultant/ConsultantCard.vue +++ b/PAMapp/components/Consultant/ConsultantCard.vue @@ -7,16 +7,21 @@ :agentNo="agentInfo.agentNo" @click.native="showAgentDetail(agentInfo.agentNo)" ></UiAvatar> - <!-- TODO:���遛��漲 --> - <div v-if="!hideReviews"> - <i class="icon-star pam-icon icon--yellow satisfaction" v-if="notScoreAppointmentYet"></i> - <span v-if="notScoreAppointmentYet"> - {{ agentInfo.satisfactionScore }} - </span> - <div class="unfilled text--center " - style="display:flex" - v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div> - <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span> + <div v-if="!hideReviews" style="display: flex; justify-content: flex-start; align-items: center; margin-top: 6px; font-size: 12px"> + <i class="icon-star pam-icon icon--yellow satisfaction" style="margin-top: 0"></i> + <template v-if="isAppointment"> + <span v-if="notScoreAppointmentYet"> + {{ agentInfo.satisfactionScore }} + </span> + <div class="unfilled text--center " + style="display:flex" + v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div> + </template> + <template v-else> + <span v-if="agentInfo.avgScore">{{ agentInfo.avgScore }}</span> + <span v-else>撠<br />皛踵�漲</span> + </template> + </div> </el-col> <el-col :xs="10" :sm="15"> @@ -45,7 +50,7 @@ :class="actionBtnStyle" >{{ actionBtnLabel }}</el-button> <div class="updateTime mt-10"> - {{ agentInfo.updateTime | formatDate }} + {{ (isAppointment ? agentInfo.appointmentLastModifiedDate : agentInfo.updateTime) | formatDate }} </div> </el-col> </el-row> @@ -57,7 +62,7 @@ > <div v-if="appointmentDetail"> <h5 class="subTitle text--center mb-30">������</h5> - <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p> + <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}} 撱箇��</p> <div class="reserved-info"> <p>憪��{appointmentDetail.name}}</p> <p>�閰梧�{appointmentDetail.phone}}</p> @@ -225,9 +230,9 @@ return !!this.agentInfo['appointmentStatus']; } - get latestReservedAppointment(): Appointment { + get latestNotClosedAppointment(): Appointment { return this.agentInfo.appointments! - .filter((appointment) => appointment.communicateStatus === 'reserved') + .filter((appointment) => appointment.communicateStatus === 'reserved' || appointment.communicateStatus === 'contacted') .map((reversedAppointment) => { return { ...reversedAppointment, @@ -335,7 +340,7 @@ const isAppointment = !!this.agentInfo['appointmentStatus']; const appointmentId = isAppointment ? this.agentInfo['appointmentId'] - : this.latestReservedAppointment.id; + : this.latestNotClosedAppointment.id; appointmentService.getAppointmentDetail(appointmentId!).then(res => { this.appointmentDetail = { @@ -366,7 +371,7 @@ const isAppointment = !!this.agentInfo['appointmentStatus']; const appointmentId = isAppointment ? this.agentInfo['appointmentId'] - : this.latestReservedAppointment.id; + : this.latestNotClosedAppointment.id; const reviewParams: UserReviewsConsultantsParams = { appointmentId: appointmentId, @@ -381,7 +386,7 @@ } cancel() { - appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => { + appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => { this.storeConsultantList(); this.isVisibleDialog = false; this.isCancelPopup = false; -- Gitblit v1.8.0