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 |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/PAMapp/pages/agentInfo/_agentNo.vue b/PAMapp/pages/agentInfo/_agentNo.vue
index 59b29e2..9313a1a 100644
--- a/PAMapp/pages/agentInfo/_agentNo.vue
+++ b/PAMapp/pages/agentInfo/_agentNo.vue
@@ -47,7 +47,7 @@
         type="flex"
         class="pam-paragraph">
         <UiField icon="company" label="�����">
-          {{ agentInfo.serveArea }}
+          {{ agentInfo.serveArea | toServeArea }}
         </UiField>
       </el-row>
 
@@ -146,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>
@@ -154,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>
@@ -164,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>
@@ -203,9 +203,9 @@
             </div>
         </div>
     </PopUpFrame>
-    <!-- <div class="consultant-edit-btn" v-if="currentRole === role.ADMIN">
+    <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>
     </div>
 </template>
 
@@ -332,5 +332,8 @@
 .pam-field{
   display: flex;
 }
-
+.agent-info-textarea{
+  word-break: break-all;
+  word-wrap: break-word;
+}
 </style>

--
Gitblit v1.8.0