From 60dc6e178e4ab05ea8f62f7baa1dd72a5c20f93c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期一, 13 十二月 2021 16:10:13 +0800
Subject: [PATCH] fixed#132096: 查看完聯絡清單(或登出後再登入)，顧問清單的黃點並不會消失
---
PAMapp/components/Consultant/ConsultantCard.vue | 343 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 284 insertions(+), 59 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 88b44c4..2f161fb 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,19 +1,27 @@
<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">
- <el-avatar
+ <UiAvatar
:size="50"
- :src="agentInfo.img"
- class="cursor--pointer"
- @click.native="$router.push('/agentInfo')"
- ></el-avatar>
- <div class="satisfaction">
- <i class="icon-star pam-icon icon--yellow satisfaction"></i>
- <span>{{agentInfo.satisfaction}}</span>
+ :fileName="avatarFileName"
+ @click.native="showAgentDetail(agentInfo.agentNo)"
+ ></UiAvatar>
+ <!-- TODO:���遛��漲 -->
+ <div v-if="!hideReviews">
+ <i class="icon-star pam-icon icon--yellow satisfaction" v-if="!(latestContactedAppointment && !latestContactedAppointment.satisfactionScore)"></i>
+ <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">
@@ -21,13 +29,14 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(professional, index) in agentInfo.professionals"
+ v-for="(expertise, index) in agentInfo.expertise"
:key="index"
- >#{{professional}}</span>
+ >#{{expertise}}</span>
</div>
<div
class="delete"
- v-if="agentInfo.contactStatus === 'picked'"
+ v-if="agentInfo.contactStatus === 'picked'
+ || !agentInfo.contactStatus"
@click="removeAgent"
>蝘駁</div>
</el-col>
@@ -37,70 +46,273 @@
@click="reserveCommunication"
:class="agentInfo.contactStatus + 'Btn'"
>{{ contactTxt }}</el-button>
- <div class="updateTime">{{updateTime}}</div>
+ <div class="updateTime mt-10">
+ {{ displayTime | formatDate }}
+ </div>
</el-col>
</el-row>
</el-col>
</el-row>
- <Ui-Dialog :isVisible.sync="isVisibleDialog">
- <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>
+ <Ui-Dialog
+ :isVisible.sync="isVisibleDialog"
+ :width="width"
+ class="pam-myDemand-dialog"
+ >
+ <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="agentInfo.contactStatus === 'contacted'
+ && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
+ <el-button type="primary"
+ @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
+ </div>
+
+ <div v-if="agentInfo.contactStatus === 'reserved'" 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>
</div>
</template>
<script lang="ts">
-import { Vue, Component, Prop, Emit } from 'nuxt-property-decorator';
-import { Agents } from '~/plugins/api/home';
+import { Vue, Component, Prop, Action, namespace } from 'nuxt-property-decorator';
+import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants, cancelAppointment } from '~/assets/ts/api/consultant';
+import { Consultant, Appointment } from '~/assets/ts/models/consultant.model';
+import { isMobileDevice } from '~/assets/ts/device';
+import { Role } from '~/assets/ts/models/enum/Role';
+import { hideReviews } from '~/assets/ts/const/hide-reviews';
-@Component
-export default class ConsultantCard extends Vue {
- @Prop() agentInfo!: Agents;
- isVisibleDialog = false;
-
- get contactTxt() {
- if (this.agentInfo.contactStatus === 'contacted') {
- return '撌脰蝯�'
- } else if (this.agentInfo.contactStatus === 'reserved') {
- return '撌脤���'
- } else {
- return '�脰����'
+const roleStorage = 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 {
+ @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
+ @Action storeConsultantList!: any;
+ @Prop() agentInfo!: Consultant;
+ @roleStorage.Getter currentRole!:string;
- get updateTime() {
- const newDate = new Date(this.agentInfo.updateTime);
- let year = newDate.getFullYear();
- let month = newDate.getMonth() + 1;
- let date = newDate.getDate();
- let hours = newDate.getHours();
- let minutes = newDate.getMinutes();
- return `${year}/${month}/${date} ${hours} : ${minutes}`
+ isVisibleDialog = false;
+ reviewsBtn = false;
+ status = false;
+ width: string = '';
+ inputScore = 0;
+ isCancelPopup = false;
+ hideReviews = hideReviews;
+
+ 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];
+ }
+
+ 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 displayTime(): string {
+ let time: Date | string = '';
+ switch(this.agentInfo.contactStatus) {
+ case 'reserved':
+ time = this.agentInfo.updateTime
+ break;
+ case 'contacted':
+ time = this.agentInfo.updateTime
+ break;
+ case 'picked':
+ time = this.agentInfo.createTime
+ break;
+ }
+ if (typeof time !== 'string') {
+ time.toString();
+ }
+ return time as string;
+ }
+
+ 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 avatarFileName() {
+ return this.agentInfo.img;
+ }
+
+ get gender() {
+ if (this.appointmentDetail.gender) {
+ return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
+ }
+ return ''
+ }
+ get contactTxt() {
+ if (this.agentInfo.contactStatus === 'contacted') {
+ return '撌脰蝯�';
+ }
+ if (this.agentInfo.contactStatus === 'reserved') {
+ return '撌脤���';
+ }
+ return '�脰����';
+ }
+
+ get hopeContactTime() {
+ const contactList = this.appointmentDetail.hopeContactTime
+ .split("'").map(item => item.slice(0, item.length));
+ return contactList.filter(item => !!item && item !== ",")
}
reserveCommunication() {
- if (this.agentInfo.contactStatus === 'picked') {
- this.$router.push('/communication/myDemand')
+ const contactStatus = this.agentInfo.contactStatus;
+ if (!contactStatus || contactStatus === 'picked') {
+ this.currentRole === Role.USER
+ ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
+ : this.$router.push('/login');
} else {
- this.isVisibleDialog = true;
+ this.openPopUp();
}
}
- @Emit('removeAgent') removeAgent() {
- return this.agentInfo.agentNo;
+ openPopUp() {
+ const appointmentId = this.agentInfo.contactStatus === 'contacted'
+ ? this.latestContactedAppointment?.id
+ : this.latestReservedAppointment.id;
+
+ getAppointmentDetail(appointmentId!).then(res => {
+ this.appointmentDetail = {
+ ...this.appointmentDetail,
+ ...res.data
+ };
+ this.width = isMobileDevice() ? '80%' : '';
+ this.isVisibleDialog = true;
+ });
+ }
+
+ 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() {
+ cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ this.storeConsultantList();
+ this.isVisibleDialog = false;
+ this.isCancelPopup = false;
+ });
+ }
+
+ edit() {
+ this.isVisibleDialog = false;
+ this.$router.push({path: `/questionnaire/${this.agentInfo.agentNo}`, query: {'edit': 'true'}});
}
}
+
</script>
<style lang="scss" scoped>
@@ -110,13 +322,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 {
@@ -124,6 +333,11 @@
font-weight: bold;
margin-top: 5px;
}
+ .unfilled {
+ font-size: 12px;
+ padding-top: 5px;
+ padding-left: 5px;
+ }
.professionals {
height: 20px;
@@ -184,6 +398,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