From 3712b0a6ff1329ecf4d5ea5ba879e28b428c565e Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期三, 26 一月 2022 14:51:44 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/components/Consultant/ConsultantCard.vue | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index a6cf709..643c895 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -31,7 +31,7 @@
<div
class="delete"
v-if="showRemoveBtn"
- @click="removeAgent"
+ @click="isRemoveAgentPopup = true"
>蝘駁</div>
<div
v-if="notScoreAppointmentYet"
@@ -45,7 +45,7 @@
:class="actionBtnStyle"
>{{ actionBtnLabel }}</el-button>
<div class="updateTime mt-10">
- {{ agentInfo.updateTime | formatDate }}
+ {{ agentInfo.appointmentLastModifiedDate | formatDate }}
</div>
</el-col>
</el-row>
@@ -53,12 +53,12 @@
<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">
+ <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}} 撱箇��</p>
+ <div class="reserved-info">
<p>憪��{appointmentDetail.name}}</p>
<p>�閰梧�{appointmentDetail.phone}}</p>
<p>Email嚗{appointmentDetail.email}}</p>
@@ -80,7 +80,7 @@
</div>
</div>
- <div v-if="notScoreAppointmentYet" class="dialogInfo-btn">
+ <div v-if="notScoreAppointmentYet" class="reserved-btn">
<el-button type="primary"
@click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
</div>
@@ -92,11 +92,11 @@
</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="mt-30 reviewDialog-content">
+ <div class="mt-30 review-content">
<UiAvatar :size="80" :agentNo="agentInfo.agentNo"></UiAvatar>
<div class="review-text">撠憿批��
<span class="text--primary">{{agentInfo.name}}</span>
@@ -104,11 +104,11 @@
</div>
</div>
- <div class="dialogInfo-score">
+ <div class="review-score">
<el-rate v-model="inputScore" class="pam-rate mt-30"></el-rate>
</div>
- <div class="dialogInfo-btn">
+ <div class="review-btn">
<el-button
type="primary"
:disabled="!inputScore"
@@ -125,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>
@@ -181,6 +189,8 @@
isCancelPopup = false;
hideReviews = hideReviews;
isConfirmPopup = false;
+ isRemoveAgentPopup = false;
+ confirmTxt = '';
appointmentDetail: any = {
age : '',
@@ -208,16 +218,16 @@
get notScoreAppointmentYet(): boolean {
const isAppointment = !!this.agentInfo['appointmentStatus'];
if (!isAppointment) return false;
- return !this.agentInfo['appointmentScore'];
+ return this.agentInfo['appointmentStatus'] !== 'contacted' ? !this.agentInfo['appointmentScore'] : false;
}
get isAppointment(): boolean {
return !!this.agentInfo['appointmentStatus'];
}
- get latestReservedAppointment(): Appointment {
+ get latestNotClosedAppointment(): Appointment {
return this.agentInfo.appointments!
- .filter((appointment) => appointment.communicateStatus !== 'contacted')
+ .filter((appointment) => appointment.communicateStatus === 'reserved' || appointment.communicateStatus === 'contacted')
.map((reversedAppointment) => {
return {
...reversedAppointment,
@@ -255,6 +265,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') {
return '撌脰蝯�';
@@ -274,6 +290,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') {
@@ -313,7 +335,7 @@
const isAppointment = !!this.agentInfo['appointmentStatus'];
const appointmentId = isAppointment
? this.agentInfo['appointmentId']
- : this.latestReservedAppointment.id;
+ : this.latestNotClosedAppointment.id;
appointmentService.getAppointmentDetail(appointmentId!).then(res => {
this.appointmentDetail = {
@@ -327,6 +349,12 @@
removeAgent() {
this.removeFromMyConsultantList(this.agentInfo.agentNo).then((removeOk) => {
+ this.isRemoveAgentPopup = false;
+ setTimeout(() => {
+ this.confirmTxt = '蝘駁憿批��';
+ this.isConfirmPopup = true;
+ }, 300);
+
});
}
@@ -338,7 +366,7 @@
const isAppointment = !!this.agentInfo['appointmentStatus'];
const appointmentId = isAppointment
? this.agentInfo['appointmentId']
- : this.latestReservedAppointment.id;
+ : this.latestNotClosedAppointment.id;
const reviewParams: UserReviewsConsultantsParams = {
appointmentId: appointmentId,
@@ -353,12 +381,14 @@
}
cancel() {
- appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ appointmentService.cancelAppointment(this.latestNotClosedAppointment.id).then(res => {
this.storeConsultantList();
this.isVisibleDialog = false;
this.isCancelPopup = false;
setTimeout(() => {
+ this.confirmTxt = '���迨蝑���';
this.isConfirmPopup = true;
+
}, 300);
});
}
@@ -410,6 +440,7 @@
}
.delete {
+ display: inline-block;
color: $PRIMARY_RED;
font-size: 14px;
font-weight: bold;
@@ -438,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;
@@ -451,32 +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: 30px;
- }
- .reviewDialog-content {
- display: flex;
- flex-direction: row;
- justify-content: space-evenly;
-
- .review-text {
- width: 60%;
- line-height: 28px;
- @extend .p;
- @extend .text--lighter;
- }
- }
-
</style>
--
Gitblit v1.8.0