From beb25356603f88142fd891701007c8b1e853f79f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Jun 2025 16:54:45 +0700
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=20revisionId=20=3D=3D>=20=20?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/21_report/views/05_reportSalary.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/21_report/views/05_reportSalary.vue b/src/modules/21_report/views/05_reportSalary.vue
index 197a0694c..6f2c8b4e2 100644
--- a/src/modules/21_report/views/05_reportSalary.vue
+++ b/src/modules/21_report/views/05_reportSalary.vue
@@ -98,6 +98,8 @@ async function fetchDataRound() {
         await fetchDataOrg(roundOptions.value[0].revisionId);
       } else {
         isRound.value = false;
+        round.value = "";
+        roundOptions.value = [];
       }
     })
     .catch((e) => {
@@ -176,6 +178,7 @@ async function fetchDataReportUnified(
           ? `${round.value?.year}-03-31`
           : `${round.value?.year}-09-30`,
       nodeId: nodeId.value,
+      revisionId: round.value?.revisionId,
     };
 
     if (reportCode === "go2-01") {

From 04e3bac01311492445d6df9aae33605ed859272a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 25 Jun 2025 17:14:39 +0700
Subject: [PATCH 2/2] =?UTF-8?q?fix=20report=20=3D=3D>=20=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=A5=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/04_salaryLists/TabMain.vue     |  6 +++++-
 .../13_salary/store/SalaryListsStore.ts       | 21 +++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/modules/13_salary/components/04_salaryLists/TabMain.vue b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
index 84836c688..b7484c922 100644
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@@ -364,7 +364,11 @@ function onClickDownload(data: DataOption, type: string = "xlsx") {
         data.id === "gov-08" ||
         data.id === "gov-10";
 
-      const finalUrl = isGovernmentId ? `${url}/${store.tabGroup}` : url;
+      const finalUrl = isGovernmentId
+        ? `${url}/${store.tabGroup} ${
+            data.id === "gov-04" ? `/${data.typeName}` : ""
+          }`
+        : url;
       http
         .get(finalUrl)
         .then(async (res) => {
diff --git a/src/modules/13_salary/store/SalaryListsStore.ts b/src/modules/13_salary/store/SalaryListsStore.ts
index c7491fe98..f2d82c345 100644
--- a/src/modules/13_salary/store/SalaryListsStore.ts
+++ b/src/modules/13_salary/store/SalaryListsStore.ts
@@ -75,7 +75,13 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => {
     },
     {
       id: "gov-04",
-      name: "แบบ 1 กท รอบเมษายน",
+      name: "แบบ 1 กท รอบเมษายน (0.5 ขั้น)",
+      typeName: "HAFT",
+    },
+    {
+      id: "gov-04",
+      name: "แบบ 1 กท รอบเมษายน (1 ขั้น)",
+      typeName: "FULL",
     },
     {
       id: "gov-05",
@@ -121,7 +127,18 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => {
     },
     {
       id: "gov-04",
-      name: "แบบ 1 กท รอบตุลาคม",
+      name: "แบบ 1 กท รอบตุลาคม (0.5 ขั้น)",
+      typeName: "HAFT",
+    },
+    {
+      id: "gov-04",
+      name: "แบบ 1 กท รอบตุลาคม (1 ขั้น)",
+      typeName: "FULL",
+    },
+    {
+      id: "gov-04",
+      name: "แบบ 1 กท รอบตุลาคม (1.5 ขั้น)",
+      typeName: "FULLHAFT",
     },
     {
       id: "gov-04-01",