From ac235850a9287dae6977c964213176fa7c86b140 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 09 十二月 2021 14:42:20 +0800
Subject: [PATCH] Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PAM into refactor/separate-vue
---
PAMapp/components/Consultant/ConsultantCard.vue | 221 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 182 insertions(+), 39 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 8ff803e..20de228 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,6 +1,7 @@
<template>
<div>
<el-row type="flex" class="rowStyle">
+
<el-col :xs="2" :sm="1" :class="{'state': agentInfo.new}"></el-col>
<el-col :xs="22" :sm="23">
<el-row type="flex">
@@ -10,9 +11,16 @@
: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>
+ <div>
+ <i class="icon-star pam-icon icon--yellow satisfaction" v-if="!(latestContactedAppointment && !latestContactedAppointment.satisfactionScore)"></i>
+ <span v-if="agentInfo.contactStatus === 'contacted' && latestContactedAppointment && latestContactedAppointment.satisfactionScore">
+ {{ latestContactedAppointment && latestContactedAppointment.satisfactionScore}}
+ </span>
+ <div class="unfilled text--center "
+ style="display:flex"
+ v-if="agentInfo.contactStatus === 'contacted' &&
+ latestContactedAppointment && !latestContactedAppointment.satisfactionScore">�憛�<br />皛踵�漲</div>
+ <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
</div>
</el-col>
<el-col :xs="10" :sm="15">
@@ -20,7 +28,7 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(expertise, index) in expertises"
+ v-for="(expertise, index) in agentInfo.expertise"
:key="index"
>#{{expertise}}</span>
</div>
@@ -46,6 +54,7 @@
<Ui-Dialog
:isVisible.sync="isVisibleDialog"
:width="width"
+ class="pam-myDemand-dialog"
>
<div v-if="appointmentDetail">
<h5 class="subTitle text--center mb-30">������</h5>
@@ -55,24 +64,68 @@
<p>�閰梧�{appointmentDetail.phone}}</p>
<p>Email嚗{appointmentDetail.email}}</p>
<p>�批嚗{gender}}</p>
- <p>撟湧翩嚗{appointmentDetail.age}}</p>
+ <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
<p>�璆哨�{appointmentDetail.job}}</p>
- <p>��瘙�{appointmentDetail.requirement.replace(',', '��')}}</p>
+ <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p>
<p
v-for="(item, index) in hopeContactTime"
:key="index"
- >��蝯⊥�挾{{index + 1 | formatNumber}}嚗{item}}</p>
+ >��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime }}</p>
+ <div v-if="appointmentDetail.satisfactionScore">
+ <div class="mdTxt mt-10 mb-10">皛踵�漲</div>
+ <el-rate
+ :value="appointmentDetail.satisfactionScore"
+ class="pam-myDemand-dialog__rate"
+ disabled>
+ </el-rate>
+ </div>
+ </div>
+
+ <div v-if="agentInfo.contactStatus === 'contacted'
+ && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
+ <el-button type="primary"
+ @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
+ </div>
+
+ <div v-if="agentInfo.contactStatus === 'reserved'" class="text--center mt-10">
+ <el-button @click="isCancelPopup = true">������</el-button>
+ <el-button @click="edit" type="primary">蝺刻摩</el-button>
</div>
</div>
</Ui-Dialog>
+ <PopUpFrame :isOpen.sync="reviewsBtn" drawerSize='30%'>
+ <div class="mdTxt">
+ 靽憿批�遛��漲
+ <span class="hint">������</span>
+ <div class="dialogInfo-score">
+ <el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate>
+ </div>
+ <div class="dialogInfo-btn">
+ <el-button
+ type="primary"
+ :disabled="!inputScore"
+ @click="userReviewsConsultants">�</el-button>
+ </div>
+ </div>
+ </PopUpFrame>
+
+ <PopUpFrame :isOpen.sync="isCancelPopup">
+ <div class="text--center mdTxt">�����迨蝑����</div>
+ <div class="text--center mt-30">
+ <el-button @click="isCancelPopup = false">����</el-button>
+ <el-button @click="cancel" type="primary">蝣箏��</el-button>
+ </div>
+ </PopUpFrame>
</div>
</template>
<script lang="ts">
-import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { AppointmentDetail, Consultants, getAppointmentDetail } from '~/assets/ts/api/consultant';
+import { Vue, Component, Prop, Action } from 'nuxt-property-decorator';
+import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment } from '~/assets/ts/api/consultant';
+import { Consultant, Appointment } from '~/assets/ts/models/consultant.model';
import { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';
+
@Component({
filters: {
@@ -81,38 +134,76 @@
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 ConsultantCard extends Vue {
- @Prop() agentInfo!: Consultants;
+ @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
+ @Action storeConsultantList!: any;
+ @Prop() agentInfo!: Consultant;
isVisibleDialog = false;
+ reviewsBtn = false;
+ status = false;
width: string = '';
- appointmentDetail: AppointmentDetail = {
- id: 0,
- phone: '',
- email: '',
- contactType: '',
- gender: '',
- age: '',
- job: '',
- requirement: '',
- communicateStatus: '',
- hopeContactTime: '',
- otherRequirement: '',
- appointmentDate: new Date(),
- agentNo: '',
- customerId: 0,
- name: ''
+ inputScore = 0;
+ isCancelPopup = false;
+
+ get latestContactedAppointment(): Appointment | null {
+ if (!(this.agentInfo && this.agentInfo.appointments && this.agentInfo.appointments.length)) return null;
+ const contactedAppointments: Appointment[] = this.agentInfo.appointments
+ .filter((appointment) => appointment.communicateStatus === 'contacted')
+ .sort((preAppointment, nextAppointment) => +nextAppointment.appointmentDate - +preAppointment.appointmentDate);
+ return contactedAppointments[0];
+ }
+
+ get latestReservedAppointment(): Appointment {
+ return this.agentInfo.appointments!
+ .filter((appointment) => appointment.communicateStatus !== 'contacted')
+ .map((reversedAppointment) => {
+ return {
+ ...reversedAppointment,
+ sortDate: new Date(reversedAppointment.appointmentDate)
+ }
+ })
+ .sort((preAppointment, nextAppointment) => +nextAppointment.sortDate - +preAppointment.sortDate)[0];
+ }
+
+ appointmentDetail: any = {
+ age : '',
+ agentNo : '',
+ appointmentDate : '',
+ communicateStatus : '',
+ consultantReadTime: null,
+ consultantViewTime: null,
+ contactTime : '',
+ contactType : '',
+ customerId : 0,
+ email : '',
+ gender : '',
+ hopeContactTime : "",
+ id : 0,
+ job : "",
+ lastModifiedDate : '',
+ name : '',
+ otherRequirement : null,
+ phone : "",
+ requirement : '',
+ satisfactionScore : 0,
};
get avatarFileName() {
- return this.agentInfo.img ? this.agentInfo.img : this.agentInfo.image;
+ return this.agentInfo.img;
}
- get expertises() {
- return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertises;
- }
get gender() {
if (this.appointmentDetail.gender) {
return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
@@ -121,12 +212,12 @@
}
get contactTxt() {
if (this.agentInfo.contactStatus === 'contacted') {
- return '撌脰蝯�'
+ return '撌脰蝯�';
}
if (this.agentInfo.contactStatus === 'reserved') {
- return '撌脤���'
+ return '撌脤���';
}
- return '�脰����'
+ return '�脰����';
}
get updateTime() {
@@ -136,8 +227,9 @@
get hopeContactTime() {
const contactList = this.appointmentDetail.hopeContactTime
.split("'").map(item => item.slice(0, item.length));
- return contactList.filter(item => !!item)
+ return contactList.filter(item => !!item && item !== ",")
}
+
reserveCommunication() {
const contactStatus = this.agentInfo.contactStatus;
if (!contactStatus || contactStatus === 'picked') {
@@ -150,21 +242,56 @@
}
openPopUp() {
- getAppointmentDetail(this.agentInfo.latestAppointmentId).then(res => {
- this.appointmentDetail = res.data;
+ const appointmentId = this.agentInfo.contactStatus === 'contacted'
+ ? this.latestContactedAppointment?.id
+ : this.latestReservedAppointment.id;
+
+ getAppointmentDetail(appointmentId!).then(res => {
+ this.appointmentDetail = {
+ ...this.appointmentDetail,
+ ...res.data
+ };
this.width = isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
});
}
- @Emit('removeAgent') removeAgent() {
- return this.agentInfo.agentNo;
+ removeAgent() {
+ this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
+ });
}
showAgentDetail(agentNo: string): void {
this.$router.push(`/agentInfo/${agentNo}`);
}
+
+ userReviewsConsultants() {
+ const reviewParams: UserReviewsConsultantsParams = {
+ appointmentId: this.appointmentDetail.id,
+ score: this.inputScore,
+ }
+ this.appointmentDetail.satisfactionScore = this.inputScore;
+
+ userReviewsConsultants(reviewParams).then((res) => {
+ this.reviewsBtn = false;
+ this.storeConsultantList();
+ });
+ }
+
+ cancel() {
+ cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ this.storeConsultantList();
+ this.isVisibleDialog = false;
+ this.isCancelPopup = false;
+ });
+ }
+
+ edit() {
+ this.isVisibleDialog = false;
+ this.$router.push({path: `/questionnaire/${this.agentInfo.agentNo}`, query: {'edit': 'true'}});
+ }
}
+
</script>
<style lang="scss" scoped>
@@ -188,6 +315,11 @@
font-weight: bold;
margin-top: 5px;
}
+ .unfilled {
+ font-size: 12px;
+ padding-top: 5px;
+ padding-left: 5px;
+ }
.professionals {
height: 20px;
@@ -248,6 +380,17 @@
.dialogInfo {
font-size: 20px;
+ overflow-y:scroll;
+ height: 400px;
+ }
+ .dialogInfo-btn{
+ display: flex;
+ justify-content: center;
+ }
+ .dialogInfo-score{
+ display: flex;
+ justify-content: center;
+ margin-bottom: 50px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0