From abfd26bb700d93a92da6a04703b0187d4acaaeb5 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期三, 22 十二月 2021 10:13:02 +0800 Subject: [PATCH] refactor: move ts folder to shared folder --- PAMapp/components/Consultant/ConsultantCard.vue | 388 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 336 insertions(+), 52 deletions(-) diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue index de25687..1bc5269 100644 --- a/PAMapp/components/Consultant/ConsultantCard.vue +++ b/PAMapp/components/Consultant/ConsultantCard.vue @@ -1,18 +1,26 @@ <template> <div> - <el-row type="flex" class="rowStyle"> - <el-col :xs="2" :sm="1" :class="{'state': agentInfo.new}"></el-col> + <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }"> + + <el-col :xs="2" :sm="1"></el-col> <el-col :xs="22" :sm="23"> <el-row type="flex"> <el-col class="flex_column" :xs="5" :sm="3"> <UiAvatar :size="50" - :fileName="agentInfo.img" + :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> + <!-- 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> </el-col> <el-col :xs="10" :sm="15"> @@ -26,8 +34,7 @@ </div> <div class="delete" - v-if="agentInfo.contactStatus === 'picked' - || !agentInfo.contactStatus" + v-if="showRemoveBtn" @click="removeAgent" >蝘駁</div> </el-col> @@ -35,9 +42,11 @@ <el-button class="smTxt_bold outline_btn" @click="reserveCommunication" - :class="agentInfo.contactStatus + 'Btn'" - >{{ contactTxt }}</el-button> - <div class="updateTime" v-if="updateTime">{{updateTime | formatDate}}</div> + :class="actionBtnStyle" + >{{ actionBtnLabel }}</el-button> + <div class="updateTime mt-10"> + {{ displayTime | formatDate }} + </div> </el-col> </el-row> </el-col> @@ -46,66 +55,328 @@ <Ui-Dialog :isVisible.sync="isVisibleDialog" :width="width" + class="pam-myDemand-dialog" > - <h5 class="subTitle text--center mb-30">������</h5> - <p class="smTxt">隞予 10:00</p> - <div class="dialogInfo"> - <p>憪������</p> - <p>�閰梧��0912345678</p> - <p>Email嚗�</p> - <p>�批 嚗��</p> - <p>撟湧翩嚗�26-30</p> - <p>�璆哨����璆�</p> - <p>��瘙���瑼�/閬���靽����</p> - <p>��蝯⊥�挾銝�嚗���,��� 18:00~21:00</p> + <div v-if="appointmentDetail"> + <h5 class="subTitle text--center mb-30">������</h5> + <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p> + <div class="dialogInfo"> + <p>憪��{appointmentDetail.name}}</p> + <p>�閰梧�{appointmentDetail.phone}}</p> + <p>Email嚗{appointmentDetail.email}}</p> + <p>�批嚗{gender}}</p> + <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p> + <p>�璆哨�{appointmentDetail.job}}</p> + <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p> + <p + 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="notScoreAppointmentYet" class="dialogInfo-btn"> + <el-button type="primary" + @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button> + </div> + + <div v-if="agentInfo.contactStatus === 'reserved' && !isAppointment" class="text--center mt-10"> + <el-button @click="isCancelPopup = true">������</el-button> + <el-button @click="edit" type="primary">蝺刻摩</el-button> + </div> </div> </Ui-Dialog> + <PopUpFrame :isOpen.sync="reviewsBtn"> + <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> + + <PopUpFrame :isOpen.sync="isCancelPopup"> + <div class="text--center mdTxt">�����迨蝑����</div> + <div class="text--center mt-30"> + <el-button @click="isCancelPopup = false">�</el-button> + <el-button @click="cancel" type="primary">�</el-button> + </div> + </PopUpFrame> + + <PopUpFrame :isOpen.sync="isConfirmPopup"> + <div class="text--center mdTxt">撌脫����迨蝑���</div> + <div class="text--center mt-30"> + <el-button @click="isConfirmPopup = false" type="primary">蝣箏��</el-button> + </div> + </PopUpFrame> </div> </template> <script lang="ts"> -import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator'; -import { Consultants } from '~/assets/ts/api/consultant'; -import { isLogin } from '~/assets/ts/auth'; -import { isMobileDevice } from '~/assets/ts/device'; +import { Vue, Component, Prop, Action, namespace } from 'nuxt-property-decorator'; -@Component +import appointmentService from '~/shared/services/appointment.service'; +import { isMobileDevice } from '~/shared/device'; +import { hideReviews } from '~/shared/const/hide-reviews'; +import { UserReviewsConsultantsParams, userReviewsConsultants } from '~/shared/api/consultant'; +import { Consultant, ConsultantWithAppointmentId } from '~/shared/models/consultant.model'; +import { Appointment } from '~/shared/models/appointment.model'; + +const localStorage = namespace('localStorage'); +@Component({ + filters: { + formatNumber(index: number) { + if (index) { + const upperNumber = ['�', '銝�', '鈭�', '銝�', '���', '鈭�', '�', '銝�', '�', '銋�', '���'] + return upperNumber[index]; + } + }, + formatHopeContactTime(item: string): string { + 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 ''; + } + } +}) export default class ConsultantCard extends Vue { - @Prop() agentInfo!: Consultants; - isVisibleDialog = false; - width: string = ''; - get contactTxt() { + @Prop() + agentInfo!: Consultant | ConsultantWithAppointmentId; + + @localStorage.State('current_role') + currentRole!: string; + + isVisibleDialog = false; + reviewsBtn = false; + status = false; + width: string = ''; + inputScore = 0; + isCancelPopup = false; + hideReviews = hideReviews; + isConfirmPopup = false; + + + appointmentDetail: any = { + 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, + }; + + get notScoreAppointmentYet(): boolean { + const isAppointment = !!this.agentInfo['appointmentStatus']; + if (!isAppointment) return false; + return !this.agentInfo['appointmentScore']; + } + + get isAppointment(): boolean { + return !!this.agentInfo['appointmentStatus'];; + } + + get latestReservedAppointment(): Appointment { + return this.agentInfo.appointments! + .filter((appointment) => appointment.communicateStatus !== 'contacted') + .map((reversedAppointment) => { + return { + ...reversedAppointment, + sortDate: new Date(reversedAppointment.appointmentDate) + } + }) + .sort((preAppointment, nextAppointment) => +nextAppointment.sortDate - +preAppointment.sortDate)[0]; + } + + get showRemoveBtn(): boolean { + const isAppointment = !!this.agentInfo['appointmentStatus']; + if (isAppointment) { + return false; + } else { + return this.agentInfo.contactStatus === 'picked' || !this.agentInfo.contactStatus; + } + } + + get displayTime(): string { + const isAppointment = !!this.agentInfo['appointmentStatus']; + let time: Date | string = ''; + if (isAppointment) { + time = this.agentInfo['appointmentDate']; + } else { + switch(this.agentInfo.contactStatus) { + case 'reserved': + time = this.agentInfo.updateTime; + break; + case 'picked': + time = this.agentInfo.updateTime; + break; + } + } + if (typeof time !== 'string') { + time.toString(); + } + return time as string; + } + + get avatarFileName() { + return this.agentInfo.img; + } + + get gender() { + if (this.appointmentDetail.gender) { + return this.appointmentDetail.gender === 'male' ? '���' : '憟單��'; + } + return '' + } + get actionBtnLabel() { + const isAppointment = !!this.agentInfo['appointmentStatus']; + if (isAppointment) { + if (this.agentInfo['appointmentStatus'] === 'contacted') { + return '撌脰蝯�'; + } + if (this.agentInfo['appointmentStatus'] === 'reserved') { + return '撌脤���'; + } + } else { if (this.agentInfo.contactStatus === 'contacted') { - return '撌脰蝯�' - } else if (this.agentInfo.contactStatus === 'reserved') { - return '撌脤���' + return '撌脰蝯�'; + } + if (this.agentInfo.contactStatus === 'reserved') { + return '撌脤���'; + } + } + return '�脰����'; + } + + get actionBtnStyle() { + const isAppointment = !!this.agentInfo['appointmentStatus']; + if (isAppointment) { + if (this.agentInfo['appointmentStatus'] === 'contacted') { + return 'contactedBtn'; + } + if (this.agentInfo['appointmentStatus'] === 'reserved') { + return 'reservedBtn'; + } + } else { + if (this.agentInfo.contactStatus === 'contacted') { + return 'contactedBtn'; + } + if (this.agentInfo.contactStatus === 'reserved') { + return 'reservedBtn'; + } + } + } + + get hopeContactTime() { + const contactList = this.appointmentDetail.hopeContactTime + .split("'").map((item: any) => item.slice(0, item.length)); + return contactList.filter((item: any) => !!item && item !== ",") + } + + ////////////////////////////////////////////////////////////////////// + + @Action + removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>; + + @Action + storeConsultantList!: () => void; + + reserveCommunication() { + const isAppointment = !!this.agentInfo['appointmentStatus']; + const contactStatus = this.agentInfo.contactStatus; + if (!isAppointment && (!contactStatus || contactStatus === 'picked')) { + this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`); } else { - return '�脰����' + this.openPopUp(); } } - get updateTime() { - return isLogin() ? this.agentInfo.updateTime : ''; - } - reserveCommunication() { - const contactStatus = this.agentInfo.contactStatus; - if (contactStatus !== 'reserved' && contactStatus !== 'contacted') { - isLogin() ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`) : this.$router.push('/login'); - } else { + openPopUp(): void { + const isAppointment = !!this.agentInfo['appointmentStatus']; + const appointmentId = isAppointment + ? this.agentInfo['appointmentId'] + : this.latestReservedAppointment.id; + + appointmentService.getAppointmentDetail(appointmentId!).then(res => { + this.appointmentDetail = { + ...res, + satisfactionScore: this.agentInfo['appointmentScore'], + }; this.width = isMobileDevice() ? '80%' : ''; this.isVisibleDialog = true; - } + }); } - @Emit('removeAgent') removeAgent() { - return this.agentInfo.agentNo; + removeAgent() { + this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => { + }); } 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(); + }); + } + + cancel() { + appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => { + this.storeConsultantList(); + this.isVisibleDialog = false; + this.isCancelPopup = false; + setTimeout(() => { + this.isConfirmPopup = true; + }, 300); + }); + } + + edit() { + this.isVisibleDialog = false; + this.$router.push({path: `/questionnaire/${this.agentInfo.agentNo}`, query: {'edit': 'true'}}); + } } + </script> <style lang="scss" scoped> @@ -115,13 +386,10 @@ margin-bottom: 10px; display: flex; justify-content: space-between; + border-left: 4px solid transparent; - .state { - width: 10px; - height: 10px; - border-radius: 50px; - background-color: $YELLOW; - margin: auto 0; + &.new { + border-color: $YELLOW; } .satisfaction { @@ -129,6 +397,11 @@ font-weight: bold; margin-top: 5px; } + .unfilled { + font-size: 12px; + padding-top: 5px; + padding-left: 5px; + } .professionals { height: 20px; @@ -189,6 +462,17 @@ .dialogInfo { font-size: 20px; + overflow-y:scroll; + height: 400px; + } + .dialogInfo-btn{ + display: flex; + justify-content: center; + } + .dialogInfo-score{ + display: flex; + justify-content: center; + margin-bottom: 50px; } </style> -- Gitblit v1.8.0