From 73307b0ada907f8ac857b3dfc4e7d50e3b7b92e9 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期一, 24 一月 2022 16:24:52 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
PAMapp/pages/appointment/_appointmentId/close/index.vue | 200 ++++++++++++++++++++++++++++++-------------------
1 files changed, 121 insertions(+), 79 deletions(-)
diff --git a/PAMapp/pages/appointment/_appointmentId/close/index.vue b/PAMapp/pages/appointment/_appointmentId/close/index.vue
index d6fa3da..a267a72 100644
--- a/PAMapp/pages/appointment/_appointmentId/close/index.vue
+++ b/PAMapp/pages/appointment/_appointmentId/close/index.vue
@@ -11,23 +11,27 @@
</UiField>
</el-row>
- <template v-if="appointmentCloseInfo.selectCloseOption === 'done'">
+ <template v-if="appointmentCloseInfo.selectCloseOption === contactStatus.DONE">
<el-row
type="flex"
- class="pam-paragraph">
- <UiField label="靽頨怠�����" :labelSize="20">
+ class="pam-paragraph" style="flex-direction: column">
+ <UiField label="靽頨怠�����" :labelSize="20" class="required">
<input
class="appointment-client-detail-close__input"
+ :class="{'is-invalid':!identityIdValid}"
v-model="appointmentCloseInfo.policyholderIdentityId"
placeholder="隢撓�"
type="text">
</UiField>
+ <div class="error mt-5 mb-5" v-show="!identityIdValid">
+ <span>頨怠����撘�炊</span>
+ </div>
</el-row>
<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"
@@ -39,35 +43,29 @@
<el-row
type="flex"
class="pam-paragraph">
- <UiField label="�脖辣����" :labelSize="20">
- <DateTimePicker @changeDateTime="appointmentCloseDate = $event"></DateTimePicker>
+ <UiField label="�脖辣����" :labelSize="20" class="required">
+ <DateTimePicker
+ :defaultValue="appointmentCloseInfo.policyEntryDate"
+ :isFutureDateDisabled="true"
+ @changeDateTime="appointmentCloseDate = $event"></DateTimePicker>
</UiField>
</el-row>
</template>
- <template v-if="appointmentCloseInfo.selectCloseOption === 'close'">
+ <template v-if="appointmentCloseInfo.selectCloseOption === contactStatus.CLOSE">
<el-row
class="pam-paragraph">
- <UiField label="���漱����" :labelSize="20">
+ <UiField label="���漱����" :labelSize="20" class="required">
+ <UiSelect :closeReason.sync="appointmentCloseInfo.closedReason"
+ :options="appointmentFailReason"/>
</UiField>
- <select
- class="appointment-client-detail-close__select"
- name="closedReason" id="closedReason" v-model="appointmentCloseInfo.closedReason">
- <option :value="failReason.value" v-for="(failReason, index) in appointmentFailReason" :key="index">
- {{ failReason.key }}
- </option>
- </select>
-
- <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 mt-10"
+ v-model="appointmentCloseInfo.closedOtherReason"
+ placeholder="隢撓�������50摮��"
+ type="text">
</el-row>
</template>
@@ -82,16 +80,6 @@
v-model="appointmentCloseInfo.remark"
resize="none">
</el-input>
-
- <!-- <textarea
- v-model="appointmentCloseInfo.archivedDate"
- class="appointment-close__remark"
- placeholder="隢撓�"
- name="remark"
- id="remark"
- wrap="off"
- rows="3">
- </textarea> -->
</UiField>
</el-row>
@@ -100,7 +88,7 @@
justify="center"
class="pam-paragraph">
<el-button @click="$router.go(-1)">����</el-button>
- <el-button @click="closeAppointment">蝣箄��</el-button>
+ <el-button @click="closeAppointment" :disabled="isSubmitBtnDisabled">蝣箄��</el-button>
</el-row>
<PopUpFrame :isOpen.sync="isShowSuccessAlert">
@@ -117,9 +105,10 @@
import { namespace } from 'nuxt-property-decorator';
import { Vue, Component } from 'vue-property-decorator';
import { Appointment, ToCloseAppointment, ToDoneAppointment } from '~/shared/models/appointment.model';
-import { ContactStatus } from '~/shared/models/enum/contact-status';
import appointmentService from '~/shared/services/appointment.service';
+import { appointmentFailReasonList } from '~/shared/const/appointment-fail-reason-list';
+import { ContactStatus } from '~/shared/models/enum/contact-status';
const appointmentStore = namespace('appointment.store');
@@ -127,7 +116,10 @@
export default class AppointmentDetailCloseComponent extends Vue {
@appointmentStore.Action
- updateAppointmentDetail!: () => Appointment;
+ updateAppointmentDetail!: (appointmentId: number) => Appointment;
+
+ @appointmentStore.State('appointmentDetail')
+ appointmentDetail!: Appointment;
contactStatus = ContactStatus;
@@ -138,61 +130,64 @@
closedOtherReason : '',
closedReason : 'other',
planCode : '',
- policyEntryDate : this.appointmentCloseDate,
+ policyEntryDate : '',
policyholderIdentityId: '',
remark : '',
- selectCloseOption : 'done',
+ selectCloseOption : this.contactStatus.DONE,
};
closeOptions = [
{
title:'��漱',
- label: 'done',
+ label: this.contactStatus.DONE,
},
{
title:'���漱',
- label: 'close',
+ label: this.contactStatus.CLOSE,
}
];
- appointmentFailReason = [
- {
- key: '�瘜蝜怠恥�',
- value: 'cannot_to_contact_customer'
- },
- {
- key: '�蝝垣閰�',
- value: 'only_consultation'
- },
- {
- key: '�������',
- value: 'no_suitable_commodity'
- },
- {
- key: '�靽���- 擃��瓷���璆�',
- value: 'prohibited_factors'
- },
- {
- key: '蝬����',
- value: 'economy'
- },
- {
- key: '�隞�',
- value: 'other'
- },
- ];
+ appointmentFailReason = appointmentFailReasonList;
+
+ //////////////////////////////////////////////////////////////////////
+
+ mounted() {
+ const appointmentId = +this.$route.params.appointmentId;
+ const closedInfo = this.appointmentDetail.appointmentClosedInfo;
+ if (this.appointmentDetail.id === appointmentId
+ && (this.appointmentDetail.communicateStatus === this.contactStatus.DONE
+ || this.appointmentDetail.communicateStatus === this.contactStatus.CLOSE
+ || this.appointmentDetail.communicateStatus === this.contactStatus.CANCEL)
+ ) {
+ this.appointmentCloseInfo = {
+ closedOtherReason : closedInfo?.closedOtherReason,
+ closedReason : closedInfo?.closedReason,
+ planCode : closedInfo?.planCode,
+ policyEntryDate : closedInfo?.policyEntryDate,
+ policyholderIdentityId: closedInfo?.policyholderIdentityId,
+ remark : closedInfo?.remark,
+ selectCloseOption : this.appointmentDetail.communicateStatus === this.contactStatus.DONE
+ ? this.contactStatus.DONE
+ : this.contactStatus.CLOSE
+ };
+ this.appointmentCloseDate = closedInfo?.policyEntryDate;
+ }
+ }
+
+ //////////////////////////////////////////////////////////////////////
closeAppointment(): void {
const appointmentId = +this.$route.params.appointmentId;
- if (this.appointmentCloseInfo.selectCloseOption === 'done') {
+ if (this.appointmentCloseInfo.selectCloseOption === this.contactStatus.DONE) {
const toDoneAppointment: ToDoneAppointment = {
appointmentId : appointmentId,
contactStatus : this.contactStatus.DONE,
planCode : this.appointmentCloseInfo.planCode,
- policyEntryDate : this.appointmentCloseInfo.policyEntryDate,
+ policyEntryDate : this.appointmentCloseDate,
policyholderIdentityId: this.appointmentCloseInfo.policyholderIdentityId,
+ remark : this.appointmentCloseInfo.remark,
}
- appointmentService.closeAppointment(toDoneAppointment).then((res) => res);
+ appointmentService.closeAppointment(toDoneAppointment).then((_) => this.updateAppointmentDetail(appointmentId));
this.isShowSuccessAlert = true;
} else {
const toCloseAppointment: ToCloseAppointment = {
@@ -202,8 +197,11 @@
contactStatus : this.contactStatus.CLOSE,
remark : this.appointmentCloseInfo.remark,
}
- appointmentService.closeAppointment(toCloseAppointment).then((res) => res);
- this.isShowSuccessAlert = true;
+ appointmentService.closeAppointment(toCloseAppointment).then((_) => {
+ this.updateAppointmentDetail(appointmentId);
+ this.isShowSuccessAlert = true;
+ });
+
}
}
@@ -212,25 +210,69 @@
this.$router.push(`/myAppointmentList/contactedList`);
}
+ get isSubmitBtnDisabled() {
+ const {
+ selectCloseOption,
+ policyholderIdentityId,
+ planCode,
+ closedReason,
+ closedOtherReason,
+ remark
+ } = this.appointmentCloseInfo;
+ if (selectCloseOption === this.contactStatus.DONE) {
+ return !policyholderIdentityId || !this.identityIdValid || !planCode || !this.appointmentCloseDate
+ } else if (closedReason === 'other' || closedReason === 'no_suitable_commodity') {
+ return !closedOtherReason
+ }
+ return false
+ }
+
+ get identityIdValid() {
+ const rule = /^[A-Z]\d{9}$/;
+ const identityId = this.appointmentCloseInfo.policyholderIdentityId;
+ return identityId ? rule.test(identityId) : true;
+ }
+
}
</script>
<style lang="scss" scoped>
.appointment-close__remark,
-.appointment-client-detail-close__input,
-.appointment-client-detail-close__select {
+.appointment-client-detail-close__input {
border-radius: 5px;
border : 1px solid #707070;
font-size: 20px;
padding : 10px 20px;
width : 100%;
+ box-sizing: border-box;
&::placeholder {
color: $MID_GREY;
}
+ &.is-invalid {
+ border-color: $PRIMARY_RED !important;
+ }
}
.invite-review{
- display: flex;
- flex-direction: column;
- align-items: center;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+}
+ .error {
+ @extend .smTxt_bold;
+ @extend .text--primary;
+ height: 16px;
+ }
+ .required {
+ position: relative;
+
+ &::before {
+ content: '*';
+ font-size: 15px;
+ font-weight: bold;
+ position: absolute;
+ color: #FF0000;
+ transform: translateX(-2px);
+ z-index: 5;
+ }
}
</style>
--
Gitblit v1.8.0