From e05f762bc8bd7e93db954a748bf15dd2dcb4b0d9 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 19 十一月 2021 18:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/Client/ClientCard.vue | 96 +++++++++++++++++++++++++++++++++---------------
1 files changed, 66 insertions(+), 30 deletions(-)
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 477cf7f..1fffe7c 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -1,11 +1,11 @@
<template>
<div>
- <el-row type="flex" class="rowStyle">
+ <el-row type="flex" class="rowStyle" @click.native="openDetail">
<el-col :xs="5" :sm="3">
<el-avatar
:size="50"
src=""
- class="cursor--pointer"
+ class="cursor--pointer fix-chrome-click--issue"
></el-avatar>
<!-- <div class="satisfaction">
<i class="icon-star pam-icon icon--yellow satisfaction"></i>
@@ -30,9 +30,8 @@
</div>
</el-col>
<el-col class="flex-column contactInfo" :xs="5" :sm="6">
- <div class="smTxt_bold cursor--pointer"
+ <div class="smTxt_bold cursor--pointer fix-chrome-click--issue"
:class="client.communicateStatus"
- @click="openDetail"
>{{isReserved ? '撌脤���' : '撌脰蝯�'}}
</div>
<div class="date xsTxt text--mid_grey">{{date}}</div>
@@ -43,6 +42,7 @@
<Ui-Dialog
:isVisible.sync="isVisibleDialog"
:width="width"
+ class="pam-myDemand-dialog"
>
<h5 class="subTitle text--center mb-30"
>{{isReserved ? '������' : '撌脰蝯∟���'}}</h5>
@@ -51,26 +51,46 @@
<p>憪��{client.name}}</p>
<p>�閰梧�{client.phone}}</p>
<p>Email嚗{client.email}}</p>
- <p>�批嚗{client.gender === 'male' ? '���' : '憟單��'}}</p>
+ <p>�批嚗{gender}}</p>
<p>撟湧翩嚗{client.age}}</p>
<p>�璆哨�{client.job}}</p>
- <p>��瘙�{client.requirements}}</p>
- <p>��蝯⊥�挾銝�嚗{hopeContactTime}}</p>
- <div class="mt-30 text--center" v-if="isReserved">
- <el-button>璅酉�撌脤��蝯�</el-button>
+ <p>��瘙�{client.requirement.split(',').join('��')}}</p>
+ <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime}}</p>
</div>
- </div>
+ <div class="mt-30 text--center" v-if="isReserved">
+ <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
+ </div>
</Ui-Dialog>
</div>
</template>
<script lang="ts">
-import { Vue, Component, Prop } from 'nuxt-property-decorator';
-import { ClientInfo } from '~/assets/ts/api/consultant';
+import { Vue, Component, Prop, Mutation, Action } from 'nuxt-property-decorator';
import { isMobileDevice } from '~/assets/ts/device';
+import { ClientInfo, markAsContact } from '~/assets/ts/api/appointment';
-@Component
+@Component({
+ filters: {
+ formatNumber(index: number) {
+ if (index) {
+ const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���']
+ return upperNumber[index];
+ }
+ },
+ formatHopeContactTime(item: string): string {
+ if (item) {
+ const [hopeDay, hopeTime] = item.split('��');
+ const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay;
+ const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime;
+ return `${day}��${time}`;
+ }
+ return '';
+ }
+ }
+})
export default class ClientList extends Vue {
+ @Action updateMyAppointment!: (data: ClientInfo) => void
+
@Prop() client!: ClientInfo;
isVisibleDialog = false;
width = '';
@@ -79,27 +99,26 @@
return this.client.requirement.split(',');
}
- get hopeContactTime() {
- return this.client.hopeContactTime.slice(1, this.client.hopeContactTime.length - 1)
- }
- get time() {
- if (this.client.appointmentDate) {
- const newDate = new Date(this.client.appointmentDate);
- const hours = newDate.getHours();
- const minutes = newDate.getMinutes();
- return `${hours} : ${minutes}`
+ get gender() {
+ if (this.client.gender) {
+ return this.client.gender === 'male' ? '���' : '憟單��';
}
return ''
}
+ get hopeContactTime() {
+ const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length));
+ return contactList.filter(item => !!item && item !== ",")
+ }
+
+ get time() {
+ const formatDate = (this.$options.filters as any).formatDate(this.client.appointmentDate);
+ return formatDate.split(' ')[1]
+ }
+
get date() {
- if (this.client.appointmentDate) {
- const newDate = new Date(this.client.appointmentDate);
- const month = newDate.getMonth();
- const date = newDate.getDate();
- return `${month} / ${date}`
- }
- return ''
+ const formatDate = (this.$options.filters as any).formatDate(this.client.appointmentDate);
+ return formatDate.split(' ')[0]
}
get isReserved() {
@@ -109,6 +128,20 @@
openDetail() {
this.width = isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
+ }
+
+ markAppointment() {
+ markAsContact(this.client.id).then(data => {
+ // TODO: 閬敺����� updated client 鞈�� - Ben 2021/11/16
+
+ const updatedClient = {...this.client};
+ updatedClient.communicateStatus = 'contacted';
+ updatedClient.appointmentDate = new Date();
+
+ this.updateMyAppointment(updatedClient);
+ this.isVisibleDialog = false;
+
+ })
}
}
@@ -173,9 +206,12 @@
.dialogTxt {
font-size: 20px;
+ overflow-y:scroll;
+ height:400px;
}
+
.text-right {
text-align: right;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0