From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
PAMapp/pages/index.vue | 114 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 72 insertions(+), 42 deletions(-)
diff --git a/PAMapp/pages/index.vue b/PAMapp/pages/index.vue
index e424a82..31d46cb 100644
--- a/PAMapp/pages/index.vue
+++ b/PAMapp/pages/index.vue
@@ -45,41 +45,46 @@
:width="appointmentDialogWidth"
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="reserved-info">
- <p>憪��{appointmentDetail.name}}</p>
- <p>�閰梧�{appointmentDetail.phone}}</p>
- <p>Email嚗{appointmentDetail.email}}</p>
- <p>�批嚗{gender}}</p>
- <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
- <p>�璆哨�{appointmentDetail.job}}</p>
- <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p>
- <p
- v-for="(item, index) in hopeContactTime"
- :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>
- </div>
+ <div v-if="appointmentDetail">
+ <h5 class="subTitle text--center mb-30">������</h5>
+ <p class="smTxt">{{appointmentDetail.appointmentDate | formatDate}}</p>
+ <div class="reserved-info">
+ <p>憪��{appointmentDetail.name}}</p>
+ <p>�閰梧�{appointmentDetail.phone}}</p>
+ <p>Email嚗{appointmentDetail.email}}</p>
+ <p>�批嚗{gender}}</p>
+ <p>撟湧翩嚗{appointmentDetail.age | toAgeLabel }}</p>
+ <p>�璆哨�{appointmentDetail.job}}</p>
+ <p>��瘙�{appointmentDetail.requirement.split(',').join('��')}}</p>
+ <p
+ v-for="(item, index) in hopeContactTime"
+ :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>
+ </div>
- <div v-if="notScoreAppointmentYet" class="reserved-btn">
- <el-button type="primary"
- @click.native="isShowReviewDialog = true">蝯虫�遛��漲閰��</el-button>
- </div>
- </div>
+ <div v-if="notScoreAppointmentYet" class="reserved-btn">
+ <el-button type="primary"
+ @click.native="reviewsBtn = true">蝯虫�遛��漲閰��</el-button>
+ </div>
+
+ <div v-if="appointmentDetail.communicateStatus === '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="isShowReAppointmentDialog"
- @closePopUp="removeUrlQueryParameter('notContactAppointmentIdFromMsg')"
+ @closePopUp="removeUrlQueryParameter('notContactAppointmentId')"
>
<div class="pam-dialog-review">
<div class="mt-30 text--middle" v-if="agentInfo">
@@ -137,16 +142,18 @@
<script lang="ts">
import { Vue, Component, State, Action, Watch, namespace } from 'nuxt-property-decorator';
- import { Appointment, AppointmentClosedInfo } from '~/shared/models/appointment.model';
- import { Consultant } from '~/shared/models/consultant.model';
- import { ContactStatus } from '~/shared/models/enum/contact-status';
- import { UserReviewsConsultantsParams } from '~/shared/models/reviews.model';
- import { StrictQueryParams } from '~/shared/models/strict-query.model';
+
import appointmentService from '~/shared/services/appointment.service';
import reviewsService from '~/shared/services/reviews.service';
import UtilsService from '~/shared/services/utils.service';
import myConsultantService from '~/shared/services/my-consultant.service';
-import { AgentInfo } from '~/shared/models/agent-info.model';
+ import { Appointment, AppointmentClosedInfo } from '~/shared/models/appointment.model';
+ import { Consultant } from '~/shared/models/consultant.model';
+ import { UserReviewParams } from '~/shared/models/reviews.model';
+ import { StrictQueryParams } from '~/shared/models/strict-query.model';
+ import { AgentInfo } from '~/shared/models/agent-info.model';
+ import { ContactStatus } from '~/shared/models/enum/contact-status';
+import { SatisfactionType } from '~/shared/models/enum/satisfaction-type';
const localStorage = namespace('localStorage');
const roleStorage = namespace('localStorage');
@@ -164,6 +171,9 @@
@roleStorage.Getter
isAdminLogin!: boolean;
+
+ @roleStorage.Getter
+ isUserLogin!: boolean;
@Action
storeRecommendList!: any;
@@ -257,6 +267,16 @@
this.storeConsultantList();
this.storageClearQuickFilter();
this.storageClearRecommendConsultant();
+
+ if (this.isUserLogin) {
+ appointmentService.getNotContactAppointment().then((appointment) => {
+ if (appointment) {
+ this.$router.push({ query: { notContactAppointmentId: appointment.id + ''}});
+ this.autoOpenAppointmentBy('askReAppointment', appointment.id);
+ }
+ });
+ }
+
}
}
@@ -331,13 +351,18 @@
this.$router.push(path);
}
+ edit() {
+ this.isShowAppointmentDialog = false;
+ this.$router.push({path: `/questionnaire/${this.agentInfo.agentNo}`, query: {'edit': 'true'}});
+ }
+
reAppointment(): void {
appointmentService.cancelAppointment(this.appointmentDetail.id).then(() => {
const requirements = this.appointmentDetail.requirement.split(',');
this.storeConsultantList();
this.storageStrickQueryItem({ requirements: requirements });
this.storageClearNotContactAppointmentIdFromMsg();
- this.removeUrlQueryParameter('notContactAppointmentIdFromMsg');
+ this.removeUrlQueryParameter('notContactAppointmentId');
this.$router.push('/recommendConsultant');
});
}
@@ -346,15 +371,18 @@
appointmentService.cancelAppointment(this.appointmentDetail.id).then(() => {
this.storeConsultantList();
this.storageClearNotContactAppointmentIdFromMsg();
- this.removeUrlQueryParameter('notContactAppointmentIdFromMsg');
- this.$router.push('');
+ this.removeUrlQueryParameter('notContactAppointmentId');
+ this.isShowReAppointmentDialog = false;
+ this.isShowAppointmentDialog = false;
+ this.$router.push('/');
});
}
userReviewsConsultants() {
- const reviewParams: UserReviewsConsultantsParams = {
+ const reviewParams: UserReviewParams = {
appointmentId: this.appointmentDetail.id,
score: this.inputScore,
+ type: SatisfactionType.APPOINTMENT
}
this.appointmentDetail.satisfactionScore = this.inputScore;
@@ -375,18 +403,20 @@
})
}
this.$router.push(newRouteQuery);
+ this.storageClearSatisfactionIdFromMsg();
+ this.storageClearNotContactAppointmentIdFromMsg();
}
///////////////////////////////////////////////////////////////////////////////
- get gender() {
+ get gender(): string {
if (this.appointmentDetail.gender) {
return this.appointmentDetail.gender === 'male' ? '���' : '憟單��';
}
return ''
}
- get hopeContactTime() {
+ get hopeContactTime(): string[] {
const contactList = this.appointmentDetail.hopeContactTime
.split("'").map((item: any) => item.slice(0, item.length));
return contactList.filter((item: any) => !!item && item !== ",")
--
Gitblit v1.8.0