From 51ad8fa1584f5159bc9afe750ada3f42cb6b6728 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 17 十一月 2021 10:31:00 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
PAMapp/components/Client/ClientCard.vue | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/PAMapp/components/Client/ClientCard.vue b/PAMapp/components/Client/ClientCard.vue
index 23f9ec1..ec0d0b2 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>
@@ -56,17 +55,16 @@
<p>�璆哨�{client.job}}</p>
<p>��瘙�{client.requirement.replace(',', '��')}}</p>
<p v-for="(item, index) in hopeContactTime" :key="index">��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+ </div>
<div class="mt-30 text--center" v-if="isReserved">
<el-button @click="markAppointment">璅酉�撌脤��蝯�</el-button>
</div>
-
- </div>
</Ui-Dialog>
</div>
</template>
<script lang="ts">
-import { Vue, Component, Prop } from 'nuxt-property-decorator';
+import { Vue, Component, Prop, Mutation, Action } from 'nuxt-property-decorator';
import { isMobileDevice } from '~/assets/ts/device';
import { ClientInfo, markAsContact } from '~/assets/ts/api/appointment';
@@ -81,6 +79,8 @@
}
})
export default class ClientList extends Vue {
+ @Action updateMyAppointment!: (data: ClientInfo) => void
+
@Prop() client!: ClientInfo;
isVisibleDialog = false;
width = '';
@@ -97,7 +97,7 @@
}
get hopeContactTime() {
- const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length - 1));
+ const contactList = this.client.hopeContactTime.split("'").map(item => item.slice(0, item.length));
return contactList.filter(item => !!item)
}
@@ -121,7 +121,17 @@
}
markAppointment() {
- markAsContact(this.client.id).then(res => this.$router.go(0))
+ 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;
+
+ })
}
}
@@ -186,7 +196,10 @@
.dialogTxt {
font-size: 20px;
+ overflow:scroll;
+ height:400px;
}
+
.text-right {
text-align: right;
--
Gitblit v1.8.0