From 9f843e9978cc4bff79e515a6ab929154d904fa46 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期五, 14 一月 2022 13:06:40 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/pages/myAppointmentList/closedList.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/PAMapp/pages/myAppointmentList/onProgressList.vue b/PAMapp/pages/myAppointmentList/closedList.vue
similarity index 90%
rename from PAMapp/pages/myAppointmentList/onProgressList.vue
rename to PAMapp/pages/myAppointmentList/closedList.vue
index e4de5e7..16cd405 100644
--- a/PAMapp/pages/myAppointmentList/onProgressList.vue
+++ b/PAMapp/pages/myAppointmentList/closedList.vue
@@ -16,7 +16,7 @@
<ClientList
:clients="pageList"
- :title="'contactedList'"
+ :title="'closedList'"
></ClientList>
<UiPagination
@@ -31,6 +31,7 @@
import { Vue, Component, Watch, State, namespace } from 'nuxt-property-decorator';
import { Appointment } from '~/shared/models/appointment.model';
+import { ContactStatus } from '~/shared/models/enum/contact-status';
const localStorage = namespace('localStorage');
@@ -48,6 +49,7 @@
keyWord : string = '';
pageList : Appointment[] = [];
currentPage : number = 1;
+ contactStatus= ContactStatus;
//////////////////////////////////////////////////////////////////////
@@ -60,7 +62,7 @@
@Watch('myAppointmentList')
onMyAppointmentListChange() {
this.contactedList = (this.myAppointmentList || [])
- .filter(item => item.communicateStatus === 'contacted')
+ .filter(item => item.communicateStatus === this.contactStatus.DONE || item.communicateStatus === this.contactStatus.CLOSE)
.map((item) => ({...item, sortTime: new Date(item.contactTime)}))
.sort((prevItem, nextItem) => +nextItem.sortTime - +prevItem.sortTime);
this.filterList = this.contactedList;
--
Gitblit v1.8.0