From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:38:48 +0800
Subject: [PATCH] Merge branch 'Phase3' into pollex-dev
---
PAMapp/components/Consultant/ConsultantCard.vue | 60 +++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 37 insertions(+), 23 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index b154bf8..642c210 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -7,16 +7,27 @@
: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>
@@ -70,17 +81,17 @@
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 +162,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({
@@ -212,13 +224,14 @@
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 {
@@ -340,7 +353,7 @@
appointmentService.getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
...res,
- satisfactionScore: this.agentInfo['appointmentScore'],
+ appointmentScore: this.agentInfo['appointmentScore'],
};
this.width = UtilsService.isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
@@ -368,11 +381,12 @@
? this.agentInfo['appointmentId']
: 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;
--
Gitblit v1.8.0