From 13785b5f85e137024a632746fca1e591b6d42dd8 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 22 Mar 2024 09:32:23 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80=E0=B8=94=E0=B8=B7?=
 =?UTF-8?q?=E0=B8=AD=E0=B8=99=E0=B8=82=E0=B9=89=E0=B8=B2=E0=B8=A3=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AF=20=3D>=20?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B2=E0=B8=A7=E0=B9=82=E0=B8=AB=E0=B8=A5=E0=B8=94?=
 =?UTF-8?q?=20=E0=B9=81=E0=B8=9A=E0=B8=9A=203=20=E0=B8=81=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/13_salary/components/SalaryLists/TabMain.vue | 6 +++---
 src/modules/13_salary/store/SalaryListsStore.ts          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue
index 28b8eb96c..4f2d8d190 100644
--- a/src/modules/13_salary/components/SalaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue
@@ -310,15 +310,15 @@ function fetchDataPeriodNew() {
 
 function onClickDownload(data: DataOption) {
   showLoader();
-  if (data.id === "gov-06") {
+  if (data.id === "go1" || data.id === "go2") {
     const formData = {
       type: "HAFT",
       startDate:
-        props?.roundFilter?.shortCode === "APR"
+        data.id === "go1"
           ? `${props?.roundFilter?.year - 1}-10-01`
           : `${props?.roundFilter?.year}-04-01`,
       endDate:
-        props?.roundFilter?.shortCode === "APR"
+        data.id === "go1"
           ? `${props?.roundFilter?.year}-03-31`
           : `${props?.roundFilter?.year}-09-30`,
     };
diff --git a/src/modules/13_salary/store/SalaryListsStore.ts b/src/modules/13_salary/store/SalaryListsStore.ts
index 37b84124c..51bb461db 100644
--- a/src/modules/13_salary/store/SalaryListsStore.ts
+++ b/src/modules/13_salary/store/SalaryListsStore.ts
@@ -82,7 +82,7 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => {
       name: "แบบ 2 กท รอบเมษายน",
     },
     {
-      id: "gov-06",
+      id: "go1",
       name: "แบบ 3 กท บัญชีแสดงวันลาครึ่งปี ขรก.",
     },
     {
@@ -118,7 +118,7 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => {
       name: "แบบ 2 กท รอบตุลาคม",
     },
     {
-      id: "gov-06",
+      id: "go2",
       name: "แบบ 3 กท บัญชีแสดงวันลาครึ่งปี ขรก. ",
     },
     {