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 | 201 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 131 insertions(+), 70 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index c3dad48..2f161fb 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,8 +1,8 @@
<template>
<div>
- <el-row type="flex" class="rowStyle">
+ <el-row type="flex" class="rowStyle" :class="{'new': !agentInfo.customerViewTime }">
- <el-col :xs="2" :sm="1" :class="{'state': agentInfo.new}"></el-col>
+ <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">
@@ -11,12 +11,17 @@
:fileName="avatarFileName"
@click.native="showAgentDetail(agentInfo.agentNo)"
></UiAvatar>
- <div>
+ <!-- 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'">{{ 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 +29,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>
@@ -41,7 +46,9 @@
@click="reserveCommunication"
:class="agentInfo.contactStatus + 'Btn'"
>{{ contactTxt }}</el-button>
- <div class="updateTime" v-if="updateTime">{{updateTime | formatDate}}</div>
+ <div class="updateTime mt-10">
+ {{ displayTime | formatDate }}
+ </div>
</el-col>
</el-row>
</el-col>
@@ -68,48 +75,62 @@
: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 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 === 'contacted'
- && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
- <el-button type="primary"
- @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
+ <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" drawerSize='30%'>
+ <PopUpFrame :isOpen.sync="reviewsBtn">
<div class="mdTxt">
靽憿批�遛��漲
<span class="hint">������</span>
- <div class="dialogInfo-score">
+ <div class="dialogInfo-score">
<el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate>
</div>
<div class="dialogInfo-btn">
- <el-button
+ <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, Action, State } from 'nuxt-property-decorator';
-import { getAppointmentDetail, UserReviewsConsultantsParams, userReviewsConsultants } from '~/assets/ts/api/consultant';
+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 { isLogin } from '~/assets/ts/auth';
import { isMobileDevice } from '~/assets/ts/device';
+import { Role } from '~/assets/ts/models/enum/Role';
+import { hideReviews } from '~/assets/ts/const/hide-reviews';
-
+const roleStorage = namespace('localStorage');
@Component({
filters: {
formatNumber(index: number) {
@@ -119,13 +140,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 '';
}
}
})
@@ -133,12 +154,16 @@
@Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
@Action storeConsultantList!: any;
@Prop() agentInfo!: Consultant;
+ @roleStorage.Getter currentRole!:string;
+
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
@@ -146,37 +171,64 @@
.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: '',
+ 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' ? '���' : '憟單��';
@@ -193,10 +245,6 @@
return '�脰����';
}
- get updateTime() {
- return isLogin() ? this.agentInfo.updateTime : '';
- }
-
get hopeContactTime() {
const contactList = this.appointmentDetail.hopeContactTime
.split("'").map(item => item.slice(0, item.length));
@@ -206,7 +254,7 @@
reserveCommunication() {
const contactStatus = this.agentInfo.contactStatus;
if (!contactStatus || contactStatus === 'picked') {
- isLogin()
+ this.currentRole === Role.USER
? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
: this.$router.push('/login');
} else {
@@ -215,12 +263,11 @@
}
openPopUp() {
- 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 => {
+ const appointmentId = this.agentInfo.contactStatus === 'contacted'
+ ? this.latestContactedAppointment?.id
+ : this.latestReservedAppointment.id;
+
+ getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
...this.appointmentDetail,
...res.data
@@ -232,7 +279,6 @@
removeAgent() {
this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
- console.log('removeOk?', removeOk);
});
}
@@ -252,6 +298,19 @@
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>
@@ -263,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 {
@@ -277,6 +333,11 @@
font-weight: bold;
margin-top: 5px;
}
+ .unfilled {
+ font-size: 12px;
+ padding-top: 5px;
+ padding-left: 5px;
+ }
.professionals {
height: 20px;
@@ -350,4 +411,4 @@
margin-bottom: 50px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0