From 17c4bad56fd902184f7c037dbdb22fd63289d1e7 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期二, 25 一月 2022 16:21:42 +0800
Subject: [PATCH] fixed: TODO#134613 [顧問管理流程] 搜尋欄位清空 , 未顯示原本的約訪中列表

---
 PAMapp/pages/myAppointmentList/appointmentList.vue |   57 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/PAMapp/pages/myAppointmentList/appointmentList.vue b/PAMapp/pages/myAppointmentList/appointmentList.vue
index 57e3080..e623916 100644
--- a/PAMapp/pages/myAppointmentList/appointmentList.vue
+++ b/PAMapp/pages/myAppointmentList/appointmentList.vue
@@ -5,9 +5,9 @@
             placeholder="隢撓���摮�"
             class="mb-30 pam-clientReserved-input"
             v-model="keyWord"
-            @keyup.enter.native="search"
+            @input="search"
         >
-            <i slot="suffix" class="icon-search search cursor--pointer" @click="search"></i>
+            <i slot="suffix" class="icon-search search cursor--pointer"></i>
         </el-input>
 
         <ClientList
@@ -24,26 +24,33 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, State, Watch, namespace } from 'nuxt-property-decorator';
+import { Vue, Component, Watch, namespace } from 'nuxt-property-decorator';
 
 import { Appointment } from '~/shared/models/appointment.model';
+import { ContactStatus } from '~/shared/models/enum/contact-status';
 
 
-const localStorage = namespace('localStorage');
+const localStorage     = namespace('localStorage');
+const appointmentStore = namespace('appointment.store');
 @Component
 export default class ClientReservedList extends Vue {
 
-    @State('myAppointmentList')
+    @appointmentStore.State('myAppointmentList')
     myAppointmentList!: Appointment[];
 
     @localStorage.Getter
     currentAppointmentIdFromMsg!: string;
 
-    appointmentList: Appointment[] = [];
-    filterList     : Appointment[] = [];
-    keyWord        : string       = '';
-    pageList       : Appointment[] = [];
-    currentPage    : number = 1;
+    @appointmentStore.Action
+    getAppointmentDetail!: () => Promise<Appointment>;
+
+    appointmentList: Appointment[]  = [];
+    currentPage     : number        = 1;
+    filterList      : Appointment[] = [];
+    keyWord         : string        = '';
+    pageList        : Appointment[] = [];
+
+    contactStatus  = ContactStatus;
 
     //////////////////////////////////////////////////////////////////////
 
@@ -55,23 +62,11 @@
 
     @Watch('myAppointmentList')
     onMyAppointmentListChange(): void {
-      const unViewList = this.myAppointmentList
-          .filter((item) => item.communicateStatus !== 'contacted' && !item.consultantViewTime)
-          .map((item) => ({ ...item, sortTime: new Date(item.appointmentDate)}))
+      this.appointmentList = this.myAppointmentList
+          .filter(item => item.communicateStatus === this.contactStatus.RESERVED)
+          .map((item) => ({ ...item, sortTime: new Date(item.lastModifiedDate)}))
           .sort((preItem, nextItem) => +nextItem.sortTime - +preItem.sortTime);
 
-      const tempViewList = this.myAppointmentList
-          .filter(item => item.communicateStatus !== 'contacted' && item.consultantViewTime);
-
-      // TODO: 敺������� unreadList ��蝝啁溶�������隢�垢����靘������ createTime嚗�Tomas, 2021/12/16];疇
-      const unreadList = tempViewList
-                    .filter((item) => !item.consultantReadTime);
-      const readList = tempViewList
-                    .filter((item) => item.consultantReadTime)
-                    .map((item) => ({ ...item, sortTime: new Date(item.consultantReadTime)}))
-                    .sort((preItem, nextItem) => +nextItem.sortTime - +preItem.sortTime);
-
-      this.appointmentList = [...unViewList, ...unreadList, ...readList];
       this.filterList = this.appointmentList;
 
       this.getCurrentPage();
@@ -87,10 +82,16 @@
     }
 
     //////////////////////////////////////////////////////////////////////
+
     search(): void {
-        this.filterList = this.appointmentList.filter(item => {
-            return item.name.match(this.keyWord) || item.requirement.match(this.keyWord)
-        })
+        if (this.keyWord) {
+            this.filterList = this.appointmentList.filter(item => {
+                return item.name.match(this.keyWord) || item.requirement.match(this.keyWord);
+            })
+        } else {
+            this.filterList = this.appointmentList;
+        }
+
     }
 
     changePage(pageList: Appointment[]): void {

--
Gitblit v1.9.3