From ac594e4efb30ba28776d74b0fb08ab34d7c32023 Mon Sep 17 00:00:00 2001 From: HelenHuang <LinHuang@pollex.com.tw> Date: 星期四, 30 十二月 2021 15:20:08 +0800 Subject: [PATCH] Merge branch 'Phase2' --- PAMapp/pages/agentInfo/_agentNo.vue | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 44 insertions(+), 8 deletions(-) diff --git a/PAMapp/pages/agentInfo/_agentNo.vue b/PAMapp/pages/agentInfo/_agentNo.vue index de479db..05f879a 100644 --- a/PAMapp/pages/agentInfo/_agentNo.vue +++ b/PAMapp/pages/agentInfo/_agentNo.vue @@ -3,7 +3,10 @@ <el-row type="flex" justify="center"> - <UiAvatar :size="150" :fileName="agentInfo.img"></UiAvatar> + <UiAvatar + :size="150" + :agentNo="agentInfo.agentNo"> + </UiAvatar> </el-row> <el-row @@ -110,6 +113,15 @@ </el-col> </el-row> + <div class="consultant-edit-btn"> + <UiField icon="flag" label="皞�◢�"> + <div class="text--orange bold pr-10 " + v-for="(communicationStyle, index) in displayCommunicationStyleList" + :key="index"> + #{{ communicationStyle }}</div> + </UiField> + </div> + <el-row type="flex" class="pam-paragraph"> @@ -134,8 +146,8 @@ type="flex" class="pam-paragraph"> <UiField icon="school" label="�犖��"> - <span v-for="(experience, index) in agentInfo.experiences" :key="index"> - {{ experience }}<span v-if="index !== agentInfo.experiences.length - 1">, </span> + <span> + {{ agentInfo.experiences }} </span> </UiField> </el-row> @@ -182,6 +194,9 @@ </div> </div> </PopUpFrame> + <div class="consultant-edit-btn" v-if="currentRole === role.ADMIN"> + <el-button type="primary" @click.native="$router.push(`/agentInfo/edit/${agentInfo.agentNo}`)">蝺刻摩撣單鞈��</el-button> + </div> </div> </template> @@ -193,25 +208,30 @@ import myConsultantService from '~/shared/services/my-consultant.service'; import { AgentInfo } from '~/shared/models/agent-info.model'; import { hideReviews } from '~/shared/const/hide-reviews'; -import { Role } from '~/shared/models/enum/role'; +import { Role } from '~/shared/models/enum/Role'; const roleStorage = namespace('localStorage'); @Component export default class AgentInfoComponent extends Vue { + @roleStorage.Getter currentRole!:string|null; - role = Role; + agentInfo!: AgentInfo; + role = Role; isAlertAddSuccess = false; isAlertFieldInfo = false; fieldInfoTitle = ''; fieldInfoDesc = ''; hideReviews = hideReviews ; - ////////////////////////////////////////////////////////////////////// get agentName(): string { return `${this.agentInfo.name}(${this.agentInfo.role})`; + } + + get displayCommunicationStyleList(): string[] { + return this.agentInfo.communicationStyle.split('��').filter((item) => item); } async asyncData(context: Context) { @@ -219,12 +239,13 @@ return { agentInfo: await myConsultantService.getConsultantDetail(agentNo).then((res) => res) } + } - + + alertAddSuccess(): void { this.isAlertAddSuccess = true; } - alertFieldInfo(field: string): void { this.isAlertFieldInfo = true; switch(field) { @@ -238,6 +259,13 @@ break; } } + +////////////////////////////////////////////////////////////////////// + + get agentName(): string { + return `${this.agentInfo.name}(${this.agentInfo.role})`; + } + } </script> @@ -291,5 +319,13 @@ flex-wrap: wrap; line-height: 24px; } +.consultant-edit-btn{ + display: flex; + justify-content: center; +} + +.pam-field{ + display: flex; +} </style> -- Gitblit v1.8.0