From ed4b2b7c67443b83abdc7aaf99e784a79d2e0a4f Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期四, 20 一月 2022 17:04:24 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://192.168.0.10:8443/r/pcalife/PAM into Phase3
---
PAMapp/assets/scss/utilities/_icon.scss | 6 +++
PAMapp/components/Ui/UiTimePicker.vue | 2
PAMapp/components/Interview/InterviewMsg.vue | 23 +++++++----
PAMapp/pages/recommendConsultant/index.vue | 3 -
PAMapp/components/Ui/UiDatePicker.vue | 2
PAMapp/pages/appointment/_appointmentId/close/index.vue | 63 ++++++++++++++++++++++---------
6 files changed, 68 insertions(+), 31 deletions(-)
diff --git a/PAMapp/assets/scss/utilities/_icon.scss b/PAMapp/assets/scss/utilities/_icon.scss
index 32f2ef1..6852502 100644
--- a/PAMapp/assets/scss/utilities/_icon.scss
+++ b/PAMapp/assets/scss/utilities/_icon.scss
@@ -9,3 +9,9 @@
color: $YELLOW;
}
}
+
+.down-icon {
+ color: #ED1B2E;
+ font-size: 25px;
+ align-self: center;
+}
diff --git a/PAMapp/components/Interview/InterviewMsg.vue b/PAMapp/components/Interview/InterviewMsg.vue
index eaffa87..2a81ac3 100644
--- a/PAMapp/components/Interview/InterviewMsg.vue
+++ b/PAMapp/components/Interview/InterviewMsg.vue
@@ -17,16 +17,18 @@
:autosize="true"
placeholder="蝝赤�"
resize="none"
- v-model="isInterviewTxt">
+ v-model="interviewTxt">
</el-input>
- <div class="mdTxt mt-30 mb-10">����赤��挾</div>
- <DateTimePicker
- @changeDateTime="interviewTime = $event"
- ></DateTimePicker>
+ <div v-if="client.phone">
+ <div class="mdTxt mt-30 mb-10">����赤��挾</div>
+ <DateTimePicker
+ @changeDateTime="interviewTime = $event"
+ ></DateTimePicker>
+ </div>
<div class="msg-dialog-btn">
- <el-button @click="addInterview" :disabled="!interviewTime">���</el-button>
+ <el-button @click="addInterview" :disabled="isBtnDisabled">���</el-button>
</div>
</el-dialog>
@@ -82,6 +84,10 @@
interviewTime = '';
//////////////////////////////////////////////////////////////////////
+ mounted() {
+ this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + this.loginConsultant.phoneNumber + "\n" + this.loginConsultant.email + "\n"+"�甇斗���靘選����蝜恬�����"
+ }
+
addInterview() {
const appointmentInformation: ToInformAppointment = {
appointmentId: this.client.id,
@@ -102,8 +108,9 @@
this.storeMyAppointmentList();
}
- get isInterviewTxt() : string{
- return this.interviewTxt = "�憟踝��靽���像����憿批��" + this.loginConsultant?.name + "嚗�����������銝膩������蝜�"+"\n"+"隞乩����閰梯�Ⅳ/Email嚗�"+"\n" + this.loginConsultant?.phoneNumber + "\n" + this.loginConsultant?.email + "\n"+"�甇斗���靘選����蝜恬�����"
+ get isBtnDisabled() :Boolean {
+ const isFormValid = this.client.phone ? this.interviewTxt && this.interviewTime :this.interviewTxt
+ return !isFormValid
}
}
diff --git a/PAMapp/components/Ui/UiDatePicker.vue b/PAMapp/components/Ui/UiDatePicker.vue
index 8752761..ef89297 100644
--- a/PAMapp/components/Ui/UiDatePicker.vue
+++ b/PAMapp/components/Ui/UiDatePicker.vue
@@ -7,7 +7,7 @@
type="date"
format="yyyy/MM/dd"
placeholder="������"
- prefix-icon="icon-down"
+ prefix-icon="icon-down down-icon"
@change="changeDate"
>
</el-date-picker>
diff --git a/PAMapp/components/Ui/UiTimePicker.vue b/PAMapp/components/Ui/UiTimePicker.vue
index 1fd0de1..6803eae 100644
--- a/PAMapp/components/Ui/UiTimePicker.vue
+++ b/PAMapp/components/Ui/UiTimePicker.vue
@@ -6,7 +6,7 @@
:clearable="false"
:picker-options="pickerOptions"
placeholder="������"
- prefix-icon="icon-down"
+ prefix-icon="icon-down down-icon"
value-format="timestamp"
@change="changeTime"
>
diff --git a/PAMapp/pages/appointment/_appointmentId/close/index.vue b/PAMapp/pages/appointment/_appointmentId/close/index.vue
index 09d6b8b..973e48a 100644
--- a/PAMapp/pages/appointment/_appointmentId/close/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/close/index.vue
@@ -15,7 +15,7 @@
<el-row
type="flex"
class="pam-paragraph" style="flex-direction: column">
- <UiField label="靽頨怠�����" :labelSize="20">
+ <UiField label="靽頨怠�����" :labelSize="20" class="required">
<input
class="appointment-client-detail-close__input"
:class="{'is-invalid':!identityIdValid}"
@@ -31,7 +31,7 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField label="���誨蝣噗lan Code" :labelSize="20">
+ <UiField label="���誨蝣噗lan Code" :labelSize="20" class="required">
<input
class="appointment-client-detail-close__input"
v-model="appointmentCloseInfo.planCode"
@@ -43,7 +43,7 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField label="�脖辣����" :labelSize="20">
+ <UiField label="�脖辣����" :labelSize="20" class="required">
<DateTimePicker @changeDateTime="appointmentCloseDate = $event"></DateTimePicker>
</UiField>
</el-row>
@@ -52,8 +52,9 @@
<template v-if="appointmentCloseInfo.selectCloseOption === 'close'">
<el-row
class="pam-paragraph">
- <UiField label="���漱����" :labelSize="20">
+ <UiField label="���漱����" :labelSize="20" class="required">
</UiField>
+ <div class="appointment-client-detail-close__selectbox">
<select
class="appointment-client-detail-close__select"
name="closedReason" id="closedReason" v-model="appointmentCloseInfo.closedReason">
@@ -61,17 +62,18 @@
{{ failReason.key }}
</option>
</select>
+ <i class="icon-down down-icon"></i>
+ </div>
+ <div style="display: flex" class="mt-10">
- <div style="display: flex" class="mt-10">
-
- <input
- v-if="appointmentCloseInfo.closedReason === 'other'
- || appointmentCloseInfo.closedReason === 'no_suitable_commodity'"
- class="appointment-client-detail-close__input"
- v-model="appointmentCloseInfo.closedOtherReason"
- placeholder="隢撓�������50摮��"
- type="text">
- </div>
+ <input
+ v-if="appointmentCloseInfo.closedReason === 'other'
+ || appointmentCloseInfo.closedReason === 'no_suitable_commodity'"
+ class="appointment-client-detail-close__input"
+ v-model="appointmentCloseInfo.closedOtherReason"
+ placeholder="隢撓�������50摮��"
+ type="text">
+ </div>
</el-row>
</template>
@@ -221,17 +223,16 @@
selectCloseOption,
policyholderIdentityId,
planCode,
- remark,
closedReason,
closedOtherReason
} = this.appointmentCloseInfo;
// this.appointmentCloseInfo.policyEntryDate 銝行��齒瘜��澆 this.appointmentCloseDate
if (selectCloseOption === 'done') {
- return !policyholderIdentityId || !this.identityIdValid || !planCode || !this.appointmentCloseDate || !remark
+ return !policyholderIdentityId || !this.identityIdValid || !planCode || !this.appointmentCloseDate
} else if (closedReason === 'other' || closedReason === 'no_suitable_commodity') {
- return !closedOtherReason || !remark
+ return !closedOtherReason
}
- return !remark
+ return false
}
get identityIdValid() {
@@ -252,11 +253,24 @@
font-size: 20px;
padding : 10px 20px;
width : 100%;
+ box-sizing: border-box;
&::placeholder {
color: $MID_GREY;
}
&.is-invalid {
border-color: $PRIMARY_RED !important;
+ }
+}
+.appointment-client-detail-close__selectbox {
+ position: relative;
+
+ & .appointment-client-detail-close__select{
+ appearance: none;
+ }
+ & .down-icon {
+ position: absolute;
+ right: 7px;
+ bottom: 10px;
}
}
.invite-review{
@@ -269,4 +283,17 @@
@extend .text--primary;
height: 16px;
}
+ .required {
+ position: relative;
+
+ &::before {
+ content: '*';
+ font-size: 20px;
+ font-weight: bold;
+ position: absolute;
+ color: #FF0000;
+ transform: translateX(-5px);
+ z-index: 5;
+ }
+ }
</style>
diff --git a/PAMapp/pages/recommendConsultant/index.vue b/PAMapp/pages/recommendConsultant/index.vue
index 1b59b21..937de58 100644
--- a/PAMapp/pages/recommendConsultant/index.vue
+++ b/PAMapp/pages/recommendConsultant/index.vue
@@ -338,9 +338,6 @@
}
.down-icon {
- color: #ED1B2E;
- font-size: 25px;
- align-self: center;
margin-right: 15px;
}
--
Gitblit v1.8.0