From 647946725fdb607c8dbcabf30e4a5a94eab2561c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 16 十一月 2021 18:17:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
PAMapp/components/Consultant/ConsultantCard.vue | 116 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 87 insertions(+), 29 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index d74a6eb..8ff803e 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -5,12 +5,11 @@
<el-col :xs="22" :sm="23">
<el-row type="flex">
<el-col class="flex_column" :xs="5" :sm="3">
- <el-avatar
+ <UiAvatar
:size="50"
- :src="agentInfo.img"
- class="cursor--pointer"
- @click.native="showAgentDetail(agentInfo.agentNo);"
- ></el-avatar>
+ :fileName="avatarFileName"
+ @click.native="showAgentDetail(agentInfo.agentNo)"
+ ></UiAvatar>
<div class="satisfaction">
<i class="icon-star pam-icon icon--yellow satisfaction"></i>
<span>{{agentInfo.avgScore }}</span>
@@ -21,14 +20,14 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(expertise, index) in agentInfo.expertise"
+ v-for="(expertise, index) in expertises"
:key="index"
>#{{expertise}}</span>
</div>
<div
class="delete"
- v-if="agentInfo.contactStatus !== 'reserved'
- || agentInfo.contactStatus !== 'contacted'"
+ v-if="agentInfo.contactStatus === 'picked'
+ || !agentInfo.contactStatus"
@click="removeAgent"
>蝘駁</div>
</el-col>
@@ -48,17 +47,22 @@
:isVisible.sync="isVisibleDialog"
:width="width"
>
- <h5 class="subTitle text--center mb-30">������</h5>
- <p class="smTxt">隞予 10:00</p>
- <div class="dialogInfo">
- <p>憪������</p>
- <p>�閰梧��0912345678</p>
- <p>Email嚗�</p>
- <p>�批 嚗��</p>
- <p>撟湧翩嚗�26-30</p>
- <p>�璆哨����璆�</p>
- <p>��瘙���瑼�/閬���靽����</p>
- <p>��蝯⊥�挾銝�嚗���,��� 18:00~21:00</p>
+ <div v-if="appointmentDetail">
+ <h5 class="subTitle text--center mb-30">������</h5>
+ <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
+ <div class="dialogInfo">
+ <p>憪��{appointmentDetail.name}}</p>
+ <p>�閰梧�{appointmentDetail.phone}}</p>
+ <p>Email嚗{appointmentDetail.email}}</p>
+ <p>�批嚗{gender}}</p>
+ <p>撟湧翩嚗{appointmentDetail.age}}</p>
+ <p>�璆哨�{appointmentDetail.job}}</p>
+ <p>��瘙�{appointmentDetail.requirement.replace(',', '��')}}</p>
+ <p
+ v-for="(item, index) in hopeContactTime"
+ :key="index"
+ >��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+ </div>
</div>
</Ui-Dialog>
</div>
@@ -66,37 +70,91 @@
<script lang="ts">
import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { Consultants } from '~/assets/ts/api/consultant';
+import { AppointmentDetail, Consultants, getAppointmentDetail } from '~/assets/ts/api/consultant';
import { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';
-@Component
+@Component({
+ filters: {
+ formatNumber(index: number) {
+ if (index) {
+ const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���']
+ return upperNumber[index];
+ }
+ }
+ }
+})
export default class ConsultantCard extends Vue {
@Prop() agentInfo!: Consultants;
isVisibleDialog = false;
width: string = '';
+ appointmentDetail: AppointmentDetail = {
+ id: 0,
+ phone: '',
+ email: '',
+ contactType: '',
+ gender: '',
+ age: '',
+ job: '',
+ requirement: '',
+ communicateStatus: '',
+ hopeContactTime: '',
+ otherRequirement: '',
+ appointmentDate: new Date(),
+ agentNo: '',
+ customerId: 0,
+ name: ''
+ };
+ get avatarFileName() {
+ return this.agentInfo.img ? this.agentInfo.img : this.agentInfo.image;
+ }
+
+ get expertises() {
+ return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertises;
+ }
+ get gender() {
+ if (this.appointmentDetail.gender) {
+ return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
+ }
+ return ''
+ }
get contactTxt() {
if (this.agentInfo.contactStatus === 'contacted') {
return '撌脰蝯�'
- } else if (this.agentInfo.contactStatus === 'reserved') {
- return '撌脤���'
- } else {
- return '�脰����'
}
+ if (this.agentInfo.contactStatus === 'reserved') {
+ return '撌脤���'
+ }
+ return '�脰����'
}
get updateTime() {
return isLogin() ? this.agentInfo.updateTime : '';
}
+
+ get hopeContactTime() {
+ const contactList = this.appointmentDetail.hopeContactTime
+ .split("'").map(item => item.slice(0, item.length));
+ return contactList.filter(item => !!item)
+ }
reserveCommunication() {
const contactStatus = this.agentInfo.contactStatus;
- if (contactStatus !== 'reserved' && contactStatus !== 'contacted') {
- isLogin() ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`) : this.$router.push('/login');
+ if (!contactStatus || contactStatus === 'picked') {
+ isLogin()
+ ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
+ : this.$router.push('/login');
} else {
+ this.openPopUp();
+ }
+ }
+
+ openPopUp() {
+ getAppointmentDetail(this.agentInfo.latestAppointmentId).then(res => {
+ this.appointmentDetail = res.data;
this.width = isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
- }
+ });
}
@Emit('removeAgent') removeAgent() {
@@ -192,4 +250,4 @@
font-size: 20px;
}
-</style>
+</style>
\ No newline at end of file
--
Gitblit v1.8.0