From 9bdb95c9e34cef640534e5e5a1e2225a80442000 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期四, 09 六月 2022 15:48:15 +0800 Subject: [PATCH] TODO#139894 [ footer -最下方說明與保經代合作 ] 文案修改 --- PAMapp/pages/myAppointmentList/contactedList.vue | 122 +++++++++++++++++++++++++++++++++------- 1 files changed, 99 insertions(+), 23 deletions(-) diff --git a/PAMapp/pages/myAppointmentList/contactedList.vue b/PAMapp/pages/myAppointmentList/contactedList.vue index dbd8232..5be7e6f 100644 --- a/PAMapp/pages/myAppointmentList/contactedList.vue +++ b/PAMapp/pages/myAppointmentList/contactedList.vue @@ -5,51 +5,62 @@ 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> </el-input> + + <div class="mb-10 sort-indicator-container"> + <a class="sort-indicator cursor--pointer" @click="changeSortType"> + {{ this.sortType === 'DESC' ? '�->���' : '���->�' }} + <i v-if="isSortType" class="icon-sort-add"></i> + <i v-else class="icon-sort-decrease"></i> + </a> + </div> <ClientList :clients="pageList" :title="'contactedList'" + class="mt-10" ></ClientList> <UiPagination + v-if="togglePagination" :totalList="filterList" + :currentPage="currentPage" @changePage="changePage" ></UiPagination> </div> </template> <script lang="ts"> -import { Vue, Component, Watch, State } from 'nuxt-property-decorator'; +import { Vue, Component, Watch, namespace } from 'nuxt-property-decorator'; -import { ClientInfo } from '~/assets/ts/models/client.model'; +import { Appointment } from '~/shared/models/appointment.model'; + + +const appointmentStore = namespace('appointment.store'); +const localStorage = namespace('localStorage'); @Component export default class ClientContactedList extends Vue { - @State('myAppointmentList') - myAppointmentList!: ClientInfo[]; + @appointmentStore.State('myAppointmentList') + myAppointmentList!: Appointment[]; - @Watch('myAppointmentList') - onMyAppointmentListChange() { - this.contactedList = (this.myAppointmentList || []) - .filter(item => item.communicateStatus === 'contacted') - .map((item) => ({...item, sortTime: new Date(item.contactTime)})) - .sort((prevItem, nextItem) => +nextItem - +prevItem); - this.filterList = this.contactedList; - } + @localStorage.Getter + currentAppointmentIdFromMsg!: string; - contactedList: ClientInfo[] = []; - pageList: ClientInfo[] = []; - keyWord: string = ''; - filterList: ClientInfo[] = []; + contactedList : Appointment[] = []; + currentPage : number = 1; + filterList : Appointment[] = []; + keyWord : string = ''; + pageList : Appointment[] = []; + sortType : 'ASC' | 'DESC' = 'DESC'; + togglePagination: boolean = true; ////////////////////////////////////////////////////////////////////// @@ -59,15 +70,80 @@ ////////////////////////////////////////////////////////////////////// - search(): void { - this.filterList = this.contactedList.filter(item => { - return item?.name?.match(this.keyWord) || item?.requirement?.match(this.keyWord) - }) + @Watch('myAppointmentList') + onMyAppointmentListChange() { + this.setContactedList(); } - changePage(pageList: ClientInfo[]): void { + @Watch('sortType') + onSortTypeChange() { + this.togglePagination = false; + setTimeout(() => { + this.togglePagination = true; + this.currentPage = 1; + this.setContactedList(); + }, 0) + } + + private setContactedList(): void { + this.contactedList = (this.myAppointmentList || []) + .filter(item => item.communicateStatus === 'contacted') + .map((item) => ({...item, sortTime: new Date(item.lastModifiedDate)})) + .sort((prevItem, nextItem) => { + return this.sortType === 'DESC' ? +nextItem.sortTime - +prevItem.sortTime : +prevItem.sortTime - +nextItem.sortTime + }); + this.filterList = this.contactedList; + + this.getCurrentPage(); + } + + private getCurrentPage(): void { + const currentIndex = this.filterList.findIndex(item => item.id === +this.currentAppointmentIdFromMsg); + const pageSize = 5; + if (currentIndex > -1) { + this.currentPage = Math.ceil((currentIndex + 1) / pageSize); + } + } + + ////////////////////////////////////////////////////////////////////// + + search(): void { + if (this.keyWord) { + this.filterList = this.contactedList.filter(item => { + return item?.name?.match(this.keyWord) || item?.requirement?.match(this.keyWord) + }) + } else { + this.filterList = this.contactedList; + } + } + + changePage(pageList: Appointment[]): void { this.pageList = pageList; + } + + changeSortType(): void { + if (this.sortType === 'DESC') { + this.sortType = 'ASC'; + } else { + this.sortType = 'DESC'; + } + } + + get isSortType () :boolean { + return this.sortType === 'DESC'; } } </script> +<style lang="scss" scoped> +.sort-indicator-container{ + margin-bottom: 20px; +} +.sort-indicator{ + border-radius:30px; + border: 1px solid #D0D0CE; + background-color:#fff; + padding: 10px 20px; + color: #68737A; +} +</style> -- Gitblit v1.8.0