From dbdf05da89c536d310394cd3e09fc0b16d762fd8 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期一, 24 一月 2022 16:34:43 +0800
Subject: [PATCH] fixed TODO#134626 調整移除按鈕點選範圍、點選移除時增加確認dialog
---
PAMapp/components/Consultant/ConsultantCard.vue | 344 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 190 insertions(+), 154 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index 2b0ddc5..8ea5a64 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,66 +1,64 @@
<template>
<div>
<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="avatarFileName"
- @click.native="showAgentDetail(agentInfo.agentNo)"
- ></UiAvatar>
- <!-- 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">
- <div class="smTxt_bold name">{{agentInfo.name}}</div>
- <div class="professionals">
- <span
- class="professionalsTxt"
- v-for="(expertise, index) in agentInfo.expertise"
- :key="index"
- >#{{expertise}}</span>
- </div>
- <div
- class="delete"
- v-if="showRemoveBtn"
- @click="removeAgent"
- >蝘駁</div>
- </el-col>
- <el-col class="flex_column" :xs="9" :sm="6">
- <el-button
- class="smTxt_bold outline_btn"
- @click="reserveCommunication"
- :class="actionBtnStyle"
- >{{ actionBtnLabel }}</el-button>
- <div class="updateTime mt-10">
- {{ displayTime | formatDate }}
- </div>
- </el-col>
- </el-row>
+ <el-col class="flex_column pl-5" :xs="5" :sm="3">
+ <UiAvatar
+ :size="50"
+ :agentNo="agentInfo.agentNo"
+ @click.native="showAgentDetail(agentInfo.agentNo)"
+ ></UiAvatar>
+ <!-- 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">
+ <div class="smTxt_bold name">{{agentInfo.name}}</div>
+ <div class="professionals">
+ <span
+ class="professionalsTxt"
+ v-for="(expertise, index) in agentInfo.expertise"
+ :key="index"
+ >#{{expertise}}</span>
+ </div>
+ <div
+ class="delete"
+ v-if="showRemoveBtn"
+ @click="isRemoveAgentPopup = true"
+ >蝘駁</div>
+ <div
+ v-if="notScoreAppointmentYet"
+ class="text--primary text--underline cursor--pointer xsTxt text--bold"
+ @click="reviewsBtn = true">蝯虫�遛��漲閰��</div>
+ </el-col>
+ <el-col class="flex_column" :xs="9" :sm="6">
+ <el-button
+ class="smTxt_bold outline_btn"
+ @click="reservedOrShowAppointmentInfo"
+ :class="actionBtnStyle"
+ >{{ actionBtnLabel }}</el-button>
+ <div class="updateTime mt-10">
+ {{ agentInfo.updateTime | formatDate }}
+ </div>
</el-col>
</el-row>
<Ui-Dialog
:isVisible.sync="isVisibleDialog"
:width="width"
- class="pam-myDemand-dialog"
+ class="pam-myDemand-dialog pam-dialog-reserved"
>
<div v-if="appointmentDetail">
<h5 class="subTitle text--center mb-30">������</h5>
<p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
- <div class="dialogInfo">
+ <div class="reserved-info">
<p>憪��{appointmentDetail.name}}</p>
<p>�閰梧�{appointmentDetail.phone}}</p>
<p>Email嚗{appointmentDetail.email}}</p>
@@ -82,26 +80,35 @@
</div>
</div>
- <div v-if="agentInfo.contactStatus === 'contacted'
- && !appointmentDetail.satisfactionScore" class="dialogInfo-btn">
+ <div v-if="notScoreAppointmentYet" class="reserved-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>
</div>
</Ui-Dialog>
- <PopUpFrame :isOpen.sync="reviewsBtn">
- <div class="mdTxt">
+
+ <PopUpFrame :isOpen.sync="reviewsBtn" class="reviewDialog-content">
+ <div class="mdTxt pam-dialog-review">
靽憿批�遛��漲
<span class="hint">������</span>
- <div class="dialogInfo-score">
- <el-rate v-model="inputScore" class="pam-quickFilter-rate"></el-rate>
+ <div class="mt-30 review-content">
+ <UiAvatar :size="80" :agentNo="agentInfo.agentNo"></UiAvatar>
+ <div class="review-text">撠憿批��
+ <span class="text--primary">{{agentInfo.name}}</span>
+ ��擃���蝯虫�嗾憿��嚗�
+ </div>
</div>
- <div class="dialogInfo-btn">
+
+ <div class="review-score">
+ <el-rate v-model="inputScore" class="pam-rate mt-30"></el-rate>
+ </div>
+
+ <div class="review-btn">
<el-button
type="primary"
:disabled="!inputScore"
@@ -118,10 +125,18 @@
</div>
</PopUpFrame>
- <PopUpFrame :isOpen.sync="isConfirmPopup">
- <div class="text--center mdTxt">撌脫����迨蝑���</div>
+ <PopUpFrame :isOpen.sync="isConfirmPopup">
+ <div class="text--center mdTxt">撌脫��{confirmTxt}}</div>
<div class="text--center mt-30">
<el-button @click="isConfirmPopup = false" type="primary">蝣箏��</el-button>
+ </div>
+ </PopUpFrame>
+
+ <PopUpFrame :isOpen.sync="isRemoveAgentPopup">
+ <div class="text--center mdTxt">��蝘駁憿批�� <span class="text--primary">{{agentInfo.name}}</span>嚗�</div>
+ <div class="text--center mt-30">
+ <el-button @click="isRemoveAgentPopup = false">�</el-button>
+ <el-button @click="removeAgent" type="primary">�</el-button>
</div>
</PopUpFrame>
</div>
@@ -129,14 +144,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, ConsultantWithAppointmentId } from '~/assets/ts/models/consultant.model';
-import { Appointment } from '~/assets/ts/models/appointment.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 UtilsService from '~/shared/services/utils.service';
+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) {
@@ -158,16 +175,11 @@
})
export default class ConsultantCard extends Vue {
- @Action
- removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
-
- @Action
- storeConsultantList!: any;
-
@Prop()
agentInfo!: Consultant | ConsultantWithAppointmentId;
- @roleStorage.Getter currentRole!:string;
+ @localStorage.State('current_role')
+ currentRole!: string;
isVisibleDialog = false;
reviewsBtn = false;
@@ -177,53 +189,8 @@
isCancelPopup = false;
hideReviews = hideReviews;
isConfirmPopup = false;
-
- get notScoreAppointmentYet(): boolean {
- if (this.agentInfo.contactStatus !== 'contacted') return false;
- return !this.agentInfo['appointmentScore'];
- }
-
- 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;
- }
+ isRemoveAgentPopup = false;
+ confirmTxt = '';
appointmentDetail: any = {
age : '',
@@ -248,6 +215,37 @@
satisfactionScore : 0,
};
+ get notScoreAppointmentYet(): boolean {
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+ if (!isAppointment) return false;
+ return this.agentInfo['appointmentStatus'] !== 'contacted' ? !this.agentInfo['appointmentScore'] : false;
+ }
+
+ get isAppointment(): boolean {
+ return !!this.agentInfo['appointmentStatus'];
+ }
+
+ get latestReservedAppointment(): Appointment {
+ return this.agentInfo.appointments!
+ .filter((appointment) => appointment.communicateStatus === 'reserved')
+ .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 avatarFileName() {
return this.agentInfo.img;
}
@@ -266,6 +264,12 @@
}
if (this.agentInfo['appointmentStatus'] === 'reserved') {
return '撌脤���';
+ }
+ if (this.agentInfo['appointmentStatus'] === 'done') {
+ return '撌脫�漱';
+ }
+ if (this.agentInfo['appointmentStatus'] === 'closed') {
+ return '���漱';
}
} else {
if (this.agentInfo.contactStatus === 'contacted') {
@@ -287,6 +291,12 @@
if (this.agentInfo['appointmentStatus'] === 'reserved') {
return 'reservedBtn';
}
+ if (this.agentInfo['appointmentStatus'] === 'done') {
+ return 'doneBtn';
+ }
+ if (this.agentInfo['appointmentStatus'] === 'closed') {
+ return 'closedBtn';
+ }
} else {
if (this.agentInfo.contactStatus === 'contacted') {
return 'contactedBtn';
@@ -299,40 +309,52 @@
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 !== ",")
}
//////////////////////////////////////////////////////////////////////
- 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');
+ @Action
+ removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
+
+ @Action
+ storeConsultantList!: () => void;
+
+ reservedOrShowAppointmentInfo() {
+ 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'
+ 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.width = UtilsService.isMobileDevice() ? '80%' : '';
this.isVisibleDialog = true;
});
}
removeAgent() {
this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
+ this.isRemoveAgentPopup = false;
+ setTimeout(() => {
+ this.confirmTxt = '蝘駁憿批��';
+ this.isConfirmPopup = true;
+ }, 300);
+
});
}
@@ -341,25 +363,32 @@
}
userReviewsConsultants() {
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+ const appointmentId = isAppointment
+ ? this.agentInfo['appointmentId']
+ : this.latestReservedAppointment.id;
+
const reviewParams: UserReviewsConsultantsParams = {
- appointmentId: this.appointmentDetail.id,
+ appointmentId: appointmentId,
score: this.inputScore,
}
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.confirmTxt = '���迨蝑���';
this.isConfirmPopup = true;
+
}, 300);
});
}
@@ -411,6 +440,7 @@
}
.delete {
+ display: inline-block;
color: $PRIMARY_RED;
font-size: 14px;
font-weight: bold;
@@ -439,6 +469,28 @@
}
}
+ .doneBtn {
+ color: $BEIGE;
+ border-color: $BEIGE;
+
+ &:focus {
+ color: $PRIMARY_WHITE;
+ background-color: $BEIGE;
+ opacity: 0.5;
+ }
+ }
+
+ .closedBtn {
+ color: $PRUDENTIAL_GREY;
+ border-color: $PRUDENTIAL_GREY;
+
+ &:focus {
+ color: $PRIMARY_WHITE;
+ background-color: $PRUDENTIAL_GREY;
+ opacity: 0.5;
+ }
+ }
+
.updateTime {
font-size: 12px;
font-weight: bold;
@@ -452,20 +504,4 @@
flex-direction: column;
justify-content: space-between;
}
-
- .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