From dc0e7366e96ce773ae1690f6db28e03a684bb45e Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期二, 18 一月 2022 19:50:12 +0800
Subject: [PATCH] Merge branch 'Phase3' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into Phase3

---
 PAMapp/pages/myAppointmentList.vue |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/PAMapp/pages/myAppointmentList.vue b/PAMapp/pages/myAppointmentList.vue
index 0ced7e5..3735ecf 100644
--- a/PAMapp/pages/myAppointmentList.vue
+++ b/PAMapp/pages/myAppointmentList.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <div class="pam-myAppointment-banner"></div>
+    <InterviewNotification></InterviewNotification>
         <div class="pam-container">
             <div class="pam-cus-tabs mb-30">
                 <div
@@ -15,7 +15,7 @@
                     :class="{'is-active': activeTabName === 'contactedList'}"
                     @click="clickTab('contactedList')"
                 >
-                  <span class="smTxt">蝝赤銝�({{ appointmentList.length }})</span>
+                  <span class="smTxt">蝝赤銝�({{ contactedList.length }})</span>
                 </div>
                 <div
                     class="cus-tab-item"
@@ -110,13 +110,18 @@
         }
     }
 
-    // TODO: 隤踵蝔�Ⅳ [Tomas, 2022/1/14 12:02]
     private redirectAppointmentStatus() {
         const currentAppointmentIndex = this.myAppointmentList
             .findIndex(item => item.id === +this.currentAppointmentIdFromMsg);
         if (currentAppointmentIndex > -1) {
             const communicateStatus = this.myAppointmentList[currentAppointmentIndex].communicateStatus;
-            const pathName = communicateStatus === 'reserved' ? 'appointmentList' : 'closedList';
+            let pathName = 'closedList'
+            if (communicateStatus === this.contactStatus.RESERVED || communicateStatus === this.contactStatus.PICKED) {
+              pathName = 'contactedList';
+            }
+            if (communicateStatus === this.contactStatus.CONTACTED) {
+              pathName = 'contactedList';
+            }
             this.$router.push(
                 {
                     path: '/myAppointmentList/' + pathName,

--
Gitblit v1.8.0