diff --git a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
index 6739a9391..b83dd7fed 100644
--- a/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
+++ b/src/modules/06_retirement/components/01_retirement/RetirementDetail.vue
@@ -457,6 +457,12 @@ onMounted(async () => {
       <div class="row col-12 q-pb-sm">
         <div class="row">
           <q-btn
+            v-if="
+              !checkRoutePermisson &&
+              !statusReport &&
+              (typeReport == 'ADD' || typeReport == '' || typeReport == null) &&
+              !statusUpload
+            "
             flat
             round
             color="primary"
@@ -856,12 +862,6 @@ onMounted(async () => {
     :employeeType="employeeType == 'OFFICER' ? true : false"
     :profile-id="profileId"
     :UpdateListId="UpdateListId"
-    v-if="
-      !checkRoutePermisson &&
-      !statusReport &&
-      (typeReport == 'ADD' || typeReport == '' || typeReport == null) &&
-      !statusUpload
-    "
   />
 
   <PopupPersonal
diff --git a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
index 5b8f09bf1..664b1e02f 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/viewstep/viewStep1.vue
@@ -224,7 +224,7 @@ onMounted(() => {
                 label="อายุราชการ"
               />
             </div>
-            <div class="col-xs-12 col-sm-9">
+            <div class="col-xs-12 col-sm-9 text-html">
               <q-input
                 borderless
                 readonly
diff --git a/src/modules/12_evaluatePersonal/views/MainPage.vue b/src/modules/12_evaluatePersonal/views/MainPage.vue
index 8776d6589..560db43d5 100644
--- a/src/modules/12_evaluatePersonal/views/MainPage.vue
+++ b/src/modules/12_evaluatePersonal/views/MainPage.vue
@@ -389,7 +389,7 @@ onMounted(async () => {
               </div>
 
               <div v-else-if="col.name === 'agency'">
-                <div class="table_ellipsis">{{ props.row.agency }}</div>
+                <div class="text-html">{{ props.row.agency }}</div>
               </div>
               <div v-else>
                 {{ col.value ?? "-" }}