From 8b3eac27e27d437014ebbd308f0e7de24cf1fffa Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 25 一月 2022 12:26:09 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/components/Interview/InterviewMsg.vue | 4 ++--
PAMapp/pages/appointment/_appointmentId/index.vue | 14 +++++++++-----
PAMapp/pages/appointment/_appointmentId/close/index.vue | 1 -
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/PAMapp/components/Interview/InterviewMsg.vue b/PAMapp/components/Interview/InterviewMsg.vue
index 021b25f..bc76c75 100644
--- a/PAMapp/components/Interview/InterviewMsg.vue
+++ b/PAMapp/components/Interview/InterviewMsg.vue
@@ -95,10 +95,10 @@
this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + this.loginConsultant.phoneNumber + "\n" + this.loginConsultant.email + "\n"+"�甇斗���靘選����蝜恬�����"}
else if (!this.loginConsultant.phoneNumber && this.loginConsultant.email)
{
- this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + this.loginConsultant.email + "\n"+"�甇斗���靘選����蝜恬�����"
+ this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����mail嚗�"+"\n" + this.loginConsultant.email + "\n"+"�甇斗���靘選����蝜恬�����"
}
else
- this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + this.loginConsultant.phoneNumber + "\n"+"�甇斗���靘選����蝜恬�����"
+ this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ嚗�"+"\n" + this.loginConsultant.phoneNumber + "\n"+"�甇斗���靘選����蝜恬�����"
}
addInterview() {
diff --git a/PAMapp/pages/appointment/_appointmentId/close/index.vue b/PAMapp/pages/appointment/_appointmentId/close/index.vue
index 0514edc..bc59019 100644
--- a/PAMapp/pages/appointment/_appointmentId/close/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/close/index.vue
@@ -46,7 +46,6 @@
<UiField label="�脖辣����" :labelSize="20" class="required">
<DateTimePicker
:defaultValue="appointmentCloseInfo.policyEntryDate"
- :isFutureDateDisabled="true"
@changeDateTime="appointmentCloseDate = $event"></DateTimePicker>
</UiField>
</el-row>
diff --git a/PAMapp/pages/appointment/_appointmentId/index.vue b/PAMapp/pages/appointment/_appointmentId/index.vue
index a64c274..ce81ede 100644
--- a/PAMapp/pages/appointment/_appointmentId/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/index.vue
@@ -61,14 +61,14 @@
<div class="client-detail-action" v-if="showWhenAppointmentHasContacted">
<el-button @click="closeAppointment" >蝯��</el-button>
- <el-button @click="sendMsg" style="margin-left: 0px">�/蝝赤</el-button>
- </div>
-
- <div class="client-detail-action" v-if="showWhenAppointmentHasCreate">
- <el-button @click="sendMsg">���赤�</el-button>
+ <el-button @click="sendMsg" style="margin-left: 0px">�蝝赤</el-button>
</div>
</section>
+
+ <div class="client-detail-action btn-center" v-if="showWhenAppointmentHasCreate">
+ <el-button @click="sendMsg">���赤�</el-button>
+ </div>
<template v-if="showWhenAppointmentHasClosed">
<AppointmentClosedInfo :appointmentDetail="appointmentDetail" />
@@ -286,5 +286,9 @@
.hope-contact-time__line {
border-bottom: 1px solid #CCCCCC;
}
+.btn-center{
+ display: flex;
+ justify-content: center;
+ }
</style>
--
Gitblit v1.8.0