From aea193755a51a903a55c2854460edcb373a35cc2 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 27 一月 2022 08:30:58 +0800
Subject: [PATCH] fixed: [客戶-顧問清單] 沒有顯示最後更新日期的錯誤情形(commit# e2b8d02 的 side effect)

---
 PAMapp/components/Consultant/ConsultantCard.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 8ea5a64..416dcb8 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -45,7 +45,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 +57,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 +225,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 +335,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 +366,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 +381,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