From f316bd2d97efb54ef48fde17b4e38fba2fc7b1aa Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 11 一月 2024 17:17:01 +0800
Subject: [PATCH] project: remove lodash library
---
PAMapp/pages/agentInfo/edit/_agentNo.vue | 139 +++++++++++++++++++++++++++++++---------------
1 files changed, 93 insertions(+), 46 deletions(-)
diff --git a/PAMapp/pages/agentInfo/edit/_agentNo.vue b/PAMapp/pages/agentInfo/edit/_agentNo.vue
index ae47457..cb4f9b3 100644
--- a/PAMapp/pages/agentInfo/edit/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/edit/_agentNo.vue
@@ -1,5 +1,5 @@
<template>
- <div class="edit-agent-info-page">
+ <div class="edit-agent-info-page" v-if="!!agentInfo">
<el-row
type="flex"
@@ -68,6 +68,27 @@
</el-col>
</el-row>
+ <el-row
+ type="flex"
+ class="pam-paragraph">
+ <el-col :span="24" class="pam-field">
+ <div class="pam-field__label pam-progress__label">
+ <div>
+ <div class="pam-field__title mb-10">
+ <i class="pam-icon icon-comment"
+ ></i>靽∠拳
+ <span class="hint text--bold" v-show="!emailValid">靽∠拳�撘�炊</span>
+ <span class="hint text--bold" v-show="editInfoValue.email.length === 0">靽∠拳�敹‵</span>
+ </div>
+ </div>
+ <el-input
+ v-model="editInfoValue.email"
+ :class="{'is-invalid': !emailValid}"
+ ></el-input>
+ </div>
+ </el-col>
+ </el-row>
+
<el-row
type="flex"
@@ -104,18 +125,14 @@
<UiField :span="12" icon="time" label="��敺�����">
{{ agentInfo.latestLoginTime | formatDate }}
</UiField>
- <UiField :span="12" icon="calender" label="����風">
- <div class="mt-10" style="display: flex; align-items: center">
- <el-input v-model="editInfoValue.seniorityYear" class="seniority-input" ></el-input>撟�
- <el-select style="width:60px" v-model="editInfoValue.seniorityMonth" class="seniority-input">
- <el-option
- v-for="(month) in [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]"
- :value="month"
- :key="month">
- {{ month }}
- </el-option>
- </el-select>���
- </div>
+ <UiField :span="12" icon="calender" label="������" class="pam-editInfo-date-picker">
+ <UiDatePicker
+ :isFutureDateDisabled = true
+ id="el-date-picker"
+ class="mt-10"
+ :defaultValue ="agentInfo.entryDate"
+ @changeDate="onChangeDate($event)"
+ ></UiDatePicker>
</UiField>
</el-row>
@@ -247,7 +264,6 @@
import { Context } from '@nuxt/types';
import { namespace } from 'nuxt-property-decorator';
import { Vue, Component, Prop } from 'vue-property-decorator';
-import * as _ from "lodash";
import myConsultantService from '~/shared/services/my-consultant.service';
import accountSettingService from '~/shared/services/account-setting.service';
@@ -258,6 +274,7 @@
import { Role } from '~/shared/models/enum/Role';
import { agentCommunicationStyleList } from '~/shared/const/agent-communication-style-list';
import { taiwanCities } from '~/shared/const/taiwan-cities';
+
const localStorageTest = namespace('localStorage');
const loginStore = namespace('login.store');
@@ -287,14 +304,14 @@
title : '',
serveArea : [] as string[],
companyAddress : '',
- seniorityYear : 1,
- seniorityMonth : 0,
concept : '',
experiences : '',
awards : '',
communicationStyle: [] as string[],
photoBase64 : '',
- phoneNumber : ''
+ phoneNumber : '',
+ email : '',
+ entryDate : '',
};
communicationStyleList: string[] = agentCommunicationStyleList;
@@ -355,36 +372,49 @@
mounted(){
this.setAgentInfo(this.agentInfo);
+
+ const bodyEl = document.querySelector('body');
+
+ bodyEl?.addEventListener('scroll', function() {
+ const elDatePickerEl = document.querySelector('#el-date-picker');
+ const elDatePickerPanelEl = document.querySelector('.el-picker-panel');
+ if (elDatePickerPanelEl) {
+ elDatePickerPanelEl['style']['z-index'] = 5;
+ const elDatePickerOffsetTop = elDatePickerEl!.getBoundingClientRect().top;
+ elDatePickerPanelEl!['style'].top = elDatePickerOffsetTop + 30 + 'px';
+ }
+ });
+
}
private setAgentInfo(agentInfo: AgentInfo): void {
- const [agentYear, _yearUnit , agentMonth, _monthUnit] = agentInfo.seniority.split(" ");
this.defaultAgentInfoSetting = {
- agentNo : agentInfo.agentNo||'',
- name : agentInfo.name || '',
- expertise : agentInfo.expertise || [],
- title : agentInfo.title || '',
- role : agentInfo.role||'',
- serveArea : agentInfo?.serveArea.split('��'),
- gender : agentInfo.gender||'',
- phoneNumber : agentInfo.phoneNumber||'',
- companyAddress : agentInfo.companyAddress || '',
- seniorityYear : agentYear? +agentYear : 0,
- seniorityMonth : agentMonth ? +agentMonth : 0,
- concept : agentInfo.concept || '',
- experiences : agentInfo.experiences || '',
- awards : agentInfo.awards || '',
- communicationStyle: agentInfo.communicationStyle || '',
- photoBase64 : ''
+ agentNo: agentInfo?.agentNo || '',
+ name: agentInfo?.name || '',
+ expertise: agentInfo?.expertise || [],
+ title: agentInfo?.title || '',
+ role: agentInfo?.role || '',
+ serveArea: agentInfo?.serveArea?.split('��') || [],
+ gender: agentInfo?.gender || '',
+ phoneNumber: agentInfo?.phoneNumber || '',
+ companyAddress: agentInfo?.companyAddress || '',
+ concept: agentInfo?.concept || '',
+ experiences: agentInfo?.experiences || '',
+ awards: agentInfo?.awards || '',
+ communicationStyle: agentInfo?.communicationStyle || '',
+ photoBase64: '',
+ email: agentInfo?.email || '',
+ entryDate: agentInfo?.entryDate || '',
};
this.editInfoValue = {
...this.defaultAgentInfoSetting,
- expertise : _.cloneDeep(this.defaultAgentInfoSetting.expertise),
- // TODO: 蝣箄��垢甇斗���垢���隞�" , "���� [Tomas, 2021/12/28]
- communicationStyle : this.defaultAgentInfoSetting.communicationStyle.split('��'),
- }
+ expertise: JSON.parse(JSON.stringify(this.defaultAgentInfoSetting.expertise)),
+ communicationStyle: this.defaultAgentInfoSetting.communicationStyle?.split('��') || [],
+ };
}
+
+
//////////////////////////////////////////////////////////////////////
@@ -393,11 +423,16 @@
...this.editInfoValue,
communicationStyle: this.editInfoValue.communicationStyle.join('��'),
serveArea: this.editInfoValue.serveArea.join('��'),
- }
+ };
+
accountSettingService.editAgentInfoSetting(editSettingInfo).then((res: AgentInfoSetting) => {
this.isInfoUpdate = true;
this.updateConsultantDetail(editSettingInfo.agentNo);
});
+ }
+
+ onChangeDate(date: any): void {
+ this.editInfoValue.entryDate = date;
}
backToInfo() {
@@ -431,11 +466,16 @@
}
get phoneValid(): boolean {
- const rule = /^09[0-9]{8}$/;
- return this.editInfoValue.phoneNumber
- ? rule.test(this.editInfoValue.phoneNumber) && _.isEqual(this.editInfoValue.phoneNumber.length,10)
- : true;
- }
+ const rule = /^09[0-9]{8}$/;
+ return this.editInfoValue.phoneNumber
+ ? rule.test(this.editInfoValue.phoneNumber) && this.editInfoValue.phoneNumber.length === 10
+ : true;
+ }
+
+ get emailValid() {
+ const rule = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
+ return this.editInfoValue.email ? rule.test(this.editInfoValue.email) : true;
+ }
get isSubmitBtnDisabled(): boolean {
const isFormValid = this.editInfoValue.name
@@ -445,9 +485,10 @@
&& this.editInfoValue.concept
&& this.editInfoValue.experiences
&& this.editInfoValue.phoneNumber.length
- && this.editInfoValue.seniorityYear
+ && this.editInfoValue.entryDate
&& this.editInfoValue.expertise.length
- && this.editInfoValue.communicationStyle.length;
+ && this.editInfoValue.communicationStyle.length
+ && this.editInfoValue.email.length;
return !isFormValid
}
}
@@ -517,4 +558,10 @@
padding-right: 20px;
}
+.pam-editInfo-date-picker{
+ .pam-date.el-input {
+ width: 100%;
+ }
+}
+
</style>
--
Gitblit v1.8.0