diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue
index 53ec72252..1a0b4a933 100644
--- a/src/modules/04_registryPerson/components/TableView.vue
+++ b/src/modules/04_registryPerson/components/TableView.vue
@@ -115,6 +115,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "สังกัด",
     sortable: false,
     field: "org",
+    format(val, row) {
+      return val.replace(/(.*)\s(.*)$/, "$1\n$2");
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -361,7 +364,11 @@ onMounted(() => {
         <q-td v-for="col in props.cols" :key="col.id">
           <div v-if="col.name === 'no'">
             {{
-              (formFilter.page - 1) * formFilter.pageSize + props.rowIndex + 1
+              (
+                (formFilter.page - 1) * formFilter.pageSize +
+                props.rowIndex +
+                1
+              )?.toLocaleString()
             }}
           </div>
           <div v-else-if="col.name == 'fullName'">
@@ -414,7 +421,11 @@ onMounted(() => {
               </q-item>
             </div>
           </div>
-          <div v-else class="table_ellipsis">
+
+          <div v-else-if="col.name === 'org'" class="text-html">
+            {{ col.value ? col.value : "-" }}
+          </div>
+          <div v-else>
             {{ col.value ? col.value : "-" }}
           </div>
         </q-td>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
index 24c88ee18..9f9c3f298 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/01_Info.vue
@@ -282,7 +282,7 @@ onMounted(() => {
           <div class="col-12 col-sm-12 col-md-5 text-grey-6 text-weight-medium">
             <div>สังกัด</div>
           </div>
-          <div class="col-12 col-sm-12 col-md-7">
+          <div class="col-12 col-sm-12 col-md-7 text-html">
             {{ formMain.ocId ? formMain.ocId : "-" }}
           </div>
         </div>
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
index 7c1839ffd..7e6f0c5ce 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -52,6 +52,7 @@ const {
   formatDatePosition,
   findOrgName,
   convertDateToAPI,
+  findOrgNameHtml,
 } = useCounterMixin();
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@@ -195,8 +196,9 @@ const baseColumns = ref<QTableColumn[]>([
     label: "สังกัด",
     sortable: true,
     field: "organization",
-    headerStyle: "font-size: 14px",
+    headerStyle: "font-size: 14px;",
     style: "font-size: 14px",
+
     format(val, row) {
       return findOrgName({
         root: row.orgRoot,
@@ -960,8 +962,21 @@ onMounted(async () => {
               <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
             </div>
 
-            <div v-else-if="col.name == 'organization'" class="table_ellipsis">
-              {{ col.value ? col.value : "-" }}
+            <div
+              v-else-if="col.name == 'organization'"
+              class="text-html"
+            >
+              {{
+                props.row
+                  ? findOrgNameHtml({
+                      root: props.row.orgRoot,
+                      child1: props.row.orgChild1,
+                      child2: props.row.orgChild2,
+                      child3: props.row.orgChild3,
+                      child4: props.row.orgChild4,
+                    })
+                  : "-"
+              }}
             </div>
             <div v-else>
               {{ col.value ? col.value : "-" }}
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
index ee942abfc..aa209fc64 100644
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@@ -50,6 +50,7 @@ const {
   pathRegistryEmp,
   onSearchDataTable,
   convertDateToAPI,
+  findOrgNameHtml,
 } = useCounterMixin();
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@@ -906,8 +907,18 @@ onMounted(async () => {
               <q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
             </div>
 
-            <div v-else-if="col.name == 'organization'" class="table_ellipsis">
-              {{ col.value ? col.value : "-" }}
+            <div v-else-if="col.name == 'organization'" class="text-html">
+              {{
+                props.row
+                  ? findOrgNameHtml({
+                      root: props.row.orgRoot,
+                      child1: props.row.orgChild1,
+                      child2: props.row.orgChild2,
+                      child3: props.row.orgChild3,
+                      child4: props.row.orgChild4,
+                    })
+                  : "-"
+              }}
             </div>
             <div v-else>
               {{ col.value ? col.value : "-" }}
diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue
index 80b25ec3a..1ca25f062 100644
--- a/src/modules/08_registryEmployee/views/Main.vue
+++ b/src/modules/08_registryEmployee/views/Main.vue
@@ -61,9 +61,11 @@ const columns = ref<QTableProps["columns"]>([
     label: "ลำดับ",
     sortable: false,
     field: (row) =>
-      (queryParams.page - 1) * queryParams.pageSize +
-      rows.value.indexOf(row) +
-      1,
+      (
+        (queryParams.page - 1) * queryParams.pageSize +
+        rows.value.indexOf(row) +
+        1
+      ).toLocaleString(),
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
diff --git a/src/modules/13_salary/components/02_salaryEmployee/DialogEmployeeChart.vue b/src/modules/13_salary/components/02_salaryEmployee/DialogEmployeeChart.vue
index 206d0e005..ed4ceb666 100644
--- a/src/modules/13_salary/components/02_salaryEmployee/DialogEmployeeChart.vue
+++ b/src/modules/13_salary/components/02_salaryEmployee/DialogEmployeeChart.vue
@@ -31,7 +31,7 @@ const activeType = defineModel<string>("activeType", { required: true });
 
 const props = defineProps({
   isStatusEdit: { type: Boolean, required: true },
-  data: { type: Object, required: true },
+  data: { type: Object, required: true, default: () => ({}) },
   fetchData: {
     type: Function,
     required: true,