From bdd5b222ca3ddf58fa122b5e107507b816bb37bb Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 26 Feb 2025 18:13:20 +0700
Subject: [PATCH 01/18] fix sort

---
 .../components/detail/PersonalInformation/06_SpecialSkill.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
index a3ed7b809..fee415c54 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/06_SpecialSkill.vue
@@ -921,6 +921,7 @@ onMounted(() => {
           dense
           class="custom-header-table"
           :visible-columns="historyVisibleColumns"
+          v-model:pagination="historyPagination"
         >
           <template v-slot:header="props">
             <q-tr :props="props">

From 78f854f2fc602814ff94b05ef4bbaf02b8c6dcdf Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 09:44:19 +0700
Subject: [PATCH 02/18] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D=3D>=20sysName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/21_report/views/02_reportRegistry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 50ec05646..3f1714a2f 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -643,7 +643,7 @@ const expanded = ref<string[]>([]);
 const expandedModal = ref<boolean>(false);
 
 async function fetchTree() {
-  const data = await fetchStructureTree(route.meta.Key as string, true);
+  const data = await fetchStructureTree('SYS_REGISTRY_OFFICER' as string, true);
   if (data) {
     node.value = data;
   }

From 7d485c5fad670d40477ef9965a824e6bdb6c7f76 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 09:52:25 +0700
Subject: [PATCH 03/18] sort

---
 .../detail/PersonalInformation/05_Education.vue          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
index 232f1f0ea..6e805727d 100644
--- a/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
+++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/05_Education.vue
@@ -128,7 +128,9 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
     format: (v) => (v === true ? "ใช่" : "ไม่ใช่"),
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "degree",
@@ -139,7 +141,9 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
-      a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
+      a
+        .toString()
+        .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
     name: "field",
@@ -891,7 +895,6 @@ onMounted(async () => {
     class="custom-header-table"
     :visible-columns="visibleColumns"
     v-model:pagination="pagination"
-
   >
     <template v-slot:header="props">
       <q-tr :props="props">

From 9da91f202cd701278431a7833ad9d8ace6fce32f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 10:57:27 +0700
Subject: [PATCH 04/18] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4=20=3D=3D>=20fetch=20Tree?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interface/response/main.ts                |  2 +-
 .../21_report/views/02_reportRegistry.vue     | 32 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/interface/response/main.ts b/src/interface/response/main.ts
index e49121332..561af060e 100644
--- a/src/interface/response/main.ts
+++ b/src/interface/response/main.ts
@@ -43,4 +43,4 @@ interface DataRoles {
   parentNode: string;
 }
 
-export type { ListMenu, ChildLevelTree, ChildConfig, DataPermissions };
+export type { ListMenu, ChildLevelTree, ChildConfig, DataPermissions,DataRoles };
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 3f1714a2f..b88875f34 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -6,7 +6,7 @@ import * as XLSX from "xlsx";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
-import { checkPermission } from "@/utils/permissions";
+import { checkPermission, checkPermissionGet } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useReportStore } from "@/modules/21_report/store";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
@@ -22,6 +22,8 @@ import type {
   ResOptionPerson,
   DataEducationLevel,
 } from "@/modules/21_report/interface/Main";
+import type { DataRoles } from "@/interface/response/main";
+import type { DataStructureTree } from "@/interface/main";
 
 import DialogOrg from "@/modules/21_report/components/01_org/DialogOrg.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
@@ -637,15 +639,29 @@ watch(
   }
 );
 
-const node = ref<any[]>([]);
+const node = ref<DataStructureTree[]>([]);
 const filterTree = ref<string>("");
 const expanded = ref<string[]>([]);
 const expandedModal = ref<boolean>(false);
+// const sysName = ref<bo>
 
 async function fetchTree() {
-  const data = await fetchStructureTree('SYS_REGISTRY_OFFICER' as string, true);
-  if (data) {
-    node.value = data;
+  try {
+    const res = await http.get(config.API.orgPermissionsSys);
+    const response = res.data.result.roles;
+
+    const sysName = response.find(
+      (e: DataRoles) =>
+        e.authSysId === "SYS_REGISTRY_OFFICER" ||
+        e.authSysId === "REPORT_REGISTRY"
+    )?.authSysId;
+
+    const data = await fetchStructureTree(sysName ?? "REPORT_REGISTRY", true);
+    if (data) {
+      node.value = data;
+    }
+  } catch (err) {
+    messageError($q, err);
   }
 }
 
@@ -1601,8 +1617,12 @@ onMounted(async () => {
                         <div v-else-if="col.name === 'fullName'">
                           {{ col.value }}
                           <q-btn
+                            v-if="
+                              props.row.empType === 'employee'
+                                ? checkPermissionGet('SYS_REGISTRY_EMP')
+                                : checkPermissionGet('SYS_REGISTRY_OFFICER')
+                            "
                             size="sm"
-                            v-if="checkPermission($route)?.attrIsGet"
                             flat
                             dense
                             icon="info"

From c424747862d48e112c3847c744ae17dc0ec8064e Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 10:59:23 +0700
Subject: [PATCH 05/18] =?UTF-8?q?fix=20permiss=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=97=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/21_report/views/02_reportRegistry.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index b88875f34..553d27ad7 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -1616,12 +1616,8 @@ onMounted(async () => {
                         </div>
                         <div v-else-if="col.name === 'fullName'">
                           {{ col.value }}
+
                           <q-btn
-                            v-if="
-                              props.row.empType === 'employee'
-                                ? checkPermissionGet('SYS_REGISTRY_EMP')
-                                : checkPermissionGet('SYS_REGISTRY_OFFICER')
-                            "
                             size="sm"
                             flat
                             dense

From a595c1a5e9606fd43a231a0eca998876b9ec158c Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 13:18:34 +0700
Subject: [PATCH 06/18] fix  max-heigth

---
 src/modules/21_report/views/02_reportRegistry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 553d27ad7..954813e9b 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -1672,7 +1672,7 @@ onMounted(async () => {
 
 .tree-container {
   overflow: auto;
-  height: 50vh;
+  max-height: 50vh;
 }
 .my-list-link {
   color: rgb(118, 168, 222);

From a6293efa6999ae30a51bebfc94119051a4693752 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 17:19:31 +0700
Subject: [PATCH 07/18] =?UTF-8?q?API=20=E0=B8=82=E0=B9=89=E0=B8=AD?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/registry/api.registry.ts              |  5 +-
 .../GovernmentInformation/07_Position.vue     | 40 ++++++++++---
 .../21_report/components/CardPosition.vue     | 60 +++++++++++++++----
 .../21_report/views/02_reportRegistry.vue     |  3 +
 src/stores/mixin.ts                           | 14 +++++
 5 files changed, 99 insertions(+), 23 deletions(-)

diff --git a/src/api/registry/api.registry.ts b/src/api/registry/api.registry.ts
index 3d27609ca..4e026c74b 100644
--- a/src/api/registry/api.registry.ts
+++ b/src/api/registry/api.registry.ts
@@ -169,7 +169,8 @@ export default {
     `${registryNew}${type}/leave/admin/${id}`, //noPermission
 
   /** ตำแหน่ง*/
-  profileSalaryPositionNew: (type: string) => `${registryNew}${type}/salary/position`,
+  profileSalaryPositionNew: (type: string) =>
+    `${registryNew}${type}/salary/position`,
   profileListSalaryPositionNew: (id: string, type: string) =>
     `${registryNew}${type}/salary/position/${id}`,
   profileListSalaryPositionHistoryNew: (profileId: string, type: string) =>
@@ -178,6 +179,8 @@ export default {
     `${registryNew}${type2}/salary/position/swap/${type}/${id}`,
   salaryListCardPosition: (id: string, type: string) =>
     `${registryNew}${type}/salary/position/admin/${id}`, //noPermission
+  salaryTenurePosition: (id: string, type: string) =>
+    `${registryNew}${type}/salary/tenure/${id}`, //noPermission
 
   /** ตำแหน่งเงินเดือน*/
   profileSalaryNew: (type: string) => `${registryNew}${type}/salary`,
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 e73da8886..7c6ddf9fb 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -47,6 +47,7 @@ const {
   success,
   pathRegistryEmp,
   onSearchDataTable,
+  formatDatePosition,
 } = useCounterMixin();
 
 const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
@@ -292,21 +293,15 @@ const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
 const cardData = ref<any[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
-    data: [
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-    ],
+    data: [],
   },
   {
     label: "ระยะเวลาดำรงตำแหน่งตามระดับ",
-    data: [{ name: "ละดับ", time: "1 ปี" }],
+    data: [],
   },
   {
     label: "ระยะเวลาดำรงตำแหน่งทางการบริหาร",
-    data: [{ name: "ตำแหน่งทางการบริหาร", time: "1 ปี" }],
+    data: [],
   },
 ]);
 
@@ -731,9 +726,36 @@ function serchDataTable() {
   );
 }
 
+async function fetchDataTenure() {
+  await http
+    .get(config.API.salaryTenurePosition(profileId.value, empType.value))
+    .then((res) => {
+      const data = res.data.result;
+      if (data) {
+        const formatData = (list: any) =>
+          list.map((e: any) => ({
+            name: e.name ?? "",
+            time: formatDatePosition(e.year, e.month, e.day),
+          }));
+
+        const position = formatData(data.position);
+        const posLevel = formatData(data.posLevel);
+        const posExecutive = formatData(data.posExecutive);
+
+        cardData.value[0].data = position;
+        cardData.value[1].data = posLevel;
+        cardData.value[2].data = posExecutive;
+      }
+    })
+    .catch((err) => {
+      messageError($q, err);
+    });
+}
+
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchListSalary();
+  fetchDataTenure();
 });
 </script>
 
diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue
index 4d1b9a1e1..2e6e783f2 100644
--- a/src/modules/21_report/components/CardPosition.vue
+++ b/src/modules/21_report/components/CardPosition.vue
@@ -1,5 +1,13 @@
 <script setup lang="ts">
 import { ref, onMounted } from "vue";
+import { useQuasar } from "quasar";
+
+import http from "@/plugins/http";
+import config from "@/app.config";
+import { useCounterMixin } from "@/stores/mixin";
+
+const $q = useQuasar();
+const { messageError, formatDatePosition } = useCounterMixin();
 
 /** props*/
 const props = defineProps({
@@ -14,27 +22,53 @@ const props = defineProps({
 const cardData = ref<any[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
-    data: [
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-      { name: "ตำแหน่ง", time: "1 ปี" },
-    ],
+    data: [],
   },
   {
     label: "ระยะเวลาดำรงตำแหน่งตามระดับ",
-    data: [{ name: "ละดับ", time: "1 ปี" }],
+    data: [],
   },
   {
     label: "ระยะเวลาดำรงตำแหน่งทางการบริหาร",
-    data: [{ name: "ตำแหน่งทางการบริหาร", time: "1 ปี" }],
+    data: [],
   },
 ]);
 
+async function fetchDataTenure() {
+  if (props?.id) {
+    await http
+      .get(
+        config.API.salaryTenurePosition(
+          props?.id,
+          props.type === "officer" ? "" : "-employee"
+        )
+      )
+      .then((res) => {
+        const data = res.data.result;
+        if (data) {
+          const formatData = (list: any) =>
+            list.map((e: any) => ({
+              name: e.name ?? "",
+              time: formatDatePosition(e.year, e.month, e.day),
+            }));
+
+          const position = formatData(data.position);
+          const posLevel = formatData(data.posLevel);
+          const posExecutive = formatData(data.posExecutive);
+
+          cardData.value[0].data = position;
+          cardData.value[1].data = posLevel;
+          cardData.value[2].data = posExecutive;
+        }
+      })
+      .catch((err) => {
+        messageError($q, err);
+      });
+  }
+}
+
 onMounted(() => {
-  console.log(props.id);
-  console.log(props.type);
+  fetchDataTenure();
 });
 </script>
 
@@ -45,7 +79,7 @@ onMounted(() => {
       <span class="q-ml-md">ข้อมูลตำแหน่ง </span>
     </div>
     <div class="row q-pa-sm">
-      <q-list flat bordered class="col-12" style="border-radius: 5px;">
+      <q-list flat bordered class="col-12" style="border-radius: 5px">
         <q-card flat v-for="(item, index) in cardData" :key="index">
           <q-item>
             <q-item-section>
@@ -57,7 +91,7 @@ onMounted(() => {
               </q-item-label>
             </q-item-section>
           </q-item>
-          <q-separator spaced v-if="index !==  2"  />
+          <q-separator v-if="index !== 2" />
         </q-card>
       </q-list>
     </div>
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 954813e9b..a710ac5a4 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -522,6 +522,9 @@ async function onSearch() {
     sortBy: sortBy.value ? "dateAppoint" : "",
     sort: sortBy.value ? sortBy.value : "ASC",
     isRetireLaw: isRetireLaw.value,
+    tenureType: typeTerm.value ?? null,
+    tenureMin: typeTerm.value ? Number(rangeTerm.value.min) : null,
+    tenureMax: typeTerm.value ? Number(rangeTerm.value.max) : null,
   };
   showLoader();
   await http
diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index 67349f5e7..ccba40ca0 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -1149,6 +1149,19 @@ export const useCounterMixin = defineStore("mixin", () => {
     });
   }
 
+  function formatDatePosition(year: string, month: string, day: string) {
+    const y = parseInt(year);
+    const m = parseInt(month);
+    const d = parseInt(day);
+
+    const parts = [];
+    if (y > 0) parts.push(`${y}ปี`);
+    if (m > 0) parts.push(`${m}เดือน`);
+    if (d > 0) parts.push(`${d}วัน`);
+
+    return parts.length > 0 ? parts.join(" ") : ""; // กรณีที่ทั้งหมดเป็น 0
+  }
+
   return {
     calAge,
     date2Thai,
@@ -1195,5 +1208,6 @@ export const useCounterMixin = defineStore("mixin", () => {
     downloadRenameFileByLink,
 
     onSearchDataTable,
+    formatDatePosition,
   };
 });

From 3462d77d1cf7fe8919fb8ad79d2e43f2c07b4280 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 27 Feb 2025 18:07:57 +0700
Subject: [PATCH 08/18] fix

---
 src/modules/21_report/views/02_reportRegistry.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index a710ac5a4..f700becb6 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -522,7 +522,7 @@ async function onSearch() {
     sortBy: sortBy.value ? "dateAppoint" : "",
     sort: sortBy.value ? sortBy.value : "ASC",
     isRetireLaw: isRetireLaw.value,
-    tenureType: typeTerm.value ?? null,
+    tenureType: typeTerm.value,
     tenureMin: typeTerm.value ? Number(rangeTerm.value.min) : null,
     tenureMax: typeTerm.value ? Number(rangeTerm.value.max) : null,
   };

From 2733e0801de42858a66a1459503e322bc3777e93 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Thu, 27 Feb 2025 18:21:00 +0700
Subject: [PATCH 09/18] fixing display dashboard

---
 src/views/DashboardAll.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/DashboardAll.vue b/src/views/DashboardAll.vue
index 713fb3e8d..f75570989 100644
--- a/src/views/DashboardAll.vue
+++ b/src/views/DashboardAll.vue
@@ -19,7 +19,7 @@ onMounted(async () => {
     (item: ListMenu) => item.path === route.name
   );
   title.value = `สถิติ${data?.sysName}`;
-  panelUrl.value = `${env.DASHBOARD_URL}/goto/${data?.sysDescription}`;
+  panelUrl.value = `${env.DASHBOARD_URL}/d/${data?.sysDescription}`;
 });
 </script>
 

From cf534d48063de828aa6f9138a762ef409c3371ca Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 09:38:38 +0700
Subject: [PATCH 10/18] fix

---
 src/modules/17_acting/views/main.vue              | 5 +++--
 src/modules/21_report/views/02_reportRegistry.vue | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue
index bbf8ecc1f..1fca0f075 100644
--- a/src/modules/17_acting/views/main.vue
+++ b/src/modules/17_acting/views/main.vue
@@ -315,6 +315,7 @@ onMounted(() => {
   >
     รักษาการในตำแหน่ง
     <q-space />
+
     <q-btn
       class="q-px-sm"
       v-if="storeActing.isOfficer"
@@ -332,7 +333,7 @@ onMounted(() => {
   <q-card style="height: 100%">
     <q-card-section :horizontal="$q.screen.gt.sm">
       <!-- โครงสร้าง -->
-      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm">
+      <q-card-section class="col-lg-3 col-md-4 col-xs-12 q-gutter-sm q-pa-sm">
         <div>
           <q-input dense outlined v-model="filter" label="ค้นหา">
             <template v-slot:append>
@@ -671,7 +672,7 @@ onMounted(() => {
   />
 </template>
 
-<style scoped>
+<style lang="scss" scoped>
 .tree-container {
   overflow: auto;
   height: 74vh;
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index f700becb6..beecb0083 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -904,7 +904,7 @@ onMounted(async () => {
                             </template>
                           </q-input>
                           <q-tree
-                            class="tree-container q-mt-sm"
+                            class="tree-container-report-registry q-mt-sm"
                             dense
                             :nodes="node"
                             node-key="orgTreeName"
@@ -1673,7 +1673,7 @@ onMounted(async () => {
   padding: 10px;
 }
 
-.tree-container {
+.tree-container-report-registry {
   overflow: auto;
   max-height: 50vh;
 }

From f9bdb3a52307a34749e31a2f2a4356c3461f06dd Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 09:45:45 +0700
Subject: [PATCH 11/18] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=94=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/PopupPersonalNew.vue                   | 2 +-
 .../components/detail/GovernmentInformation/07_Position.vue   | 4 ++--
 src/modules/21_report/views/02_reportRegistry.vue             | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 4afdf0b48..504fde1ed 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -487,7 +487,7 @@ async function fetchProfile(id: string, avatarName: string) {
               <q-card
                 bordered
                 style="border: 1px solid #d6dee1"
-                v-if="checkRoute"
+                v-if="checkRoute && props.type === 'officer'"
               >
                 <CardPosition :id="props.id" :type="props.type" />
               </q-card>
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 7c6ddf9fb..eab68205e 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -755,12 +755,12 @@ async function fetchDataTenure() {
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
 onMounted(() => {
   fetchListSalary();
-  fetchDataTenure();
+  empType.value === "" && fetchDataTenure();
 });
 </script>
 
 <template>
-  <div class="row q-col-gutter-sm q-pb-sm">
+  <div class="row q-col-gutter-sm q-pb-sm" v-if="empType === ''">
     <div class="col" v-for="(item, index) in cardData" :key="index">
       <q-card bordered class="col-12" style="border: 1px solid #d6dee1">
         <div class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md">
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index beecb0083..634b800b1 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -6,7 +6,7 @@ import * as XLSX from "xlsx";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRoute } from "vue-router";
-import { checkPermission, checkPermissionGet } from "@/utils/permissions";
+import { checkPermission } from "@/utils/permissions";
 import { useCounterMixin } from "@/stores/mixin";
 import { useReportStore } from "@/modules/21_report/store";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
@@ -45,7 +45,6 @@ const employeeClassOption = ref<OptionData[]>([
 ]);
 
 const rows = ref<any[]>([]);
-const detailReport = ref<any>();
 
 /** ช่วงเวลา */
 const dateStart = ref<Date | null>(null); //บรรจุตั้งเเต่วันที่

From d010529aafd2012568db0950de81333f559afa6d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 10:05:39 +0700
Subject: [PATCH 12/18] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=B5=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=95=E0=B8=B4=20=3D=3D>=20=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GovernmentInformation/07_Position.vue     | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

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 eab68205e..f250c2cbb 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -307,7 +307,6 @@ const cardData = ref<any[]>([
 
 /** function fetch รายการ ตำแหน่งเงินเดือน*/
 async function fetchListSalary() {
-  showLoader();
   await http
     .get(
       config.API.profileListSalaryPositionNew(profileId.value, empType.value)
@@ -318,9 +317,6 @@ async function fetchListSalary() {
     })
     .catch((err) => {
       messageError($q, err);
-    })
-    .finally(() => {
-      hideLoader();
     });
 }
 
@@ -553,13 +549,13 @@ function onSubmit() {
         : config.API.profileSalaryPositionNew(empType.value);
       const method = isStatusEdit.value ? "patch" : "post";
       await http[method](url, formData);
-      await onClickCloseDialog();
       await fetchListSalary();
+      await onClickCloseDialog();
       success($q, "บันทึกข้อมูลสำเร็จ");
     } catch (e) {
       messageError($q, e);
-      hideLoader();
     } finally {
+      hideLoader();
     }
   });
 }
@@ -753,9 +749,16 @@ async function fetchDataTenure() {
 }
 
 /** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
-onMounted(() => {
-  fetchListSalary();
-  empType.value === "" && fetchDataTenure();
+onMounted(async () => {
+  try {
+    showLoader();
+    await Promise.all([
+      fetchListSalary(),
+      empType.value === "" ? fetchDataTenure() : Promise.resolve(),
+    ]);
+  } finally {
+    hideLoader();
+  }
 });
 </script>
 

From 74fa0f664c80095697735c2f307cfb385df1bf4d Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 10:51:25 +0700
Subject: [PATCH 13/18] posDate

---
 .../21_report/views/02_reportRegistry.vue     | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index 634b800b1..c0b26a989 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -34,7 +34,8 @@ const storeReport = useReportStore();
 const stroeRegistry = useRegistryNewDataStore();
 const { fetchStructureTree } = useStructureTree();
 const mixin = useCounterMixin();
-const { messageError, showLoader, hideLoader, date2Thai } = mixin;
+const { messageError, showLoader, hideLoader, date2Thai, formatDatePosition } =
+  mixin;
 
 const loadingBtn = ref<boolean>(false);
 const total = ref<number>(0);
@@ -121,8 +122,8 @@ const visibleColumnsBase = ref<string[]>([
   "dateAppoint",
   "dateRetireLaw",
   "age",
-  "currentPosition",
-  "lengthPosition",
+  "positionDate",
+  "levelDate",
 ]);
 
 const columns = computed<QTableProps["columns"]>(() => {
@@ -289,22 +290,22 @@ const columns = computed<QTableProps["columns"]>(() => {
         a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
     {
-      name: "currentPosition",
+      name: "positionDate",
       align: "left",
       label: "ระยะเวลาดำรงตำแหน่งปัจจุบัน",
       sortable: true,
-      field: "currentPosition",
+      field: "positionDate",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
       sort: (a: string, b: string) =>
         a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
     },
     {
-      name: "lengthPosition",
+      name: "levelDate",
       align: "left",
       label: "ระยะเวลาดำรงตำแหน่งในระดับปัจจุบัน",
       sortable: true,
-      field: "lengthPosition",
+      field: "levelDate",
       headerStyle: "font-size: 14px",
       style: "font-size: 14px",
       sort: (a: string, b: string) =>
@@ -553,8 +554,18 @@ async function onSearch() {
         education: item.degree ?? "-",
         dateAppoint: item.dateAppoint ?? "-",
         age: item.age ?? "-",
-        currentPosition: item.currentPosition ?? "-",
-        lengthPosition: item.lengthPosition ?? "-",
+        positionDate:
+          formatDatePosition(
+            item.positionDate?.Years,
+            item.positionDate?.Months,
+            item.positionDate?.Days
+          ) ?? "-",
+        levelDate:
+          formatDatePosition(
+            item.levelDate?.posExecutiveYears,
+            item.levelDate?.posExecutiveMonths,
+            item.levelDate?.posExecutiveDays
+          ) ?? "-",
         empType: employeeClass.value,
         dateRetireLaw: item.dateRetireLaw ?? "-",
       }));

From e8c830454a20605957ffd1b80c61282b74b0c146 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 14:50:11 +0700
Subject: [PATCH 14/18] fix fetch StructrueTree

---
 .../04_registryPerson/views/listView.vue      | 22 ++++++--
 .../21_report/views/02_reportRegistry.vue     | 51 ++++++++++++++-----
 src/stores/structureTree.ts                   |  3 ++
 3 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue
index b53f6ff4b..9909e3287 100644
--- a/src/modules/04_registryPerson/views/listView.vue
+++ b/src/modules/04_registryPerson/views/listView.vue
@@ -13,7 +13,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useCounterMixin } from "@/stores/mixin";
-import { useRoute } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import avatar from "@/assets/avatar_user.jpg";
 import { useStructureTree } from "@/stores/structureTree";
 
@@ -40,6 +40,7 @@ const store = useRegistryNewDataStore();
 const { fetchStructureTree } = useStructureTree();
 const { showLoader, hideLoader, messageError } = useCounterMixin();
 const route = useRoute();
+const router = useRouter();
 
 const empType = ref<string>("officer"); // officer / employee / perm
 const dataPersonMain = ref<DataPerson[]>([]); //ข้อมูลรายการที่ค้นหาข้อมูลทะเบียนประวัติ
@@ -391,6 +392,10 @@ function getSearch() {
   fetchDataPerson();
 }
 
+function goToAdvancedSearch() {
+  router.push("/report/registry");
+}
+
 /** hook เมื่อมีการเรียกใช้ Components*/
 onMounted(async () => {
   await Promise.all([selectType(), fetchTree()]);
@@ -596,12 +601,23 @@ onMounted(async () => {
 
             <q-space />
             <div class="q-pt-sm q-pr-sm">
-              <a href="/report/registry" class="text-white">
+              <!-- <a href="/report/registry" class="text-white">
                 การค้นหาขั้นสูง
                 <q-tooltip
                   >ไปยังหน้าการค้นหาขั้นสูง (Advanced search)</q-tooltip
                 >
-              </a>
+              </a> -->
+              <q-btn
+                flat
+                @click="goToAdvancedSearch"
+                class="text-white"
+                style="text-decoration: underline"
+                label="การค้นหาขั้นสูง"
+              >
+                <q-tooltip
+                  >ไปยังหน้าการค้นหาขั้นสูง (Advanced search)</q-tooltip
+                >
+              </q-btn>
             </div>
 
             <q-separator
diff --git a/src/modules/21_report/views/02_reportRegistry.vue b/src/modules/21_report/views/02_reportRegistry.vue
index c0b26a989..566ca13b7 100644
--- a/src/modules/21_report/views/02_reportRegistry.vue
+++ b/src/modules/21_report/views/02_reportRegistry.vue
@@ -11,6 +11,7 @@ import { useCounterMixin } from "@/stores/mixin";
 import { useReportStore } from "@/modules/21_report/store";
 import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
 import { useStructureTree } from "@/stores/structureTree";
+import { useMenuDataStore } from "@/stores/menuList";
 
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 import type {
@@ -27,15 +28,18 @@ import type { DataStructureTree } from "@/interface/main";
 
 import DialogOrg from "@/modules/21_report/components/01_org/DialogOrg.vue";
 import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
+import LoadView from "@/components/LoadView.vue";
 
 const $q = useQuasar();
 const route = useRoute();
 const storeReport = useReportStore();
 const stroeRegistry = useRegistryNewDataStore();
 const { fetchStructureTree } = useStructureTree();
-const mixin = useCounterMixin();
+
+const storeMenu = useMenuDataStore();
+
 const { messageError, showLoader, hideLoader, date2Thai, formatDatePosition } =
-  mixin;
+  useCounterMixin();
 
 const loadingBtn = ref<boolean>(false);
 const total = ref<number>(0);
@@ -325,6 +329,7 @@ const rangeTerm = ref<RangeAge>({
   min: 0,
   max: 20,
 });
+const isLoadStructureTree = ref<boolean>(true);
 
 function onOpenOrg() {
   modalOrg.value = true;
@@ -660,21 +665,27 @@ const expandedModal = ref<boolean>(false);
 
 async function fetchTree() {
   try {
-    const res = await http.get(config.API.orgPermissionsSys);
-    const response = res.data.result.roles;
+    if (storeMenu.permissions) {
+      isLoadStructureTree.value = true;
+      const response = storeMenu.permissions.roles ?? [];
 
-    const sysName = response.find(
-      (e: DataRoles) =>
-        e.authSysId === "SYS_REGISTRY_OFFICER" ||
-        e.authSysId === "REPORT_REGISTRY"
-    )?.authSysId;
+      const sysName = response
+        ?.find(
+          (e: DataRoles) =>
+            e.authSysId === "SYS_REGISTRY_OFFICER" ||
+            e.authSysId === "REPORT_REGISTRY"
+        )
+        ?.authSysId.toString();
 
-    const data = await fetchStructureTree(sysName ?? "REPORT_REGISTRY", true);
-    if (data) {
-      node.value = data;
+      const data = await fetchStructureTree(sysName ?? "REPORT_REGISTRY");
+      if (data) {
+        node.value = data;
+      }
     }
   } catch (err) {
     messageError($q, err);
+  } finally {
+    isLoadStructureTree.value = false;
   }
 }
 
@@ -712,7 +723,7 @@ onMounted(async () => {
     getOptions(),
     getExecutive(),
     getDataPerson(),
-    getEducationLevel(),
+    // getEducationLevel(),
     fetchTree(),
   ])
 
@@ -726,6 +737,15 @@ onMounted(async () => {
       }, 500);
     });
 });
+
+watch(
+  () => storeMenu.permissions,
+  () => {
+    if (storeMenu.permissions) {
+      fetchTree();
+    }
+  }
+);
 </script>
 
 <template>
@@ -896,7 +916,10 @@ onMounted(async () => {
                         </template>
                         <q-separator />
 
-                        <q-card-section>
+                        <q-card-section v-if="isLoadStructureTree">
+                          <LoadView />
+                        </q-card-section>
+                        <q-card-section v-else>
                           <q-input
                             dense
                             outlined
diff --git a/src/stores/structureTree.ts b/src/stores/structureTree.ts
index 1de8bf225..bd81098a4 100644
--- a/src/stores/structureTree.ts
+++ b/src/stores/structureTree.ts
@@ -28,6 +28,9 @@ export const useStructureTree = defineStore("structureTree", () => {
    * @returns ข้อมูลโครงสร้าง
    */
   async function fetchStructureTree(sysKey: string, isLoad: boolean = false) {
+    console.log(sysKey);
+    console.log(dataStore.value);
+
     if (dataStore.value[sysKey]) {
       return dataStore.value[sysKey] || [];
     } else {

From 6ae4dcd7bf2067247b4955f71df0f6fa168809fe Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 16:58:03 +0700
Subject: [PATCH 15/18] fix formatDatePosition

---
 src/stores/mixin.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/stores/mixin.ts b/src/stores/mixin.ts
index ccba40ca0..fd4adacb9 100644
--- a/src/stores/mixin.ts
+++ b/src/stores/mixin.ts
@@ -1155,9 +1155,9 @@ export const useCounterMixin = defineStore("mixin", () => {
     const d = parseInt(day);
 
     const parts = [];
-    if (y > 0) parts.push(`${y}ปี`);
-    if (m > 0) parts.push(`${m}เดือน`);
-    if (d > 0) parts.push(`${d}วัน`);
+    if (y > 0) parts.push(`${y} ปี`);
+    if (m > 0) parts.push(`${m} เดือน`);
+    if (d > 0) parts.push(`${d} วัน`);
 
     return parts.length > 0 ? parts.join(" ") : ""; // กรณีที่ทั้งหมดเป็น 0
   }

From 13110b71f4f19d34f0c52b8580c32e42c2e69a14 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 28 Feb 2025 17:27:47 +0700
Subject: [PATCH 16/18] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B0=E0=B8=A2?=
 =?UTF-8?q?=E0=B8=B0=E0=B9=80=E0=B8=A7=E0=B8=A5=E0=B8=B2=E0=B8=94=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?=
 =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9A=E0=B8=A3=E0=B8=B4=E0=B8=AB=E0=B8=B2=E0=B8=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/GovernmentInformation/07_Position.vue   | 14 +++++++++++---
 src/modules/21_report/components/CardPosition.vue  | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

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 f250c2cbb..6d4aebb50 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -728,19 +728,27 @@ async function fetchDataTenure() {
     .then((res) => {
       const data = res.data.result;
       if (data) {
+        // map ข้อมูลระยะเวลาดำรงตำแหน่ง
         const formatData = (list: any) =>
           list.map((e: any) => ({
             name: e.name ?? "",
             time: formatDatePosition(e.year, e.month, e.day),
           }));
 
-        const position = formatData(data.position);
-        const posLevel = formatData(data.posLevel);
-        const posExecutive = formatData(data.posExecutive);
+        // แปลงข้อมูลจาก data
+        const position = formatData(data.position); //ระยะเวลาดำรงตำแหน่งในสายงาน
+        const posLevel = formatData(data.posLevel); //ระยะเวลาดำรงตำแหน่งตามระดับ
+        const posExecutive = formatData(data.posExecutive); //ระยะเวลาดำรงตำแหน่งทางการบริหาร
 
+        // นำข้อมูลไปใส่ใน cardData
         cardData.value[0].data = position;
         cardData.value[1].data = posLevel;
         cardData.value[2].data = posExecutive;
+
+        //เช็คค่า ระยะเวลาดำรงตำแหน่งทางการบริหาร ถ้าไม่มีให้ลบออกจาก cardData
+        if (posExecutive.length === 0) {
+          cardData.value.splice(2, 2);
+        }
       }
     })
     .catch((err) => {
diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue
index 2e6e783f2..8954a94ad 100644
--- a/src/modules/21_report/components/CardPosition.vue
+++ b/src/modules/21_report/components/CardPosition.vue
@@ -46,19 +46,27 @@ async function fetchDataTenure() {
       .then((res) => {
         const data = res.data.result;
         if (data) {
+          // map ข้อมูลระยะเวลาดำรงตำแหน่ง
           const formatData = (list: any) =>
             list.map((e: any) => ({
               name: e.name ?? "",
               time: formatDatePosition(e.year, e.month, e.day),
             }));
 
+          // แปลงข้อมูลจาก data
           const position = formatData(data.position);
           const posLevel = formatData(data.posLevel);
           const posExecutive = formatData(data.posExecutive);
 
-          cardData.value[0].data = position;
-          cardData.value[1].data = posLevel;
-          cardData.value[2].data = posExecutive;
+          // นำข้อมูลไปใส่ใน cardData
+          cardData.value[0].data = position; //ระยะเวลาดำรงตำแหน่งในสายงาน
+          cardData.value[1].data = posLevel; //ระยะเวลาดำรงตำแหน่งตามระดับ
+          cardData.value[2].data = posExecutive; //ระยะเวลาดำรงตำแหน่งทางการบริหาร
+
+          //เช็คค่า ระยะเวลาดำรงตำแหน่งทางการบริหาร ถ้าไม่มีให้ลบออกจาก cardData
+          if (posExecutive.length === 0) {
+            cardData.value.splice(2, 2);
+          }
         }
       })
       .catch((err) => {

From d7a450479cee94e303f74581cbc0e3fb186e5988 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 3 Mar 2025 14:41:49 +0700
Subject: [PATCH 17/18] fix loadDashbord

---
 src/views/DashboardAll.vue | 44 ++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/src/views/DashboardAll.vue b/src/views/DashboardAll.vue
index f75570989..c8b0ced91 100644
--- a/src/views/DashboardAll.vue
+++ b/src/views/DashboardAll.vue
@@ -1,25 +1,47 @@
 <script setup lang="ts">
-import { ref, onMounted } from "vue";
+import { ref, onMounted, watch } from "vue";
+import { useQuasar } from "quasar";
+
 import { useRoute } from "vue-router";
 import { useMenuDataStore } from "@/stores/menuList";
+import { useCounterMixin } from "@/stores/mixin";
+import http from "@/plugins/http";
+import config from "@/app.config";
 import env from "@/api/index";
+
 import type { ListMenu } from "@/interface/response/main";
 
-const storeMenu = useMenuDataStore();
+const $q = useQuasar();
 const route = useRoute();
+const storeMenu = useMenuDataStore();
+const { messageError } = useCounterMixin();
+
 const panelUrl = ref<string>("");
 const title = ref<string>("");
 
-onMounted(async () => {
-  const menuDashboard = await storeMenu.menuList.find(
-    (x: ListMenu) => x.id === "DASHBOARD"
-  );
+/** function fetch รายการเมนูทั้งหมด*/
+async function fetchSys() {
+  if (storeMenu.menuList.length !== 0) {
+    const menuDashboard = await storeMenu.menuList.find(
+      (x: ListMenu) => x.id === "DASHBOARD"
+    );
 
-  const data = await menuDashboard?.children?.find(
-    (item: ListMenu) => item.path === route.name
-  );
-  title.value = `สถิติ${data?.sysName}`;
-  panelUrl.value = `${env.DASHBOARD_URL}/d/${data?.sysDescription}`;
+    const data = await menuDashboard?.children?.find(
+      (item: ListMenu) => item.path === route.name
+    );
+    title.value = `สถิติ${data?.sysName}`;
+    panelUrl.value = `${env.DASHBOARD_URL}/d/${data?.sysDescription}`;
+  }
+}
+watch(
+  () => storeMenu.menuList,
+  () => {
+    fetchSys();
+  }
+);
+
+onMounted(() => {
+  fetchSys();
 });
 </script>
 

From d1e6c3a1cb98e8bdb7b84fa661563189966cea5a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Mon, 3 Mar 2025 15:07:18 +0700
Subject: [PATCH 18/18] =?UTF-8?q?interface=20=E0=B8=95=E0=B8=B3=E0=B9=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/GovernmentInformation/07_Position.vue     |  7 +++----
 .../04_registryPerson/interface/index/government.ts  | 12 +++++++++++-
 src/modules/21_report/components/CardPosition.vue    |  6 ++++--
 3 files changed, 18 insertions(+), 7 deletions(-)

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 6d4aebb50..d8b8d7b85 100644
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@@ -18,6 +18,7 @@ import type {
   ResListSalary,
   ResType,
 } from "@/modules/04_registryPerson/interface/response/Salary";
+import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government";
 
 import DialogHeader from "@/components/DialogHeader.vue";
 import DialogHistory from "@/modules/04_registryPerson/components/detail/GovernmentInformation/07_PositionHistory.vue";
@@ -290,7 +291,7 @@ const posExecutiveOptionMain = ref<DataOption[]>([]);
 
 const docOption = ref<DataOption2[]>(store.optionTemplateDoc);
 
-const cardData = ref<any[]>([
+const cardData = ref<DataCardPos[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
     data: [],
@@ -779,9 +780,7 @@ onMounted(async () => {
         </div>
         <div class="col-12"><q-separator /></div>
         <q-card-section class="q-pt-none" style="min-height: 200px">
-          <li v-for="data in item.data" :key="data.id">
-            {{ data.name }} {{ data.time }}
-          </li>
+          <li v-for="data in item.data">{{ data.name }} {{ data.time }}</li>
         </q-card-section>
       </q-card>
     </div>
diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts
index 5d71032b5..26a0ea930 100644
--- a/src/modules/04_registryPerson/interface/index/government.ts
+++ b/src/modules/04_registryPerson/interface/index/government.ts
@@ -47,4 +47,14 @@ interface RequestItemsHistoryObject {
   createdFullName: string | null;
   createdAt: Date;
 }
-export type { RequestItemsHistoryObject, FormMain };
+
+interface DataCardPos {
+  label: string;
+  data?: Data[];
+}
+
+interface Data {
+  name: string;
+  time: string;
+}
+export type { RequestItemsHistoryObject, FormMain, DataCardPos };
diff --git a/src/modules/21_report/components/CardPosition.vue b/src/modules/21_report/components/CardPosition.vue
index 8954a94ad..3888464fc 100644
--- a/src/modules/21_report/components/CardPosition.vue
+++ b/src/modules/21_report/components/CardPosition.vue
@@ -6,6 +6,8 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
+import type { DataCardPos } from "@/modules/04_registryPerson/interface/index/government";
+
 const $q = useQuasar();
 const { messageError, formatDatePosition } = useCounterMixin();
 
@@ -19,7 +21,7 @@ const props = defineProps({
   type: { type: String, default: "" },
 });
 
-const cardData = ref<any[]>([
+const cardData = ref<DataCardPos[]>([
   {
     label: "ระยะเวลาดำรงตำแหน่งในสายงาน",
     data: [],
@@ -93,7 +95,7 @@ onMounted(() => {
             <q-item-section>
               <q-item-label class="text-grey-6">{{ item.label }}</q-item-label>
               <q-item-label
-                ><li v-for="data in item.data" :key="data.id">
+                ><li v-for="data in item.data">
                   {{ data.name }} {{ data.time }}
                 </li>
               </q-item-label>