From b4d6944076f1df6eedaae35c4c2a7072fe988e8a Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 30 四月 2024 15:34:02 +0800
Subject: [PATCH] update: package-lock.json
---
PAMapp/components/Consultant/ConsultantCard.vue | 138 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 60 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 8ea5a64..29105c4 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,22 +1,33 @@
<template>
<div>
- <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }">
+ <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime && $route.name !== 'myConsultantList-contactedList' }">
<el-col class="flex_column pl-5" :xs="5" :sm="3">
<UiAvatar
:size="50"
:agentNo="agentInfo.agentNo"
@click.native="showAgentDetail(agentInfo.agentNo)"
></UiAvatar>
- <!-- TODO:���遛��漲 -->
- <div v-if="!hideReviews">
- <i class="icon-star pam-icon icon--yellow satisfaction" v-if="notScoreAppointmentYet"></i>
- <span v-if="notScoreAppointmentYet">
- {{ agentInfo.satisfactionScore }}
- </span>
- <div class="unfilled text--center "
- style="display:flex"
- v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
- <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
+ <div v-if="!hideReviews" style="display: flex; justify-content: flex-start; align-items: center; margin-top: 6px; font-size: 12px">
+ <i v-if="isAppointment ? agentInfo.appointmentScore : agentInfo.avgScore"
+ class="icon-star pam-icon icon--yellow satisfaction"
+ style="margin-top: 0"></i>
+ <template v-if="isAppointment">
+ <template v-if="agentInfo.appointmentStatus === 'closed'
+ || agentInfo.appointmentStatus === 'done'">
+ <span v-if="agentInfo.appointmentScore">
+ {{ agentInfo.appointmentScore }}
+ </span>
+ <div class="unfilled text--center "
+ style="display:flex"
+ v-else>�憛�<br />皛踵�漲</div>
+ </template>
+ </template>
+ <template v-else>
+ <span v-if="agentInfo.avgScore">{{ agentInfo.avgScore }}</span>
+ <span class="unfilled text--center "
+ style="display:flex" v-else>撠<br />皛踵�漲</span>
+ </template>
+
</div>
</el-col>
<el-col :xs="10" :sm="15">
@@ -34,7 +45,7 @@
@click="isRemoveAgentPopup = true"
>蝘駁</div>
<div
- v-if="notScoreAppointmentYet"
+ v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')"
class="text--primary text--underline cursor--pointer xsTxt text--bold"
@click="reviewsBtn = true">蝯虫�遛��漲閰��</div>
</el-col>
@@ -45,7 +56,7 @@
:class="actionBtnStyle"
>{{ actionBtnLabel }}</el-button>
<div class="updateTime mt-10">
- {{ agentInfo.updateTime | formatDate }}
+ {{ (isAppointment ? agentInfo.appointmentLastModifiedDate : agentInfo.updateTime) | formatDate }}
</div>
</el-col>
</el-row>
@@ -57,7 +68,7 @@
>
<div v-if="appointmentDetail">
<h5 class="subTitle text--center mb-30">������</h5>
- <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
+ <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}} 撱箇��</p>
<div class="reserved-info">
<p>憪��{appointmentDetail.name}}</p>
<p>�閰梧�{appointmentDetail.phone}}</p>
@@ -65,22 +76,23 @@
<p>�批嚗{gender}}</p>
<p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
<p>�璆哨�{appointmentDetail.job}}</p>
- <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p>
+ <p>隢株岷�撘�{appointmentDetail.consultationMethod | toConsultationMethod }}</p>
+ <p>��瘙�{appointmentDetail.requirement ? appointmentDetail.requirement.split(',').join('��') : '--'}}</p>
<p
v-for="(item, index) in hopeContactTime"
:key="index"
>��蝯⊥�挾{{index + 1 | formatNumber}}嚗{ item | formatHopeContactTime }}</p>
- <div v-if="appointmentDetail.satisfactionScore">
+ <div v-if="appointmentDetail.appointmentScore">
<div class="mdTxt mt-10 mb-10">皛踵�漲</div>
<el-rate
- :value="appointmentDetail.satisfactionScore"
+ :value="appointmentDetail.appointmentScore"
class="pam-myDemand-dialog__rate"
disabled>
</el-rate>
</div>
</div>
- <div v-if="notScoreAppointmentYet" class="reserved-btn">
+ <div v-if="notScoreAppointmentYet && (agentInfo.appointmentStatus === 'closed' || agentInfo.appointmentStatus === 'done')" class="reserved-btn">
<el-button type="primary"
@click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
</div>
@@ -151,7 +163,8 @@
import { hideReviews } from '~/shared/const/hide-reviews';
import { Consultant, ConsultantWithAppointmentId } from '~/shared/models/consultant.model';
import { Appointment } from '~/shared/models/appointment.model';
-import { UserReviewsConsultantsParams } from '~/shared/models/reviews.model';
+import { SatisfactionType } from '~/shared/models/enum/satisfaction-type';
+import { UserReviewParams } from '~/shared/models/reviews.model';
const localStorage = namespace('localStorage');
@Component({
@@ -162,15 +175,15 @@
return upperNumber[index];
}
},
- formatHopeContactTime(item: string): string {
+ 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 '';
+ const [hopeDay, hopeTime] = item.split('��');
+ const day = hopeDay.split(',').length > 6 ? '銝����' : hopeDay;
+ const time = hopeTime.split(',').length > 3 ? '銝����' : hopeTime;
+ return `${day}��${time}`;
}
+ return ''; // 靽格迤嚗宏� if (item) ���
+ },
}
})
export default class ConsultantCard extends Vue {
@@ -212,22 +225,23 @@
otherRequirement : null,
phone : "",
requirement : '',
- satisfactionScore : 0,
+ appointmentScore : 0,
};
get notScoreAppointmentYet(): boolean {
const isAppointment = !!this.agentInfo['appointmentStatus'];
- if (!isAppointment) return false;
- return this.agentInfo['appointmentStatus'] !== 'contacted' ? !this.agentInfo['appointmentScore'] : false;
+ return isAppointment
+ ? !this.agentInfo['appointmentScore']
+ : !this.agentInfo.avgScore
}
get isAppointment(): boolean {
return !!this.agentInfo['appointmentStatus'];
}
- get latestReservedAppointment(): Appointment {
+ get latestNotClosedAppointment(): Appointment {
return this.agentInfo.appointments!
- .filter((appointment) => appointment.communicateStatus === 'reserved')
+ .filter((appointment) => appointment.communicateStatus === 'reserved' || appointment.communicateStatus === 'contacted')
.map((reversedAppointment) => {
return {
...reversedAppointment,
@@ -256,31 +270,34 @@
}
return ''
}
- get actionBtnLabel() {
- const isAppointment = !!this.agentInfo['appointmentStatus'];
- if (isAppointment) {
- if (this.agentInfo['appointmentStatus'] === 'contacted') {
- return '撌脰蝯�';
- }
- if (this.agentInfo['appointmentStatus'] === 'reserved') {
- return '撌脤���';
- }
- if (this.agentInfo['appointmentStatus'] === 'done') {
- return '撌脫�漱';
- }
- if (this.agentInfo['appointmentStatus'] === 'closed') {
- return '���漱';
- }
- } else {
- if (this.agentInfo.contactStatus === 'contacted') {
- return '撌脰蝯�';
- }
- if (this.agentInfo.contactStatus === 'reserved') {
- return '撌脤���';
- }
+ get actionBtnLabel() {
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+
+ if (isAppointment) {
+ if (this.agentInfo['appointmentStatus'] === 'contacted') {
+ return '撌脰蝯�';
}
- return '�脰����';
+ if (this.agentInfo['appointmentStatus'] === 'reserved') {
+ return '撌脤���';
+ }
+ if (this.agentInfo['appointmentStatus'] === 'done') {
+ return '撌脫�漱';
+ }
+ if (this.agentInfo['appointmentStatus'] === 'closed') {
+ return '���漱';
+ }
+ } else {
+ if (this.agentInfo.contactStatus === 'contacted') {
+ return '撌脰蝯�';
+ }
+ if (this.agentInfo.contactStatus === 'reserved') {
+ return '撌脤���';
+ }
}
+
+ return '�脰����';
+ }
+
get actionBtnStyle() {
const isAppointment = !!this.agentInfo['appointmentStatus'];
@@ -335,12 +352,12 @@
const isAppointment = !!this.agentInfo['appointmentStatus'];
const appointmentId = isAppointment
? this.agentInfo['appointmentId']
- : this.latestReservedAppointment.id;
+ : this.latestNotClosedAppointment.id;
appointmentService.getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
...res,
- satisfactionScore: this.agentInfo['appointmentScore'],
+ appointmentScore: this.agentInfo['appointmentScore'],
};
this.width = UtilsService.isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
@@ -366,13 +383,14 @@
const isAppointment = !!this.agentInfo['appointmentStatus'];
const appointmentId = isAppointment
? this.agentInfo['appointmentId']
- : this.latestReservedAppointment.id;
+ : this.latestNotClosedAppointment.id;
- const reviewParams: UserReviewsConsultantsParams = {
+ const reviewParams: UserReviewParams = {
appointmentId: appointmentId,
score: this.inputScore,
+ type : SatisfactionType.APPOINTMENT,
}
- this.appointmentDetail.satisfactionScore = this.inputScore;
+ this.appointmentDetail.appointmentScore = this.inputScore;
reviewsService.userReviewsConsultants(reviewParams).then((res) => {
this.reviewsBtn = false;
@@ -381,7 +399,7 @@
}
cancel() {
- appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => {
this.storeConsultantList();
this.isVisibleDialog = false;
this.isCancelPopup = false;
--
Gitblit v1.8.0