From 66f726b6643e85cd6ec0041d01b31d38b3803c1a Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 26 一月 2022 10:56:05 +0800
Subject: [PATCH] add#134789: [顧問] 過久未回應的預約單流程

---
 PAMapp/components/Consultant/ConsultantCard.vue |   71 +++++++++++++++++++++++++++++++----
 1 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 63ce8b8..b154bf8 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -31,7 +31,7 @@
                 <div
                     class="delete"
                     v-if="showRemoveBtn"
-                    @click="removeAgent"
+                    @click="isRemoveAgentPopup = true"
                 >蝘駁</div>
                 <div
                     v-if="notScoreAppointmentYet"
@@ -125,10 +125,18 @@
             </div>
         </PopUpFrame>
 
-        <PopUpFrame :isOpen.sync="isConfirmPopup">
-            <div class="text--center mdTxt">撌脫����迨蝑���</div>
+        <PopUpFrame  :isOpen.sync="isConfirmPopup">
+            <div class="text--center mdTxt">撌脫��{confirmTxt}}</div>
             <div class="text--center mt-30">
                 <el-button @click="isConfirmPopup = false" type="primary">蝣箏��</el-button>
+            </div>
+        </PopUpFrame>
+
+        <PopUpFrame :isOpen.sync="isRemoveAgentPopup">
+            <div class="text--center mdTxt">��蝘駁憿批�� <span class="text--primary">{{agentInfo.name}}</span>嚗�</div>
+            <div class="text--center mt-30">
+                <el-button @click="isRemoveAgentPopup = false">�</el-button>
+                <el-button @click="removeAgent" type="primary">�</el-button>
             </div>
         </PopUpFrame>
     </div>
@@ -181,6 +189,8 @@
     isCancelPopup = false;
     hideReviews = hideReviews;
     isConfirmPopup = false;
+    isRemoveAgentPopup = false;
+    confirmTxt = '';
 
     appointmentDetail: any = {
         age               : '',
@@ -208,16 +218,16 @@
     get notScoreAppointmentYet(): boolean {
       const isAppointment = !!this.agentInfo['appointmentStatus'];
       if (!isAppointment) return false;
-      return !this.agentInfo['appointmentScore'];
+      return this.agentInfo['appointmentStatus'] !== 'contacted' ? !this.agentInfo['appointmentScore'] : false;
     }
 
     get isAppointment(): boolean {
       return !!this.agentInfo['appointmentStatus'];
     }
 
-    get latestReservedAppointment(): Appointment {
+    get latestNotClosedAppointment(): Appointment {
         return this.agentInfo.appointments!
-                .filter((appointment) => appointment.communicateStatus !== 'contacted')
+                .filter((appointment) => appointment.communicateStatus === 'reserved' || appointment.communicateStatus === 'contacted')
                 .map((reversedAppointment) => {
                     return {
                     ...reversedAppointment,
@@ -255,6 +265,12 @@
         if (this.agentInfo['appointmentStatus'] === 'reserved') {
             return '撌脤���';
         }
+        if (this.agentInfo['appointmentStatus'] === 'done') {
+            return '撌脫�漱';
+        }
+        if (this.agentInfo['appointmentStatus'] === 'closed') {
+            return '���漱';
+        }
       } else {
         if (this.agentInfo.contactStatus === 'contacted') {
             return '撌脰蝯�';
@@ -274,6 +290,12 @@
         }
         if (this.agentInfo['appointmentStatus'] === 'reserved') {
             return 'reservedBtn';
+        }
+        if (this.agentInfo['appointmentStatus'] === 'done') {
+            return 'doneBtn';
+        }
+        if (this.agentInfo['appointmentStatus'] === 'closed') {
+            return 'closedBtn';
         }
       } else {
         if (this.agentInfo.contactStatus === 'contacted') {
@@ -313,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 = {
@@ -327,6 +349,12 @@
 
     removeAgent() {
         this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
+            this.isRemoveAgentPopup = false;
+            setTimeout(() => {
+                this.confirmTxt = '蝘駁憿批��';
+                this.isConfirmPopup = true;
+            }, 300);
+
         });
     }
 
@@ -338,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,
@@ -353,12 +381,14 @@
     }
 
     cancel() {
-        appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
+        appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => {
             this.storeConsultantList();
             this.isVisibleDialog = false;
             this.isCancelPopup = false;
             setTimeout(() => {
+                this.confirmTxt = '���迨蝑���';
                 this.isConfirmPopup = true;
+
             }, 300);
         });
     }
@@ -410,6 +440,7 @@
         }
 
         .delete {
+            display: inline-block;
             color: $PRIMARY_RED;
             font-size: 14px;
             font-weight: bold;
@@ -438,6 +469,28 @@
             }
         }
 
+        .doneBtn {
+            color: $BEIGE;
+            border-color: $BEIGE;
+
+            &:focus {
+                color: $PRIMARY_WHITE;
+                background-color: $BEIGE;
+                opacity: 0.5;
+            }
+        }
+
+        .closedBtn {
+            color: $PRUDENTIAL_GREY;
+            border-color: $PRUDENTIAL_GREY;
+
+            &:focus {
+                color: $PRIMARY_WHITE;
+                background-color: $PRUDENTIAL_GREY;
+                opacity: 0.5;
+            }
+        }
+
         .updateTime {
             font-size: 12px;
             font-weight: bold;

--
Gitblit v1.8.0