Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

Mila

2021-12-06 f2fe7c2bacd26cde387d4d3a17ce6161dd189e26

Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM

# Conflicts:
#	PAMapp/pages/myConsultantList.vue

 PAMapp/assets/scss/vendors/elementUI/_rate.scss

@@ -26,4 +26,18 @@
      color: $PRIMARY_BLACK !important;
    }
  }
}

.pam-myDemand-dialog__rate {
  height: auto;
  display: flex;
  .el-rate__item {
    -webkit-tap-highlight-color: transparent;
    .el-rate__icon {
      font-size: 35px;
    }
    .el-icon-star-off {
      color: $PRIMARY_BLACK !important;
    }
  }
}

 PAMapp/assets/ts/api/appointment.ts

@@ -1,5 +1,6 @@
import { service } from '~/assets/ts/api/share';
import { AxiosResponse } from 'axios';
import { AppointmentLog } from '../models/appointment.model';

// å–得所有預約清單
export function getMyAppointmentList():Promise<ClientInfo[]> {
@@ -19,6 +20,14 @@
            .then(res => res.data)
}

export function getMyReviewLog(): Promise<AppointmentLog[]> {
    const headers = {
        Authorization: 'Bearer ' + localStorage.getItem('id_token')
    }
    return service.get('/satisfaction/getMySatisfaction', { headers }).then(res => res.data);
}


// é¡§å•ç™»å…¥é¡¯ç¤ºæ–°é ç´„單筆數後觸發
export function allAppointmentsView() {
    const headers = {
@@ -37,14 +46,14 @@


export interface ClientInfo {
    id: number,
    phone: string,
    email: string,
    contactType: string,
    gender: string,
    age: string,
    job: string,
    requirement: string,
    id               : number,
    phone            : string,
    email            : string,
    contactType      : string,
    gender           : string,
    age              : string,
    job              : string,
    requirement      : string,
    communicateStatus: string,
    hopeContactTime: string,
    otherRequirement: string,

 PAMapp/assets/ts/api/consultant.ts

@@ -4,6 +4,7 @@
import { ConsultantLoginInfo } from '../models/ConsultantLoginInfo';
import _ from 'lodash';
import { UserSetting } from '../models/account.model';
import { Consultants } from '~/assets/ts/models/consultant.model';

// é¡§å®¢ç™»å…¥(TODO: OTP認證開發前 æš«æ™‚使用)
export function login(user: any) {
@@ -123,20 +124,13 @@
    return service.put('/customer/info', params ,{headers}).then(res => res.data);
}

export interface Consultants {
    agentNo            : string,
    name               : string,
    img                : string,
    new                : boolean,
    avgScore           : number,
    expertise          : string[],
    updateTime         : Date,
    seniority          : string,
    contactStatus?     : string;
    latestAppointmentId: number;
    role               : string;
    image?             : string;
    expertises?        : string;
//客戶進行滿意度評分

export function userReviewsConsultants(data: UserReviewsConsultantsParams) {
    const headers = {
        Authorization: 'Bearer ' + localStorage.getItem('id_token')
    }
    return service.post('/satisfaction/create', data ,{headers});
}

export interface FastQueryParams {
@@ -232,3 +226,8 @@
    /** "SMS"：Otp發送手機，"EMAIL":Otp發email */
    contactType: string
}

export interface UserReviewsConsultantsParams{
    appointmentId:number,
    score:number,
}

 PAMapp/assets/ts/models/appointment.model.ts

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,12 @@
export interface AppointmentLog {
    id              : number,
    createdDate     : Date,
    lastModifiedDate: Date,
    customerId      : number,
    agentNo         : string,
    status          : 'UNFILLED' | 'FILLED',
    score           : number,
    // éœ€è¦ agentName
    agentName: string,
    clientName: string,
}

 PAMapp/assets/ts/models/consultant.model.ts

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,37 @@
export interface Consultants {
    agentNo            : string;
    name               : string;
    img                : string;
    expertise          : string[];
    avgScore           : number;
    contactStatus?     : string;
    createTime: Date;
    updateTime         : Date;
    role               : string;
    seniority          : string,
    appointments?      : Appointment[];
    new                : boolean,
}

export interface Appointment {
    id                 : number;
    phone?             : string;
    email?             : string;
    contactType        : string;
    gender             : string;
    age                : string;
    job                : string;
    requirement        : string;
    communicateStatus  : string;
    hopeContactTime    : string;
    otherRequirement?  : string;
    appointmentDate    : Date;
    lastModifiedDate   : Date;
    agentNo            : string;
    customerId         : number;
    name               : string;
    consultantViewTime?: Date;
    consultantReadTime?: Date;
    satisfactionScore? : number;
};


 PAMapp/assets/ts/storageConsultant.ts

@@ -1,4 +1,5 @@
import { Consultants } from "./api/consultant";
import { Consultants } from "./models/consultant.model";


export function getFavoriteFromStorage(): Consultants[] {
    const consultantList = localStorage.getItem('favoriteConsultant');

 PAMapp/components/AddAndReservedBtns.vue

@@ -12,7 +12,7 @@

<script lang="ts">
import { Vue, Component, Prop, Emit, Action, State, namespace } from 'nuxt-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';

const localStorage = namespace('localStorage');
@Component

 PAMapp/components/Consultant/ConsultantCard.vue

@@ -1,6 +1,7 @@
<template>
    <div>
        <el-row type="flex" class="rowStyle">

            <el-col :xs="2" :sm="1" :class="{'state': agentInfo.new}"></el-col>
            <el-col :xs="22" :sm="23">
                <el-row type="flex">
@@ -10,9 +11,12 @@
                            :fileName="avatarFileName"
                            @click.native="showAgentDetail(agentInfo.agentNo)"
                        ></UiAvatar>
                        <div class="satisfaction">
                            <i class="icon-star pam-icon icon--yellow satisfaction"></i>
                            <span>{{agentInfo.avgScore }}</span>
                        <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>
                        </div>
                    </el-col>
                    <el-col :xs="10" :sm="15">
@@ -63,18 +67,48 @@
                        v-for="(item, index) in hopeContactTime"
                        :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>
                </div>

                <div v-if="agentInfo.contactStatus === 'contacted' 
                        && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
                    <el-button type="primary" 
                        @click.native="reviewsBtn = true">給予滿意度評分</el-button>
                </div>
            </div>
        </Ui-Dialog>
        <PopUpFrame :isOpen.sync="reviewsBtn" drawerSize='30%'>
            <div class="mdTxt">
                ä¿éšªé¡§å•æ»¿æ„åº¦
                <span class="hint">選取星星</span>
                <div class="dialogInfo-score"> 
                    <el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate>
                </div>
                <div class="dialogInfo-btn">
                    <el-button 
                        type="primary"
                        :disabled="!inputScore"
                        @click="userReviewsConsultants">送出</el-button>
                </div>
            </div>
        </PopUpFrame>
    </div>
</template>

<script lang="ts">
import { Vue, Component, Prop, Emit, Action } from 'nuxt-property-decorator';
import { Consultants, getAppointmentDetail } from '~/assets/ts/api/consultant';
import { AppointmentDetail } from '~/assets/ts/models/AppointmentDetail';
import { Vue, Component, Prop, Emit, Action, State } from 'nuxt-property-decorator';
import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants  } from '~/assets/ts/api/consultant';
import { Consultants, Appointment } from '~/assets/ts/models/consultant.model';
import { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';


@Component({
    filters: {
@@ -97,34 +131,51 @@
})
export default class ConsultantCard extends Vue {
    @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;

    @Action storeConsultantList!: any;
    @Prop() agentInfo!: Consultants;
    isVisibleDialog = false;
    reviewsBtn = false;
    status = false;
    width: string = '';
    appointmentDetail: AppointmentDetail = {
        id: 0,
        phone: '',
        email: '',
        contactType: '',
        gender: '',
        age: '',
        job: '',
        requirement: '',
        communicateStatus: '',
        hopeContactTime: '',
        otherRequirement: '',
        appointmentDate: new Date(),
    inputScore = 0;
    
    get latestContactedAppointment(): Appointment | null {
        if (!(this.agentInfo && this.agentInfo.appointments && this.agentInfo.appointments.length)) return null;
        const contactedAppointments: Appointment[] =  this.agentInfo.appointments
                                                        .filter((appointment) => appointment.communicateStatus === 'contacted')
                                                        .sort((preAppointment, nextAppointment) => +nextAppointment.appointmentDate - +preAppointment.appointmentDate);
        return contactedAppointments[0];
    }
    
    appointmentDetail: any = {
        age:'',
        agentNo: '',
        customerId: 0,
        name: ''
        appointmentDate: '',
        communicateStatus: '',
        consultantReadTime: null,
        consultantViewTime: null,
        contactTime:'',
        contactType:'',
        customerId:0,
        email:'',
        gender:'',
        hopeContactTime: "",
        id:0,
        job: "",
        lastModifiedDate:'',
        name:'',
        otherRequirement: null,
        phone: "",
        requirement:'',
        satisfactionScore: 0,
    };

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

    get expertises() {
        return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertises;
        return this.agentInfo.expertise ? this.agentInfo.expertise : this.agentInfo.expertise;
    }
    get gender() {
        if (this.appointmentDetail.gender) {
@@ -134,12 +185,12 @@
    }
    get contactTxt() {
        if (this.agentInfo.contactStatus === 'contacted') {
            return '已聯絡'
            return '已聯絡';
        }
        if (this.agentInfo.contactStatus === 'reserved') {
            return '已預約'
            return '已預約';
        }
        return '進行預約'
        return '進行預約';
    }

    get updateTime() {
@@ -151,18 +202,29 @@
            .split("'").map(item => item.slice(0, item.length));
        return contactList.filter(item => !!item && item !== ",")
    }

    reserveCommunication() {
        const contactStatus = this.agentInfo.contactStatus;
        if (!contactStatus || contactStatus === 'picked') {
            this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
            isLogin()
                ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
                : this.$router.push('/login');
        } else {
            this.openPopUp();
        }
    }

    openPopUp() {
        getAppointmentDetail(this.agentInfo.latestAppointmentId).then(res => {
            this.appointmentDetail = res.data;
    const latestReservedAppointment = this.agentInfo.appointments!
                                        .filter((appointment) => appointment.communicateStatus !== 'contacted')
                                        .sort((preAppointment, nextAppointment) => +nextAppointment.appointmentDate - +preAppointment.appointmentDate)[0];
        getAppointmentDetail(this.latestContactedAppointment 
                            ? this.latestContactedAppointment.id 
                            : latestReservedAppointment.id).then(res => {
            this.appointmentDetail = {
                ...this.appointmentDetail,
                ...res.data
            };
            this.width = isMobileDevice() ? '80%' : '';
            this.isVisibleDialog = true;
        });
@@ -177,7 +239,21 @@
    showAgentDetail(agentNo: string): void {
        this.$router.push(`/agentInfo/${agentNo}`);
    }

    userReviewsConsultants() {
        const reviewParams: UserReviewsConsultantsParams = {
            appointmentId: this.appointmentDetail.id,
            score: this.inputScore,
        }
        this.appointmentDetail.satisfactionScore = this.inputScore;

        userReviewsConsultants(reviewParams).then((res) => {
            this.reviewsBtn = false;
            this.storeConsultantList();
        });
    }
}

</script>

<style lang="scss" scoped>
@@ -262,10 +338,16 @@
    .dialogInfo {
        font-size: 20px;
        overflow-y:scroll;
        max-height: 50vh;
        @include desktop {
            height: 400px;
        }
        height: 400px;
    }
    .dialogInfo-btn{
        display: flex;
        justify-content: center;
    }
    .dialogInfo-score{
        display: flex;
        justify-content: center;
        margin-bottom: 50px;
    }

</style>
</style>

 PAMapp/components/Consultant/ConsultantList.vue

@@ -1,14 +1,14 @@
<template>
    <div>

        <template v-if="agents.length > 0">
        <template v-if="agentList.length > 0">
            <ConsultantCard
                v-for="(agent, index) in agents"
                v-for="(agent, index) in agentList"
                :key="index"
                :agentInfo="agent"
            ></ConsultantCard>
        </template>
        <template v-if="isLogin && agents.length === 0">
        <template v-if="isLogin && agentList.length === 0">
            <div class="emptyRowStyle">
                <div class="smTxt txt">您目前無已選顧問</div>
            </div>
@@ -24,7 +24,7 @@

<script lang="ts">
import { Vue, Component, Prop } from 'nuxt-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';
import { isLogin } from '~/assets/ts/auth';

@Component
@@ -34,6 +34,11 @@
    get isLogin() {
        return isLogin();
    }
    get agentList(){
        return this.agents.map((agentDto)=>
            ({...agentDto,customerScore:0,})
        )
    }

}
</script>

 PAMapp/components/Consultant/ConsultantSwiper.vue

@@ -28,7 +28,8 @@
<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator';
import { SwiperOptions } from 'swiper';
import { Consultants } from '~/assets/ts/api/consultant'
import { Consultants } from '~/assets/ts/models/consultant.model';


@Component
export default class UiSwiper extends Vue {

 PAMapp/components/QuickFilter/QuickFilterConsultantList.vue

@@ -79,7 +79,8 @@
<script lang="ts">
import { ElCarousel } from 'element-ui/types/carousel';
import { Vue, Component, Prop } from 'vue-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';


@Component
export default class QuickFilterConsultantList extends Vue {

 PAMapp/components/Ui/UiDateFormat.vue

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,40 @@
<template>
    <span>
        {{ formattedDate }}
    </span>
</template>

<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator';

@Component
export default class UiDateFormat extends Vue {
    @Prop() date!: Date;
    @Prop() onlyShowSection!: 'DAY' | 'TIME';

    get formattedDate(): string {
        const isToday = (compareDate: Date): boolean => {
            return compareDate.getFullYear() === _now.getFullYear()
                && compareDate.getMonth() === _now.getMonth()
                && compareDate.getDate() === _now.getDate()
        };

        const isThisYear = (compareDate: Date): boolean => {
            return compareDate.getFullYear() === _now.getFullYear();
        };
        const _now = new Date();
        const minutes = _now.getMinutes() > 9 ?  _now.getMinutes() : `0${_now.getMinutes()}`;
        const thisYearDayLabel = isToday(this.date) ? `今天` : `${this.date.getMonth() + 1}/${this.date.getDate()}`;

        if (this.onlyShowSection === 'DAY') {
            return isThisYear(this.date) ? thisYearDayLabel : `${this.date.getFullYear()}/${this.date.getMonth() + 1}/${this.date.getDate()}`;
        } else if (this.onlyShowSection === 'TIME') {
            return `${this.date.getHours()}:${minutes}`;
        }

        return isThisYear(this.date) 
            ? `${thisYearDayLabel} ${this.date.getHours()}:${minutes}` 
            : `${this.date.getFullYear()}/${this.date.getMonth() + 1}/${this.date.getDate()} ${this.date.getHours()}:${minutes}`;
    }    
}
</script>

 PAMapp/components/Ui/UiPagination.vue

@@ -12,7 +12,7 @@

<script lang="ts">
import { Vue, Component, Prop, Emit, Watch } from 'nuxt-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';

@Component
export default class UiPagination extends Vue {

 PAMapp/components/Ui/UiReviewScore.vue

¤ñ¹ï·sÀÉ®×
@@ -0,0 +1,19 @@
<template>
    <span>
        <template v-if="score === 5">★★★★★</template>
        <template v-else-if="score === 4">★★★★</template>
        <template v-else-if="score === 3">★★★</template>
        <template v-else-if="score === 2">★★</template>
        <template v-else-if="score === 1">★</template>
        <template v-else>--</template>
    </span>
</template>

<script lang="ts">
import { Vue, Component, Prop } from 'vue-property-decorator';

@Component
export default class UiReviewScore extends Vue {
    @Prop() score!: number;
}
</script>

 PAMapp/pages/index.vue

@@ -44,7 +44,7 @@

<script lang="ts">
  import { Vue, Component, State, Action, Watch } from 'nuxt-property-decorator';
  import { Consultants } from '~/assets/ts/api/consultant';
  import { Consultants } from '~/assets/ts/models/consultant.model';

  @Component({
    layout: 'home'

 PAMapp/pages/myConsultantList.vue

@@ -26,7 +26,7 @@

<script lang='ts'>
import { Vue, Component, Watch, State, Action } from 'nuxt-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';

@Component
export default class myConsultantList extends Vue {

 PAMapp/pages/myConsultantList/consultantList.vue

@@ -13,7 +13,8 @@

<script lang="ts">
import { Vue, Component, Prop, Getter } from 'nuxt-property-decorator';
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';


@Component
export default class ConsultantPage extends Vue {

 PAMapp/pages/myConsultantList/contactedList.vue

@@ -13,7 +13,8 @@

<script lang="ts">
import { Vue, Component, Prop } from 'nuxt-property-decorator' ;
import { Consultants } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';


@Component
export default class ContactedList extends Vue {

 PAMapp/pages/quickFilter/index.vue

@@ -66,7 +66,8 @@

<script lang="ts">
import { Vue, Component, namespace } from 'nuxt-property-decorator';
import { Consultants, FastQueryParams } from '~/assets/ts/api/consultant';
import { FastQueryParams } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';
import { Selected } from '~/components/QuickFilter/QuickFilterSelector.vue';
import { fastQuery } from '~/assets/ts/api/consultant';


 PAMapp/store/index.ts

@@ -1,8 +1,10 @@
import { Module, VuexModule, Mutation, Action } from 'vuex-module-decorators'
import { allAppointmentsView, ClientInfo, getMyAppointmentList } from '~/assets/ts/api/appointment';
import { ClientInfo, getMyAppointmentList, getMyReviewLog, allAppointmentsView } from '~/assets/ts/api/appointment';
// import * as consultant from '~/assets/ts/api/consultant';
import { Consultants,recommend,AgentOfStrictQuery, getFavoriteConsultant, addFavoriteConsultant, deleteConsultant, strictQuery } from '~/assets/ts/api/consultant';
import { recommend, AgentOfStrictQuery, getFavoriteConsultant, addFavoriteConsultant, deleteConsultant, strictQuery } from '~/assets/ts/api/consultant';
import { Consultants } from '~/assets/ts/models/consultant.model';
import { isLogin } from '~/assets/ts/auth';
import { AppointmentLog } from '~/assets/ts/models/appointment.model';
import { getFavoriteFromStorage, setFavoriteToStorage } from '~/assets/ts/storageConsultant';

@Module
@@ -12,6 +14,8 @@
    myConsultantList: Consultants[] = [];

    myAppointmentList: ClientInfo[] = [];

    myAppointmentReviewLogList: AppointmentLog[] = [];

    @Mutation updateRecommend(data: Consultants[]) {
        this.recommendList = data;
@@ -27,6 +31,10 @@

    @Mutation updateMyAppointmentList(data: ClientInfo[]) {
        this.myAppointmentList = data;
    }

    @Mutation updateMyAppointmentReviewLog(data: AppointmentLog[]) {
        this.myAppointmentReviewLogList = data;
    }

    @Action storeRecommendList() {
@@ -104,6 +112,13 @@
        });
    }

    @Action
    storeMyAppointmentReviewLog() {
        getMyReviewLog().then((data) => {
            this.context.commit('updateMyAppointmentReviewLog', data);
        });
    }

    @Action updateMyAppointment(myAppointment: ClientInfo) {
        const data = this.myAppointmentList.filter(item => item.id !== myAppointment.id);
        data.unshift(myAppointment);