From 08a80cb8b77e0ac872522f8114ca8603b959f301 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 24 Mar 2025 09:36:38 +0700
Subject: [PATCH] fix

---
 .../views/edit/components/Table.vue                 | 13 +++++++++++--
 src/modules/04_registryPerson/views/edit/salary.vue |  9 +++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue
index ce9215dbb..82578b5bd 100644
--- a/src/modules/04_registryPerson/views/edit/components/Table.vue
+++ b/src/modules/04_registryPerson/views/edit/components/Table.vue
@@ -25,6 +25,7 @@ const {
   hideLoader,
   messageError,
   success,
+  findOrgNameHtml,
 } = useCounterMixin();
 
 const empType = ref<string>(route.params.type.toString());
@@ -437,7 +438,7 @@ onMounted(() => {
         >
         <template v-slot:header="props">
           <q-tr :props="props">
-            <q-th v-if="tabs === 'PENDING'" />
+            <q-th v-if="tabs === 'PENDING' && statusCheckEdit !== 'CHECKED'" />
             <q-th v-for="col in props.cols" :key="col.name" :props="props">
               <span class="text-weight-medium">{{ col.label }}</span>
             </q-th>
@@ -508,7 +509,15 @@ onMounted(() => {
                 v-if="col.name === 'organization'"
                 class="text-html table_ellipsis"
               >
-                {{ col.value ? col.value : "-" }}
+                {{
+                  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-if="col.name === 'commandCode'"
diff --git a/src/modules/04_registryPerson/views/edit/salary.vue b/src/modules/04_registryPerson/views/edit/salary.vue
index cf7b7fcb9..51a577fc0 100644
--- a/src/modules/04_registryPerson/views/edit/salary.vue
+++ b/src/modules/04_registryPerson/views/edit/salary.vue
@@ -18,7 +18,7 @@ const {
   hideLoader,
   messageError,
   dialogConfirm,
-  findOrgName,
+  findOrgNameHtml,
   success,
 } = useCounterMixin();
 const route = useRoute();
@@ -49,7 +49,7 @@ async function fetchDataProfile() {
         posNo: data.posNo,
         posType: data.posTypeName,
         posLevel: data.posLevelName,
-        org: findOrgName(data),
+        org: findOrgNameHtml(data),
       };
     })
     .catch((err) => {
@@ -202,8 +202,9 @@ onMounted(async () => {
 
         <q-item>
           <q-item-section>
-            <q-item-label
-              ><strong>สังกัด:</strong> {{ dataProfile?.org }}</q-item-label
+            <q-item-label class="text-html"
+              ><strong>สังกัด:</strong> <span></span
+              >{{ dataProfile?.org }}</q-item-label
             >
           </q-item-section>
         </q-item>