From 46da7429ca192bf6a947d79437e8076b94676a05 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 13 一月 2022 16:29:45 +0800
Subject: [PATCH] update: 刪除重複的 interface: clientInfo => appointment

---
 PAMapp/pages/myAppointmentList.vue |   76 ++++++++++++++++++++++++++++---------
 1 files changed, 57 insertions(+), 19 deletions(-)

diff --git a/PAMapp/pages/myAppointmentList.vue b/PAMapp/pages/myAppointmentList.vue
index e38c17e..286ea92 100644
--- a/PAMapp/pages/myAppointmentList.vue
+++ b/PAMapp/pages/myAppointmentList.vue
@@ -7,19 +7,26 @@
                     class="cus-tab-item"
                     :class="{'is-active': activeTabName === 'appointmentList'}"
                     @click="clickTab('appointmentList')"
-                >摰Ｘ����
-                    <span class="p">({{appointmentList.length}})</span>
+                >
+                  <span class="smTxt">��蝯�({{ appointmentList.length }})</span>
+                </div>
+                <div
+                    class="cus-tab-item"
+                    :class="{'is-active': activeTabName === 'onProgressList'}"
+                    @click="clickTab('onProgressList')"
+                >
+                  <span class="smTxt">蝝赤銝�({{ appointmentList.length }})</span>
                 </div>
                 <div
                     class="cus-tab-item"
                     :class="{'is-active': activeTabName === 'contactedList'}"
                     @click="clickTab('contactedList')"
-                >撌脰蝯�
-                    <span class="p">({{contactedList.length}})</span>
+                >
+                  <span class="smTxt">蝯��({{ contactedList.length }})</span>
                 </div>
             </div>
 
-            <NuxtChild></NuxtChild>
+            <NuxtChild keep-alive></NuxtChild>
 
         </div>
 
@@ -28,7 +35,7 @@
              :isOpen.sync="showNewAppointmentHint"
         >
             <div class="text--center mdTxt">
-                <p class="mb-50">雿�� <span class="text--primary">{{ newAppointmentSum }}</span> �������</p>
+                <p class="mb-50">���� <span class="text--primary">{{ newAppointmentSum }}</span> �������</p>
                 <div class="text--center">
                     <el-button
                         type="primary"
@@ -41,20 +48,22 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, State, Action, Watch } from 'nuxt-property-decorator';
+import { Vue, Component, State, Action, Watch, namespace } from 'nuxt-property-decorator';
 
 import * as _ from 'lodash';
 
-import { ClientInfo } from '~/shared/models/client.model';
+import { Appointment } from '~/shared/models/appointment.model';
+
+const localStorage = namespace('localStorage');
 
 @Component({
     layout: 'home',
-    middleware: 'myAppointmentMiddleware'
+    middleware: 'myAppointment'
 })
 export default class ClientReservedList extends Vue {
 
     @State('myAppointmentList')
-    myAppointmentList!: ClientInfo[];
+    myAppointmentList!: Appointment[];
 
     @State('myNewAppointmentSum')
     newAppointmentSum!: number;
@@ -62,24 +71,26 @@
     @Action
     storeMyAppointmentList!: () => Promise<number>;
 
+    @localStorage.Mutation
+    storageClearAppointmentIdFromMsg!: () => void;
+
+    @localStorage.Getter
+    currentAppointmentIdFromMsg!: string;
+
     activeTabName         : string       = 'appointmentList';
-    appointmentList       : ClientInfo[] = [];
-    clients               : ClientInfo[] = [];
-    contactedList         : ClientInfo[] = [];
+    appointmentList       : Appointment[] = [];
+    clients               : Appointment[] = [];
+    contactedList         : Appointment[] = [];
     showNewAppointmentHint: boolean      = false;
 
     //////////////////////////////////////////////////////////////////////
 
     mounted() {
-      this.setActivatedTab();
       this.storeMyAppointmentList();
     }
 
-    private setActivatedTab(): void {
-      const routeFullName = this.$route.name;
-      if (routeFullName) {
-        this.activeTabName = routeFullName.split('-')[1];
-      }
+    destroyed() {
+        this.storageClearAppointmentIdFromMsg();
     }
 
     //////////////////////////////////////////////////////////////////////
@@ -91,13 +102,40 @@
 
         this.appointmentList = this.myAppointmentList
             .filter(item => item.communicateStatus !== 'contacted');
+
+        if (this.currentAppointmentIdFromMsg) {
+            this.redirectAppointmentStatus();
+        }
     }
+
+    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' : 'contactedList';
+            this.$router.push(
+                {
+                    path: '/myAppointmentList/' + pathName,
+                    query: {appointmentId: this.currentAppointmentIdFromMsg}
+                }
+            );
+        }
+    };
 
     @Watch('newAppointmentSum')
     newAppointmentSumChange(): void {
       this.showNewAppointmentHint = this.newAppointmentSum > 0;
     }
 
+    @Watch('$route', {immediate: true})
+    onRouteChange() {
+        const routeFullName = this.$route.name;
+        if (routeFullName) {
+            this.activeTabName = routeFullName.split('-')[1];
+        }
+    }
+
     //////////////////////////////////////////////////////////////////////
 
     clickTab(path: string): void {

--
Gitblit v1.8.0