From 27280c393f1227c759c96ac85f291029b286a488 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Thu, 2 Oct 2025 13:21:41 +0700
Subject: [PATCH] fix:add function calculateFiscalYear

---
 src/modules/05_leave/components/Table.vue    |  3 ++-
 src/modules/07_appealComplain/views/Main.vue |  3 ++-
 src/modules/08_KPI/store.ts                  |  3 ++-
 src/modules/08_KPI/views/main.vue            |  3 ++-
 src/utils/functions.ts                       | 10 ++++++++++
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 src/utils/functions.ts

diff --git a/src/modules/05_leave/components/Table.vue b/src/modules/05_leave/components/Table.vue
index 69c6ffb..5bc4ceb 100644
--- a/src/modules/05_leave/components/Table.vue
+++ b/src/modules/05_leave/components/Table.vue
@@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
 
 import type { PropsTable } from "@/interface/PropsTable";
 import { useLeaveStore } from "@/modules/05_leave/store";
+import { calculateFiscalYear } from "@/utils/functions";
 
 const $q = useQuasar();
 const attrs = ref<any>(useAttrs());
@@ -82,7 +83,7 @@ watch(
 );
 
 /** filter */
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const filter = ref<string>("");
 
 /** updateVisible*/
diff --git a/src/modules/07_appealComplain/views/Main.vue b/src/modules/07_appealComplain/views/Main.vue
index 68a1331..0122d96 100644
--- a/src/modules/07_appealComplain/views/Main.vue
+++ b/src/modules/07_appealComplain/views/Main.vue
@@ -9,6 +9,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useAppealComplainStore } from "@/modules/07_appealComplain/store";
+import { calculateFiscalYear } from "@/utils/functions";
 
 import type { PropsTable } from "@/interface/PropsTable";
 import type { FormType } from "@/modules/07_appealComplain/interface/response/mainType";
@@ -37,7 +38,7 @@ const pagination = ref<PropsTable.Pagination>({
 const formData = reactive<FormType>({
   type: "ALL",
   status: "ALL",
-  year: new Date().getFullYear(),
+  year: calculateFiscalYear(new Date()),
 });
 const visibleColumns = ref<string[]>([
   "no",
diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts
index 089a171..09f604d 100644
--- a/src/modules/08_KPI/store.ts
+++ b/src/modules/08_KPI/store.ts
@@ -3,12 +3,13 @@ import { ref, reactive } from "vue";
 import type { DataOptions } from "./interface/index/Main";
 import type { FormQuery } from "@/modules/08_KPI/interface/request/index";
 import type { DataProfile } from "@/interface/Main";
+import { calculateFiscalYear } from "@/utils/functions";
 
 export const useKpiDataStore = defineStore("KPIDate", () => {
   const mainRowData = ref<any>();
   const isUpdate = ref<boolean>(false);
   const tabMainevaluator = ref<string>("1");
-  const yearRound = ref<number>(new Date().getFullYear());
+  const yearRound = ref<number>(calculateFiscalYear(new Date()));
   const formQuery = reactive<FormQuery>({
     page: 1,
     pageSize: 10,
diff --git a/src/modules/08_KPI/views/main.vue b/src/modules/08_KPI/views/main.vue
index fd6b9ac..f3fb200 100644
--- a/src/modules/08_KPI/views/main.vue
+++ b/src/modules/08_KPI/views/main.vue
@@ -7,6 +7,7 @@ import config from "@/app.config";
 import http from "@/plugins/http";
 import { useCounterMixin } from "@/stores/mixin";
 import { useKpiDataStore } from "@/modules/08_KPI/store";
+import { calculateFiscalYear } from "@/utils/functions";
 
 import type { QTableProps } from "quasar";
 import type { DataProfile } from "@/interface/Main";
@@ -94,7 +95,7 @@ const columns = ref<QTableProps["columns"]>([
 ]);
 
 /** List*/
-const year = ref<number>(new Date().getFullYear());
+const year = ref<number>(calculateFiscalYear(new Date()));
 const round = ref<string>("");
 const roundMainOp = ref<DataOptions[]>([]);
 const roundDialgOp = ref<DataOptions[]>([]);
diff --git a/src/utils/functions.ts b/src/utils/functions.ts
new file mode 100644
index 0000000..837f83d
--- /dev/null
+++ b/src/utils/functions.ts
@@ -0,0 +1,10 @@
+/**
+ * คำนวณปีงบประมาณ
+ *
+ * @param date วันที่ปัจจุบัน
+ * @returns ปีงบประมาณ
+ */
+export function calculateFiscalYear(date: Date) {
+  const month = date.getMonth() + 1;
+  return month >= 10 ? date.getFullYear() + 1 : date.getFullYear();
+}