From 9cb6d5f92ad7aeda45ad1fe6482dcfc63d17be2b Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期一, 06 十二月 2021 12:35:26 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

---
 PAMapp/pages/myAppointmentList/contactedList.vue |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/PAMapp/pages/myAppointmentList/contactedList.vue b/PAMapp/pages/myAppointmentList/contactedList.vue
index de75b31..15954b7 100644
--- a/PAMapp/pages/myAppointmentList/contactedList.vue
+++ b/PAMapp/pages/myAppointmentList/contactedList.vue
@@ -5,6 +5,7 @@
             placeholder="隢撓���摮�"
             class="mb-30 pam-clientReserved-input"
             v-model="keyWord"
+            @keyup.enter.native="search"
         >
             <i
                 slot="suffix"
@@ -26,18 +27,28 @@
 </template>
 
 <script lang="ts">
-import { Vue, Component, Prop } from 'nuxt-property-decorator';
+import { Vue, Component, Watch, State } from 'nuxt-property-decorator';
 import { ClientInfo } from '~/assets/ts/api/appointment';
 
 @Component
 export default class ClientContactedList extends Vue {
-    @Prop({default: []}) contactedList!: ClientInfo[];
+    @State('myAppointmentList') myAppointmentList!: ClientInfo[];
+
+    contactedList: ClientInfo[] = [];
     pageList: ClientInfo[] = [];
     keyWord: string = '';
     filterList: ClientInfo[] = [];
 
+    @Watch('myAppointmentList')
+    onMyAppointmentListChange() {
+        this.contactedList = (this.myAppointmentList || [])
+            .filter(item => item.communicateStatus === 'contacted')
+            .sort((a, b) => a.contactTime > b.contactTime ? -1 : 1);
+        this.filterList = this.contactedList;
+    }
+
     mounted() {
-        this.filterList = JSON.parse(JSON.stringify(this.contactedList));
+        this.onMyAppointmentListChange();
     }
 
     changePage(pageList: ClientInfo[]) {

--
Gitblit v1.8.0