From 34b08e1c461f5e08675fcff95525956d7c4bef11 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 17 二月 2022 11:38:48 +0800 Subject: [PATCH] Merge branch 'Phase3' into pollex-dev --- PAMapp/pages/agentInfo/_agentNo.vue | 52 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 18 deletions(-) diff --git a/PAMapp/pages/agentInfo/_agentNo.vue b/PAMapp/pages/agentInfo/_agentNo.vue index 7e6dfc0..9313a1a 100644 --- a/PAMapp/pages/agentInfo/_agentNo.vue +++ b/PAMapp/pages/agentInfo/_agentNo.vue @@ -27,6 +27,15 @@ </el-row> <el-row + v-if="currentRole === role.ADMIN" + type="flex" + class="pam-paragraph"> + <UiField :span="12" icon="phone" label="����Ⅳ"> + {{ agentInfo.phoneNumber }} + </UiField> + </el-row> + + <el-row type="flex" class="pam-paragraph"> <UiField :span="12" icon="agent" label="����"> @@ -38,7 +47,7 @@ type="flex" class="pam-paragraph"> <UiField icon="company" label="�����"> - {{ agentInfo.serveArea }} + {{ agentInfo.serveArea | toServeArea }} </UiField> </el-row> @@ -116,7 +125,7 @@ <div class="consultant-edit-btn"> <UiField icon="flag" label="皞�◢�"> <div class="text--orange bold pr-10 " - v-for="(communicationStyle, index) in displayCommunicationStyleList" + v-for="(communicationStyle, index) in displayCommunicationStyleList" :key="index"> #{{ communicationStyle }}</div> </UiField> @@ -137,7 +146,7 @@ <el-row type="flex" class="pam-paragraph"> - <UiField icon="comment" label="�犖��艙"> + <UiField icon="comment" label="�犖��艙" class="agent-info-textarea"> {{ agentInfo.concept }} </UiField> </el-row> @@ -145,7 +154,7 @@ <el-row type="flex" class="pam-paragraph"> - <UiField icon="school" label="�犖��"> + <UiField icon="school" label="�犖��" class="agent-info-textarea"> <span> {{ agentInfo.experiences }} </span> @@ -155,7 +164,7 @@ <el-row type="flex" class="pam-paragraph"> - <UiField icon="trophy" label="敺��風"> + <UiField icon="trophy" label="敺��風" class="agent-info-textarea"> {{ agentInfo.awards }} </UiField> </el-row> @@ -214,33 +223,28 @@ @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) { const agentNo = context.route.params.agentNo; return { agentInfo: await myConsultantService.getConsultantDetail(agentNo).then((res) => res) } - } - - + + ////////////////////////////////////////////////////////////////////// + alertAddSuccess(): void { this.isAlertAddSuccess = true; } @@ -258,6 +262,15 @@ break; } } + + get agentName(): string { + return `${this.agentInfo.name}(${this.agentInfo.role})`; + } + + get displayCommunicationStyleList(): string[] { + return this.agentInfo.communicationStyle.split('��').filter((item) => item); + } + } </script> @@ -319,5 +332,8 @@ .pam-field{ display: flex; } - +.agent-info-textarea{ + word-break: break-all; + word-wrap: break-word; +} </style> -- Gitblit v1.8.0