Merge branch 'refactor/separate-vue' of ssh://192.168.0.10:29418/pcalife/PA...

Tomas

2021-12-09 ac235850a9287dae6977c964213176fa7c86b140

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -13,10 +13,14 @@
                        ></UiAvatar>
                        <div>
                            <i class="icon-star pam-icon icon--yellow satisfaction"  v-if="!(latestContactedAppointment && !latestContactedAppointment.satisfactionScore)"></i>
                            <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
                            <span v-if="agentInfo.contactStatus === 'contacted'">
                                {{ latestContactedAppointment && latestContactedAppointment.satisfactionScore || '未填滿意度' }}
                            <span v-if="agentInfo.contactStatus === 'contacted' && latestContactedAppointment && latestContactedAppointment.satisfactionScore">
                                {{ latestContactedAppointment && latestContactedAppointment.satisfactionScore}}
                            </span>
                            <div class="unfilled text--center "
                                style="display:flex"
                                v-if="agentInfo.contactStatus === 'contacted' &&
                                latestContactedAppointment && !latestContactedAppointment.satisfactionScore">未填<br />滿意度</div>
                            <span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
                        </div>
                    </el-col>
                    <el-col :xs="10" :sm="15">
@@ -24,7 +28,7 @@
                        <div class="professionals">
                            <span
                                class="professionalsTxt"
                                v-for="(expertise, index) in expertises"
                                v-for="(expertise, index) in agentInfo.expertise"
                                :key="index"
                            >#{{expertise}}</span>
                        </div>
@@ -68,14 +72,14 @@
                        :key="index"
                    >連絡時段{{index + 1 | formatNumber}}：{{ item | formatHopeContactTime }}</p>
                    <div v-if="appointmentDetail.satisfactionScore">
                    <div class="mdTxt mt-10 mb-10">滿意度</div>
                        <el-rate
                            :value="appointmentDetail.satisfactionScore"
                            class="pam-myDemand-dialog__rate"
                            disabled>
                        </el-rate>
                      <div class="mdTxt mt-10 mb-10">滿意度</div>
                          <el-rate
                              :value="appointmentDetail.satisfactionScore"
                              class="pam-myDemand-dialog__rate"
                              disabled>
                          </el-rate>
                      </div>
                    </div>
                </div>

                <div v-if="agentInfo.contactStatus === 'contacted'
                        && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
@@ -117,7 +121,7 @@

<script lang="ts">
import { Vue, Component, Prop, Action } from 'nuxt-property-decorator';
import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment, AppointmentRequests  } from '~/assets/ts/api/consultant';
import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment } from '~/assets/ts/api/consultant';
import { Consultant, Appointment } from '~/assets/ts/models/consultant.model';
import { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';
@@ -132,13 +136,13 @@
            }
        },
        formatHopeContactTime(item: string): string {
          if (item) {
        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 '';
            }
            return '';
        }
    }
})
@@ -164,39 +168,42 @@
    get latestReservedAppointment(): Appointment {
        return this.agentInfo.appointments!
                .filter((appointment) => appointment.communicateStatus !== 'contacted')
                .sort((preAppointment, nextAppointment) => +nextAppointment.appointmentDate - +preAppointment.appointmentDate)[0];
                .map((reversedAppointment) => {
                  return {
                    ...reversedAppointment,
                    sortDate: new Date(reversedAppointment.appointmentDate)
                  }
                })
                .sort((preAppointment, nextAppointment) => +nextAppointment.sortDate - +preAppointment.sortDate)[0];
    }

    appointmentDetail: any = {
        age:'',
        agentNo: '',
        appointmentDate: '',
        communicateStatus: '',
        age               : '',
        agentNo           : '',
        appointmentDate   : '',
        communicateStatus : '',
        consultantReadTime: null,
        consultantViewTime: null,
        contactTime:'',
        contactType:'',
        customerId:0,
        email:'',
        gender:'',
        hopeContactTime: "",
        id:0,
        job: "",
        lastModifiedDate:'',
        name:'',
        otherRequirement: null,
        phone: "",
        requirement:'',
        satisfactionScore: 0,
        contactTime       : '',
        contactType       : '',
        customerId        : 0,
        email             : '',
        gender            : '',
        hopeContactTime   : "",
        id                : 0,
        job               : "",
        lastModifiedDate  : '',
        name              : '',
        otherRequirement  : null,
        phone             : "",
        requirement       : '',
        satisfactionScore : 0,
    };

    get avatarFileName() {
        return this.agentInfo.img;
    }

    get expertises() {
        return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertise;
    }
    get gender() {
        if (this.appointmentDetail.gender) {
            return this.appointmentDetail.gender === 'male' ? '男性' : '女性';
@@ -235,9 +242,11 @@
    }

    openPopUp() {
        getAppointmentDetail(this.latestContactedAppointment
                            ? this.latestContactedAppointment.id
                            : this.latestReservedAppointment.id).then(res => {
      const appointmentId = this.agentInfo.contactStatus === 'contacted'
                          ? this.latestContactedAppointment?.id
                          : this.latestReservedAppointment.id;

        getAppointmentDetail(appointmentId!).then(res => {
            this.appointmentDetail = {
                ...this.appointmentDetail,
                ...res.data
@@ -249,7 +258,6 @@

    removeAgent() {
        this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
            console.log('removeOk?', removeOk);
        });
    }

@@ -307,6 +315,11 @@
            font-weight: bold;
            margin-top: 5px;
        }
        .unfilled {
                font-size: 12px;
                padding-top: 5px;
                padding-left: 5px;
            }

        .professionals {
            height: 20px;
@@ -380,4 +393,4 @@
        margin-bottom: 50px;
    }

</style>
</style>