Merge branch 'nice' into develop

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) => {

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",

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") {