Fixed#135481 修正[ 顧問管理流程 ] 滿意度 : 顧問把預約單結案後，客戶端的顧問清單會顯示該顧問預約單狀態為「進行預約」正確 , 但是...

HelenHuang

2022-02-16 3fc8398a9da85854e5e95c2c4cca14389d5dd5f8

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -7,16 +7,24 @@
                    :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">
                      <span v-if="agentInfo.appointmentScore">
                          {{ agentInfo.appointmentScore }}
                      </span>
                      <div class="unfilled text--center "
                          style="display:flex"
                          v-else>未填<br />滿意度</div>
                    </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">
@@ -31,10 +39,10 @@
                <div
                    class="delete"
                    v-if="showRemoveBtn"
                    @click="removeAgent"
                    @click="isRemoveAgentPopup = true"
                >移除</div>
                <div
                    v-if="notScoreAppointmentYet"
                    v-if="notScoreAppointmentYet && !(agentInfo.contactStatus === 'picked' || agentInfo.contactStatus === 'reserved')"
                    class="text--primary text--underline cursor--pointer xsTxt text--bold"
                    @click="reviewsBtn = true">給予滿意度評分</div>
            </el-col>
@@ -45,7 +53,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 +65,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 +78,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.contactStatus !== 'picked' || agentInfo.contactStatus !== 'reserved') " class="reserved-btn">
                    <el-button type="primary"
                        @click.native="reviewsBtn = true">給予滿意度評分</el-button>
                </div>
@@ -125,10 +133,18 @@
            </div>
        </PopUpFrame>

        <PopUpFrame :isOpen.sync="isConfirmPopup">
            <div class="text--center mdTxt">已成功取消此筆預約</div>
        <PopUpFrame  :isOpen.sync="isConfirmPopup">
            <div class="text--center mdTxt">已成功{{confirmTxt}}</div>
            <div class="text--center mt-30">
                <el-button @click="isConfirmPopup = false" type="primary">確定</el-button>
            </div>
        </PopUpFrame>

        <PopUpFrame :isOpen.sync="isRemoveAgentPopup">
            <div class="text--center mdTxt">是否移除顧問 <span class="text--primary">{{agentInfo.name}}</span>？</div>
            <div class="text--center mt-30">
                <el-button @click="isRemoveAgentPopup = false">否</el-button>
                <el-button @click="removeAgent" type="primary">是</el-button>
            </div>
        </PopUpFrame>
    </div>
@@ -143,7 +159,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({
@@ -181,6 +198,8 @@
    isCancelPopup = false;
    hideReviews = hideReviews;
    isConfirmPopup = false;
    isRemoveAgentPopup = false;
    confirmTxt = '';

    appointmentDetail: any = {
        age               : '',
@@ -202,22 +221,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 !== 'contacted')
                .filter((appointment) => appointment.communicateStatus === 'reserved' || appointment.communicateStatus === 'contacted')
                .map((reversedAppointment) => {
                    return {
                    ...reversedAppointment,
@@ -325,12 +345,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;
@@ -339,6 +359,12 @@

    removeAgent() {
        this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
            this.isRemoveAgentPopup = false;
            setTimeout(() => {
                this.confirmTxt = '移除顧問';
                this.isConfirmPopup = true;
            }, 300);

        });
    }

@@ -350,13 +376,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;
@@ -365,12 +392,14 @@
    }

    cancel() {
        appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
        appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => {
            this.storeConsultantList();
            this.isVisibleDialog = false;
            this.isCancelPopup = false;
            setTimeout(() => {
                this.confirmTxt = '取消此筆預約';
                this.isConfirmPopup = true;

            }, 300);
        });
    }
@@ -422,6 +451,7 @@
        }

        .delete {
            display: inline-block;
            color: $PRIMARY_RED;
            font-size: 14px;
            font-weight: bold;