From e02d6534d2dba4b8adcbb80e37cc77bf8bddd26c Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 09 三月 2022 16:50:48 +0800
Subject: [PATCH] update#136137: [諮詢度表現] 顧問詳細資訊API 前端調整串接
---
PAMapp/pages/agentInfo/edit/_agentNo.vue | 335 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 256 insertions(+), 79 deletions(-)
diff --git a/PAMapp/pages/agentInfo/edit/_agentNo.vue b/PAMapp/pages/agentInfo/edit/_agentNo.vue
index 73029bf..eb95946 100644
--- a/PAMapp/pages/agentInfo/edit/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/edit/_agentNo.vue
@@ -1,35 +1,100 @@
<template>
- <div>
+ <div class="edit-agent-info-page">
+
<el-row
type="flex"
justify="center">
- <UiAvatar
- :size="150"
- :agentNo="agentInfo.agentNo">
- </UiAvatar>
+ <EditConsultantAvatar
+ :agentNo="agentInfo.agentNo"
+ :photoBase64.sync="editInfoValue.photoBase64"/>
</el-row>
- <el-row
+
+ <!-- NOTE: ���蝺刻摩��銝�閬＊蝷� avgScore嚗���� [Tomas, 2022/2/10 13:55] -->
+ <!-- <el-row
type="flex"
class="pt-10"
justify="center"
align="middle" v-if="!hideReviews">
- <!-- TODO:���遛��漲 -->
<i class="pam-icon icon--primary icon-star"></i>
<h3 class="mdTxt">{{ agentInfo.avgScore }}</h3>
- </el-row>
+ </el-row> -->
- <el-row
+ <!-- <el-row
type="flex"
- class="pt-10"
+ class="pam-paragraph"
justify="center">
<el-input class="mdTxt" v-model="editInfoValue.name"></el-input>
+ </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-avatar"
+ ></i>憿舐內��迂
+ <span class="hint text--bold" v-show="!editInfoValue.name">憿舐內��迂�敹‵</span>
+ </div>
+ </div>
+ <el-input
+ v-model="editInfoValue.name"
+ :class="{'is-invalid': !nameValid}"
+ maxlength="10"
+ minlength="10"></el-input>
+ </div>
+ </el-col>
</el-row>
<el-row
type="flex"
class="pam-paragraph">
- <UiField :span="12" icon="agent" label="����">
- <el-input v-model="editInfoValue.title"></el-input>
+ <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-phone"
+ ></i>����Ⅳ
+ <span class="hint text--bold" v-show="!phoneValid">����Ⅳ�撘�炊</span>
+ <span class="hint text--bold" v-show="editInfoValue.phoneNumber.length === 0">����Ⅳ�敹‵</span>
+ </div>
+ </div>
+ <el-input
+ v-model="editInfoValue.phoneNumber"
+ :class="{'is-invalid': !phoneValid}"
+ maxlength="10"
+ minlength="10"></el-input>
+ </div>
+ </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"
+ class="pam-paragraph">
+ <UiField :span="24" icon="agent" label="����">
+ <el-input v-model="editInfoValue.title" class="mt-10"></el-input>
</UiField>
</el-row>
@@ -37,7 +102,12 @@
type="flex"
class="pam-paragraph">
<UiField icon="company" label="�����">
- <el-input v-model="editInfoValue.serveArea"></el-input>
+ <MultiSelectBtn class="mt-30"
+ :mutiSelect.sync="editInfoValue.serveArea"
+ :nameOfSelectAll="'��'"
+ :options="serveAreaOptions"
+ >
+ </MultiSelectBtn>
</UiField>
</el-row>
@@ -45,7 +115,7 @@
type="flex"
class="pam-paragraph">
<UiField icon="address" label="�����">
- <el-input v-model="editInfoValue.companyAddress"></el-input>
+ <el-input v-model="editInfoValue.companyAddress" class="mt-10"></el-input>
</UiField>
</el-row>
@@ -55,20 +125,22 @@
<UiField :span="12" icon="time" label="��敺�����">
{{ agentInfo.latestLoginTime | formatDate }}
</UiField>
- <UiField :span="12" icon="calender" label="����風" style="display:flex">
- <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>���
+ <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>
</el-row>
- <el-row
+ <!-- <el-row
type="flex"
class="pam-paragraph">
<el-col :span="24" class="pam-field">
@@ -87,38 +159,54 @@
<el-progress :show-text="false" :stroke-width="15" :percentage="agentInfo.evaluation * 2"></el-progress>
</div>
</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">
+ <i class="pam-icon icon-flag"
+ ></i>皞�◢� <span class="hint text--bold">(�銴,��憭�2���)</span>
+ </div>
+ </div>
+ <MultiSelectBtn class="mt-30"
+ :mutiSelect.sync="editInfoValue.communicationStyle"
+ :options="agentCommunicationStyleList"
+ :maxLength="2"
+ >
+ </MultiSelectBtn>
+ </div>
+ </el-col>
</el-row>
<el-row
type="flex"
class="pam-paragraph">
- <UiField icon="flag" label="皞�◢�">
- <el-checkbox
- v-model="editInfoValue.communicationStyle"
- :label="communicateStyle"
- :key="index"
- v-for="(communicateStyle, index) in communicationStyleList">
- </el-checkbox>
- </UiField>
- </el-row>
- <el-row
- type="flex"
- class="pam-paragraph">
- <UiField icon="flag" label="撠����">
- <el-checkbox
- v-model="editInfoValue.expertise"
- :label="expert"
- :key="index"
- v-for="(expert, index) in expertList">
- </el-checkbox>
- </UiField>
+ <el-col :span="24" class="pam-field">
+ <div class="pam-field__label pam-progress__label">
+ <div>
+ <div class="pam-field__title">
+ <i class="pam-icon icon-flag"
+ ></i>撠���� <span class="hint text--bold">(�銴)</span>
+ </div>
+ </div>
+ <MultiSelectBtn class="mt-30"
+ :mutiSelect.sync="editInfoValue.expertise"
+ :options="agentExpertList"
+ >
+ </MultiSelectBtn>
+ </div>
+ </el-col>
</el-row>
<el-row
type="flex"
class="pam-paragraph">
<UiField icon="comment" label="�犖��艙">
- <el-input type="textarea" autosize v-model="editInfoValue.concept"></el-input>
+ <el-input type="textarea" autosize v-model="editInfoValue.concept" class="mt-10"></el-input>
</UiField>
</el-row>
@@ -126,7 +214,12 @@
type="flex"
class="pam-paragraph">
<UiField icon="school" label="�犖��">
- <el-input type="textarea" autosize v-model="editInfoValue.experiences"></el-input>
+ <el-input
+ autosize
+ type="textarea"
+ class="mt-10"
+ v-model="editInfoValue.experiences">
+ </el-input>
</UiField>
</el-row>
@@ -134,7 +227,7 @@
type="flex"
class="pam-paragraph">
<UiField icon="trophy" label="敺��風">
- <el-input type="textarea" autosize style="height:70%" v-model="editInfoValue.awards"></el-input>
+ <el-input type="textarea" autosize style="height:70%" v-model="editInfoValue.awards" class="mt-10"></el-input>
</UiField>
</el-row>
@@ -174,7 +267,7 @@
<script lang="ts">
import { Context } from '@nuxt/types';
import { namespace } from 'nuxt-property-decorator';
-import { Vue, Component } from 'vue-property-decorator';
+import { Vue, Component, Prop } from 'vue-property-decorator';
import * as _ from "lodash";
import myConsultantService from '~/shared/services/my-consultant.service';
@@ -184,31 +277,36 @@
import { hideReviews } from '~/shared/const/hide-reviews';
import { AgentInfoSetting } from '~/shared/models/account.model';
import { Role } from '~/shared/models/enum/Role';
-import { agentExpertList } from '~/shared/const/agent-expert-list';
import { agentCommunicationStyleList } from '~/shared/const/agent-communication-style-list';
+import { taiwanCities } from '~/shared/const/taiwan-cities';
-const localStorage = namespace('localStorage');
+const localStorageTest = namespace('localStorage');
+const loginStore = namespace('login.store');
@Component
-export default class AgentInfoComponent extends Vue {
+export default class AgentInfoEditComponent extends Vue {
- @localStorage.State('current_role')
- currentRole!:string | null;
+ @localStorageTest.State
+ current_role: any;
- _agentInfoSetting!: AgentInfoSetting;
+ @loginStore.Action
+ updateConsultantDetail!: (agentNo: string) => Promise<AgentInfo>;
+
+ defaultAgentInfoSetting!: AgentInfoSetting;
agentInfo! : AgentInfo
fieldInfoDesc : string = '';
fieldInfoTitle : string = '';
hideReviews : boolean = hideReviews ;
isAlertFieldInfo: boolean = false;
isInfoUpdate : boolean = false;
+ serveAreaOptions: any[] = taiwanCities.map((city) => ({ title: city, label: city }));
editInfoValue = {
agentNo : '',
name : '',
expertise : [] as string[],
title : '',
- serveArea : '',
+ serveArea : [] as string[],
companyAddress : '',
seniorityYear : 1,
seniorityMonth : 0,
@@ -217,11 +315,56 @@
awards : '',
communicationStyle: [] as string[],
photoBase64 : '',
+ phoneNumber : '',
+ email : '',
};
-
+
communicationStyleList: string[] = agentCommunicationStyleList;
- expertList: string[] = agentExpertList;
role = Role;
+
+ agentExpertList = [
+ {
+ title:'�摨瑁����',
+ label:'�摨瑁����'
+ },
+ {
+ title:'摮戊��',
+ label:'摮戊��'
+ },
+ {
+ title:'鞈閬��',
+ label:'鞈閬��'
+ },
+ {
+ title:'璅暑��隡�',
+ label:'璅暑��隡�'
+ },
+ {
+ title:'靽�瑼�/閬��',
+ label:'靽�瑼�/閬��'
+ },
+ {
+ title:'����',
+ label:'����'
+ }];
+
+ agentCommunicationStyleList = [
+ {
+ title:'雓寞��祕',
+ label:'雓寞��祕'
+ },
+ {
+ title:'��翰銝餃��',
+ label:'��翰銝餃��'
+ },
+ {
+ title:'���',
+ label:'���'
+ },
+ {
+ title:'�隢◢頞�',
+ label:'�隢◢頞�'
+ }];
//////////////////////////////////////////////////////////////////////
@@ -235,17 +378,16 @@
mounted(){
this.setAgentInfo(this.agentInfo);
}
-
- /////////////////////////////////////////////////////////////////////////////
+
private setAgentInfo(agentInfo: AgentInfo): void {
const [agentYear, _yearUnit , agentMonth, _monthUnit] = agentInfo.seniority.split(" ");
- this._agentInfoSetting = {
+ this.defaultAgentInfoSetting = {
agentNo : agentInfo.agentNo||'',
name : agentInfo.name || '',
expertise : agentInfo.expertise || [],
title : agentInfo.title || '',
role : agentInfo.role||'',
- serveArea : agentInfo.serveArea || '',
+ serveArea : agentInfo?.serveArea.split('��'),
gender : agentInfo.gender||'',
phoneNumber : agentInfo.phoneNumber||'',
companyAddress : agentInfo.companyAddress || '',
@@ -255,33 +397,46 @@
experiences : agentInfo.experiences || '',
awards : agentInfo.awards || '',
communicationStyle: agentInfo.communicationStyle || '',
- photoBase64 : ''
+ photoBase64 : '',
+ email : agentInfo.email || ''
};
this.editInfoValue = {
- ...this._agentInfoSetting,
- expertise : _.cloneDeep(this._agentInfoSetting.expertise),
+ ...this.defaultAgentInfoSetting,
+ expertise : _.cloneDeep(this.defaultAgentInfoSetting.expertise),
// TODO: 蝣箄��垢甇斗���垢���隞�" , "���� [Tomas, 2021/12/28]
- communicationStyle : this._agentInfoSetting.communicationStyle.split('��'),
+ communicationStyle : this.defaultAgentInfoSetting.communicationStyle.split('��'),
}
}
+
//////////////////////////////////////////////////////////////////////
+
editAgentInfoSetting(): void {
+ console.log('???', this.editInfoValue)
const editSettingInfo: any = {
...this.editInfoValue,
communicationStyle: this.editInfoValue.communicationStyle.join('��'),
- }
+ serveArea: this.editInfoValue.serveArea.join('��'),
+ };
+ console.log('!!!', editSettingInfo);
accountSettingService.editAgentInfoSetting(editSettingInfo).then((res: AgentInfoSetting) => {
- console.log(editSettingInfo)
+ this.isInfoUpdate = true;
+ this.updateConsultantDetail(editSettingInfo.agentNo);
});
- this.isInfoUpdate = true;
}
backToInfo() {
this.isInfoUpdate = false
this.$router.push(`/agentInfo/${this.agentInfo.agentNo}`);
- }
+ }
+
+ selectCommunicationStyles(): void {
+ if (this.editInfoValue.communicationStyle.length > 2) {
+ this.editInfoValue.communicationStyle.shift();
+ }
+ }
+
alertFieldInfo(field: string): void {
this.isAlertFieldInfo = true;
switch(field) {
@@ -289,13 +444,30 @@
this.fieldInfoTitle = '���漲';
this.fieldInfoDesc = '���漲��������翰�祟�敺����雿�憿批����脰�������蝯行�����潘��隞乩������“������潦��';
break;
- case 'evaluation':
- this.fieldInfoTitle = '隢株岷摨西”�';
- this.fieldInfoDesc = '隢株岷摨西”��撠��雿�憿批�������垣閰Ｘ���脰�������蝯行�����潦��';
- break;
+ // case 'evaluation':
+ // this.fieldInfoTitle = '隢株岷摨西”�';
+ // this.fieldInfoDesc = '隢株岷摨西”��撠��雿�憿批�������垣閰Ｘ���脰�������蝯行�����潦��';
+ // break;
}
}
+
////////////////////////////////////////////////////////////
+ get nameValid(): boolean {
+ return !!this.defaultAgentInfoSetting?.name;
+ }
+
+ 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;
+ }
+
+ 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
&& this.editInfoValue.title
@@ -303,11 +475,11 @@
&& this.editInfoValue.serveArea
&& this.editInfoValue.concept
&& this.editInfoValue.experiences
- && this.editInfoValue.awards
+ && this.editInfoValue.phoneNumber.length
&& this.editInfoValue.seniorityYear
- && this.editInfoValue.seniorityMonth
- && this.editInfoValue.expertise
- && this.editInfoValue.communicationStyle;
+ && this.editInfoValue.expertise.length
+ && this.editInfoValue.communicationStyle.length
+ && this.editInfoValue.email.length;
return !isFormValid
}
}
@@ -315,6 +487,7 @@
</script>
<style lang="scss">
+
.pam-icon {
font-size : 15px;
padding-right: 8px;
@@ -369,7 +542,11 @@
}
.seniority-input{
- width : 50px;
+ width : 60px;
margin-right: 5px;
}
+.el-input--suffix .el-input__inner {
+ padding-right: 20px;
+}
+
</style>
--
Gitblit v1.8.0