From 086f66acfc1d8e6da2da6dbab6b5704521cc62ed Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期三, 16 二月 2022 16:08:35 +0800
Subject: [PATCH] Fixed#135499 修正 [ 滿意度評分 ] 我的顧問清單 : 預約顧問後,(預約單未結案狀態)。喬妹顧問卡片會顯示「給予滿意度評分

---
 PAMapp/components/Consultant/ConsultantCard.vue |   52 +++++++++++++++++++++++++++++++---------------------
 1 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 268987e..99e9ba6 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -7,25 +7,32 @@
                     :agentNo="agentInfo.agentNo"
                     @click.native="showAgentDetail(agentInfo.agentNo)"
                 ></UiAvatar>
-                <div v-if="!hideReviews">
-                    <i class="icon-star pam-icon icon--yellow satisfaction"></i>
-                      <template v-if="isAppointment">
-                      <span v-if="notScoreAppointmentYet">
-                          {{ agentInfo.satisfactionScore }}
-                      </span>
-                      <div class="unfilled text--center "
-                          style="display:flex"
-                          v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
+                <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 === 'close'
+                                    || 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 v-else>撠<br />皛踵�漲</span>
+                      <span class="unfilled text--center "
+                          style="display:flex" v-else>撠<br />皛踵�漲</span>
                     </template>
 
                 </div>
             </el-col>
             <el-col :xs="10" :sm="15">
                 <div class="smTxt_bold name">{{agentInfo.name}}</div>
+                {{agentInfo.appointmentStatus}}
                 <div class="professionals">
                     <span
                         class="professionalsTxt"
@@ -39,7 +46,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>
@@ -75,17 +82,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>
@@ -156,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({
@@ -217,13 +225,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 {
@@ -345,7 +354,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;
@@ -373,11 +382,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