From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 30 十二月 2021 15:20:08 +0800
Subject: [PATCH] Merge branch 'Phase2'
---
PAMapp/components/Consultant/ConsultantCard.vue | 306 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 210 insertions(+), 96 deletions(-)
diff --git a/PAMapp/components/Consultant/ConsultantCard.vue b/PAMapp/components/Consultant/ConsultantCard.vue
index bd059f7..2c91291 100644
--- a/PAMapp/components/Consultant/ConsultantCard.vue
+++ b/PAMapp/components/Consultant/ConsultantCard.vue
@@ -1,22 +1,26 @@
<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">
<UiAvatar
:size="50"
- :fileName="avatarFileName"
+ :agentNo="agentInfo.agentNo"
@click.native="showAgentDetail(agentInfo.agentNo)"
></UiAvatar>
- <div>
- <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 || '�憛急遛��漲' }}
+ <!-- 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">
@@ -24,14 +28,13 @@
<div class="professionals">
<span
class="professionalsTxt"
- v-for="(expertise, index) in expertises"
+ v-for="(expertise, index) in agentInfo.expertise"
:key="index"
>#{{expertise}}</span>
</div>
<div
class="delete"
- v-if="agentInfo.contactStatus === 'picked'
- || !agentInfo.contactStatus"
+ v-if="showRemoveBtn"
@click="removeAgent"
>蝘駁</div>
</el-col>
@@ -39,9 +42,15 @@
<el-button
class="smTxt_bold outline_btn"
@click="reserveCommunication"
- :class="agentInfo.contactStatus + 'Btn'"
- >{{ contactTxt }}</el-button>
- <div class="updateTime" v-if="updateTime">{{updateTime | formatDate}}</div>
+ :class="actionBtnStyle"
+ >{{ actionBtnLabel }}</el-button>
+ <div
+ v-if="notScoreAppointmentYet"
+ class="text--primary mt-10 text--center text--underline cursor--pointer"
+ @click="reviewsBtn = true">蝯虫�遛��漲閰��</div>
+ <div class="updateTime mt-10">
+ {{ agentInfo.updateTime | formatDate }}
+ </div>
</el-col>
</el-row>
</el-col>
@@ -68,48 +77,71 @@
: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>
+ <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"
+ <div v-if="notScoreAppointmentYet" class="dialogInfo-btn">
+ <el-button type="primary"
@click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
+ </div>
+
+ <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" 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>
+
+ <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>
</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 { Consultants, Appointment } from '~/assets/ts/models/consultant.model';
-import { isLogin } from '~/assets/ts/auth';
-import { isMobileDevice } from '~/assets/ts/device';
+import { Vue, Component, Prop, Action, namespace } from 'nuxt-property-decorator';
+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) {
@@ -119,120 +151,179 @@
}
},
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 '';
}
}
})
export default class ConsultantCard extends Vue {
- @Action removeFromMyConsultantList!: (agentNo: string) => Promise<boolean>;
- @Action storeConsultantList!: any;
- @Prop() agentInfo!: Consultants;
+
+ @Prop()
+ agentInfo!: Consultant | ConsultantWithAppointmentId;
+
+ @localStorage.State('current_role')
+ currentRole!: string;
+
isVisibleDialog = false;
reviewsBtn = false;
status = false;
width: string = '';
inputScore = 0;
-
- 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];
- }
-
+ isCancelPopup = false;
+ hideReviews = hideReviews;
+ isConfirmPopup = false;
+
+
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 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 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' ? '���' : '憟單��';
}
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 updateTime() {
- return isLogin() ? this.agentInfo.updateTime : '';
+ 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') {
- isLogin()
- ? 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 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 => {
+ openPopUp(): void {
+ const isAppointment = !!this.agentInfo['appointmentStatus'];
+ const appointmentId = isAppointment
+ ? this.agentInfo['appointmentId']
+ : this.latestReservedAppointment.id;
+
+ 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) => {
- console.log('removeOk?', removeOk);
});
}
@@ -241,16 +332,37 @@
}
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() {
+ appointmentService.cancelAppointment(this.latestReservedAppointment.id).then(res => {
+ this.storeConsultantList();
+ this.isVisibleDialog = false;
+ this.isCancelPopup = false;
+ setTimeout(() => {
+ this.isConfirmPopup = true;
+ }, 300);
+ });
+ }
+
+ edit() {
+ this.isVisibleDialog = false;
+ this.$router.push({path: `/questionnaire/${this.agentInfo.agentNo}`, query: {'edit': 'true'}});
}
}
@@ -263,13 +375,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 +386,11 @@
font-weight: bold;
margin-top: 5px;
}
+ .unfilled {
+ font-size: 12px;
+ padding-top: 5px;
+ padding-left: 5px;
+ }
.professionals {
height: 20px;
@@ -350,4 +464,4 @@
margin-bottom: 50px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0