From bdae23a40c461c2c6b6ee614f661eac731c949c8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 22 十二月 2021 14:12:05 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
PAMapp/components/Consultant/ConsultantCard.vue | 233 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 149 insertions(+), 84 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 2f161fb..6d2c5ae 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -13,14 +13,13 @@
></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}}
+ <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="agentInfo.contactStatus === 'contacted' &&
- latestContactedAppointment && !latestContactedAppointment.satisfactionScore">�憛�<br />皛踵�漲</div>
+ v-if="notScoreAppointmentYet">�憛�<br />皛踵�漲</div>
<span v-if="agentInfo.contactStatus !== 'contacted'">{{ agentInfo.avgScore }}</span>
</div>
</el-col>
@@ -35,8 +34,7 @@
</div>
<div
class="delete"
- v-if="agentInfo.contactStatus === 'picked'
- || !agentInfo.contactStatus"
+ v-if="showRemoveBtn"
@click="removeAgent"
>蝘駁</div>
</el-col>
@@ -44,8 +42,8 @@
<el-button
class="smTxt_bold outline_btn"
@click="reserveCommunication"
- :class="agentInfo.contactStatus + 'Btn'"
- >{{ contactTxt }}</el-button>
+ :class="actionBtnStyle"
+ >{{ actionBtnLabel }}</el-button>
<div class="updateTime mt-10">
{{ displayTime | formatDate }}
</div>
@@ -75,22 +73,21 @@
: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">
+ <div v-if="notScoreAppointmentYet" 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">
+ <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>
@@ -115,8 +112,15 @@
<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>
+ <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>
@@ -124,13 +128,16 @@
<script lang="ts">
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';
-const roleStorage = namespace('localStorage');
+import appointmentService from '~/shared/services/appointment.service';
+import reviewsService from '~/shared/services/reviews.service';
+import { isMobileDevice } from '~/shared/device';
+import { hideReviews } from '~/shared/const/hide-reviews';
+import { Consultant, ConsultantWithAppointmentId } from '~/shared/models/consultant.model';
+import { Appointment } from '~/shared/models/appointment.model';
+import { UserReviewsConsultantsParams } from '~/shared/models/reviews.model';
+
+const localStorage = namespace('localStorage');
@Component({
filters: {
formatNumber(index: number) {
@@ -151,10 +158,12 @@
}
})
export default class ConsultantCard extends Vue {
- @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
- @Action storeConsultantList!: any;
- @Prop() agentInfo!: Consultant;
- @roleStorage.Getter currentRole!:string;
+
+ @Prop()
+ agentInfo!: Consultant | ConsultantWithAppointmentId;
+
+ @localStorage.State('current_role')
+ currentRole!: string;
isVisibleDialog = false;
reviewsBtn = false;
@@ -163,44 +172,8 @@
inputScore = 0;
isCancelPopup = false;
hideReviews = hideReviews;
+ isConfirmPopup = false;
- 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 : '',
@@ -225,6 +198,58 @@
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;
}
@@ -235,42 +260,79 @@
}
return ''
}
- get contactTxt() {
+ 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 '撌脰蝯�';
}
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 => item.slice(0, item.length));
- return contactList.filter(item => !!item && item !== ",")
+ .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 contactStatus = this.agentInfo.contactStatus;
- if (!contactStatus || contactStatus === 'picked') {
- this.currentRole === Role.USER
- ? this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`)
- : this.$router.push('/login');
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+ const contactStatus = this.agentInfo.contactStatus;
+ if (!isAppointment && (!contactStatus || contactStatus === 'picked')) {
+ this.$router.push(`/questionnaire/${this.agentInfo.agentNo}`);
} else {
this.openPopUp();
}
}
- openPopUp() {
- const appointmentId = this.agentInfo.contactStatus === 'contacted'
- ? this.latestContactedAppointment?.id
+ openPopUp(): void {
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+ const appointmentId = isAppointment
+ ? this.agentInfo['appointmentId']
: this.latestReservedAppointment.id;
- getAppointmentDetail(appointmentId!).then(res => {
+ appointmentService.getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
- ...this.appointmentDetail,
- ...res.data
+ ...res,
+ satisfactionScore: this.agentInfo['appointmentScore'],
};
this.width = isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
@@ -293,17 +355,20 @@
}
this.appointmentDetail.satisfactionScore = this.inputScore;
- userReviewsConsultants(reviewParams).then((res) => {
+ reviewsService.userReviewsConsultants(reviewParams).then((res) => {
this.reviewsBtn = false;
this.storeConsultantList();
});
}
cancel() {
- cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
this.storeConsultantList();
this.isVisibleDialog = false;
this.isCancelPopup = false;
+ setTimeout(() => {
+ this.isConfirmPopup = true;
+ }, 300);
});
}
--
Gitblit v1.8.0