Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into ...

HelenHuang

2022-01-26 3712b0a6ff1329ecf4d5ea5ba879e28b428c565e

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -45,7 +45,7 @@
                    :class="actionBtnStyle"
                >{{ actionBtnLabel }}</el-button>
                <div class="updateTime mt-10">
                    {{ agentInfo.updateTime | formatDate }}
                    {{ agentInfo.appointmentLastModifiedDate | formatDate }}
                </div>
            </el-col>
        </el-row>
@@ -57,7 +57,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>
@@ -225,9 +225,9 @@
      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,
@@ -335,7 +335,7 @@
      const isAppointment = !!this.agentInfo['appointmentStatus'];
      const appointmentId = isAppointment
                          ? this.agentInfo['appointmentId']
                          : this.latestReservedAppointment.id;
                          : this.latestNotClosedAppointment.id;

        appointmentService.getAppointmentDetail(appointmentId!).then(res => {
            this.appointmentDetail = {
@@ -366,7 +366,7 @@
      const isAppointment = !!this.agentInfo['appointmentStatus'];
      const appointmentId = isAppointment
                          ? this.agentInfo['appointmentId']
                          : this.latestReservedAppointment.id;
                          : this.latestNotClosedAppointment.id;

        const reviewParams: UserReviewsConsultantsParams = {
            appointmentId: appointmentId,
@@ -381,7 +381,7 @@
    }

    cancel() {
        appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
        appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => {
            this.storeConsultantList();
            this.isVisibleDialog = false;
            this.isCancelPopup = false;