diff --git a/src/modules/06_retirement/components/01_retirement/DialogAddListRetirement.vue b/src/modules/06_retirement/components/01_retirement/DialogAddListRetirement.vue
index 10b006879..16a718581 100644
--- a/src/modules/06_retirement/components/01_retirement/DialogAddListRetirement.vue
+++ b/src/modules/06_retirement/components/01_retirement/DialogAddListRetirement.vue
@@ -12,7 +12,7 @@ import type { RoundData } from "@/modules/06_retirement/interface/index/Main";
 /** Use */
 const $q = useQuasar();
 const mixin = useCounterMixin();
-const { dialogConfirm, messageError } = mixin;
+const { dialogConfirm, messageError, showLoader, hideLoader } = mixin;
 const router = useRouter();
 
 /** Prop */
@@ -90,6 +90,7 @@ async function clickSelect(action: string) {
 
 // เพิ่มรอบประกาศเกษียณอายุราชการ API
 async function cerateRetirement(data: object) {
+  showLoader();
   await http
     .post(config.API.createProfile(), data)
     .then((res) => {
@@ -99,7 +100,9 @@ async function cerateRetirement(data: object) {
     })
     .catch((e) => {
       messageError($q, e);
-    });
+      hideLoader();
+    })
+    .finally(() => {});
 }
 </script>
 <template>
diff --git a/src/modules/06_retirement/views/05_deceased.vue b/src/modules/06_retirement/views/05_deceased.vue
index 373ee304d..ebbfca1ec 100644
--- a/src/modules/06_retirement/views/05_deceased.vue
+++ b/src/modules/06_retirement/views/05_deceased.vue
@@ -81,7 +81,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "position",
     align: "left",
-    label: "ตำแหน่งในสายงาน",
+    label: "ตำแหน่ง",
     sortable: true,
     field: "position",
     headerStyle: "font-size: 14px",
@@ -90,7 +90,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "positionType",
     align: "left",
-    label: "ตำแหน่งประเภท",
+    label: "ตำแหน่งประเภท/กลุ่มงาน",
     sortable: true,
     field: "positionType",
     headerStyle: "font-size: 14px",
diff --git a/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue b/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue
index 42af36b1c..6a346a9a6 100644
--- a/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue
+++ b/src/modules/14_KPI/components/Tab/Dialog/DialogGovernment.vue
@@ -310,6 +310,16 @@ watch(
                     <div v-if="col.name === 'no'">
                       {{ props.rowIndex + 1 }}
                     </div>
+                    <div
+                      v-else-if="col.name == 'organizationPositionOld'"
+                      class="text-html"
+                    >
+                      {{
+                        props.row.organizationPositionOld
+                          ? props.row.organizationPositionOld
+                          : "-"
+                      }}
+                    </div>
                     <div v-else>
                       {{ col.value ? col.value : "-" }}
                     </div>
diff --git a/src/modules/14_KPI/components/results/tableIndividual.vue b/src/modules/14_KPI/components/results/tableIndividual.vue
index fc979d563..52b79cc7e 100644
--- a/src/modules/14_KPI/components/results/tableIndividual.vue
+++ b/src/modules/14_KPI/components/results/tableIndividual.vue
@@ -14,7 +14,7 @@ import type { DataOption } from "@/modules/14_KPI/interface/index/Main";
 import type {
   ResRound,
   ResDevelopment,
-} from "@/modules/14_KPI/interface/response/index";
+} from "@/modules/14_KPI/interface/response/Index";
 
 /** importComponents*/
 import DialogIndividual from "@/modules/14_KPI/components/results/dialogIndividual.vue";
@@ -357,7 +357,14 @@ onMounted(async () => {
             <div v-if="col.name == 'no'">
               {{ (page - 1) * pageSize + props.rowIndex + 1 }}
             </div>
-            <div v-else class="table_ellipsis2">
+            <div
+              v-else-if="col.name == 'organization'"
+              class="text-html"
+              style="width: 300px"
+            >
+              {{ props.row.organization ? props.row.organization : "-" }}
+            </div>
+            <div v-else>
               {{ col.value ?? "-" }}
             </div>
           </q-td>
diff --git a/src/modules/14_KPI/components/results/tableResults.vue b/src/modules/14_KPI/components/results/tableResults.vue
index 379097c81..d134a7982 100644
--- a/src/modules/14_KPI/components/results/tableResults.vue
+++ b/src/modules/14_KPI/components/results/tableResults.vue
@@ -446,7 +446,14 @@ onMounted(async () => {
                 <div v-if="col.name == 'no'">
                   {{ (page - 1) * pageSize + props.rowIndex + 1 }}
                 </div>
-                <div v-else class="table_ellipsis2">
+                <div
+                  v-else-if="col.name == 'organization'"
+                  class="text-html"
+                  style="width: 300px"
+                >
+                  {{ props.row.organization ? props.row.organization : "-" }}
+                </div>
+                <div v-else >
                   {{ col.value ?? "-" }}
                 </div>
               </q-td>
diff --git a/src/modules/14_KPI/views/detailView.vue b/src/modules/14_KPI/views/detailView.vue
index 2c8e22c90..8e1e10b00 100644
--- a/src/modules/14_KPI/views/detailView.vue
+++ b/src/modules/14_KPI/views/detailView.vue
@@ -66,7 +66,7 @@ const {
   messageError,
   dialogConfirm,
   success,
-  findOrgName,
+  findOrgNameHtml,
   dialogRemove,
 } = mixin;
 
@@ -431,7 +431,7 @@ async function fetchProfileEvaluator(id: string) {
       evaluator.value.posLevelName = data.posLevelName;
       evaluator.value.isPosmasterAct = data.isPosmasterAct;
       evaluator.value.posmasterAct = data.posmasterAct[0];
-      evaluator.value.org = findOrgName(data);
+      evaluator.value.org = findOrgNameHtml(data);
     })
     .catch((e) => {
       messageError($q, e);
@@ -1287,7 +1287,7 @@ onUnmounted(() => {
                       : "-"
                   }}
                 </div>
-                <div class="col-3">
+                <div class="col-3 text-html">
                   {{ evaluator.org ? evaluator.org : "-" }}
                 </div>
               </div>
diff --git a/src/modules/14_KPI/views/mainDetail.vue b/src/modules/14_KPI/views/mainDetail.vue
index 2903cd239..9a81e01f2 100644
--- a/src/modules/14_KPI/views/mainDetail.vue
+++ b/src/modules/14_KPI/views/mainDetail.vue
@@ -22,7 +22,7 @@ const $q = useQuasar();
 const mixin = useCounterMixin();
 const {
   messageError,
-  findOrgName,
+  findOrgNameHtml,
   showLoader,
   hideLoader,
   date2Thai,
@@ -134,7 +134,7 @@ async function getMain() {
       formData.posExecutiveName = data.posExecutiveName;
       formData.posLevelName = data.posLevelName;
       formData.isProbation = data.isProbation;
-      formData.org = findOrgName(data);
+      formData.org = findOrgNameHtml(data);
       profileId.value = data.profileId;
       const promises = [];
       promises.push(getList(data.profileId)); // fetch รายการทดลองงาน
@@ -302,7 +302,7 @@ onMounted(async () => {
                       : "-"
                   }}
                 </div>
-                <div class="col-4">
+                <div class="col-4 text-html">
                   {{ formData.org ? formData.org : "-" }}
                 </div>
               </div>