From 8b822da7e688aa31e4600f9ea17a0e85f9985c06 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 10:20:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/Client/ClientCard.vue | 57 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 477cf7f..23f9ec1 100644
--- a/PAMapp/components/Client/ClientCard.vue
+++ b/PAMapp/components/Client/ClientCard.vue
@@ -51,14 +51,15 @@
<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>
+ <p>��瘙�{client.requirement.replace(',', '��')}}</p>
+ <p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
<div class="mt-30 text--center" v-if="isReserved">
- <el-button>璅酉�撌脤��蝯�</el-button>
+ <el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
</div>
+
</div>
</Ui-Dialog>
</div>
@@ -66,10 +67,19 @@
<script lang="ts">
import { Vue, Component, Prop } from 'nuxt-property-decorator';
-import { ClientInfo } from '~/assets/ts/api/consultant';
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];
+ }
+ }
+ }
+})
export default class ClientList extends Vue {
@Prop() client!: ClientInfo;
isVisibleDialog = false;
@@ -79,27 +89,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 - 1));
+ return contactList.filter(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() {
@@ -111,6 +120,10 @@
this.isVisibleDialog = true;
}
+ markAppointment() {
+ markAsContact(this.client.id).then(res => this.$router.go(0))
+ }
+
}
</script>
--
Gitblit v1.8.0