From 01b70ab7a0bdedf0d401d978a858cbfa85c96bfa Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 9 Jan 2024 12:56:30 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=A5=20fiscalYear?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/11_discipline/interface/response/result.ts | 2 +-
 src/modules/11_discipline/store/ResultStore.ts         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/11_discipline/interface/response/result.ts b/src/modules/11_discipline/interface/response/result.ts
index cec07e516..112d8de2a 100644
--- a/src/modules/11_discipline/interface/response/result.ts
+++ b/src/modules/11_discipline/interface/response/result.ts
@@ -9,7 +9,7 @@ interface DataResult {
   resultDisciplineType: string; //สถานะ
   resultTitleType: string; //สถานะ
   resultOc: string; //สถานะ
-  resultYear: string; //สถานะ
+  fiscalYear: string; //สถานะ
   createdAt: Date | null; //วันที่ส่งเรื่องสอบสวน
 }
 interface DataResultList {
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index 8bace4140..1891d087d 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -50,7 +50,7 @@ export const useDisciplineResultStore = defineStore(
       "resultDisciplineType",
       "resultTitleType",
       "resultOc",
-      "resultYear",
+      "fiscalYear",
       "status",
     ]);
 
@@ -154,11 +154,11 @@ export const useDisciplineResultStore = defineStore(
         style: "font-size: 14px",
       },
       {
-        name: "resultYear",
+        name: "fiscalYear",
         align: "left",
         label: "ปีงบประมาณ",
         sortable: true,
-        field: "resultYear",
+        field: "fiscalYear",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
@@ -281,7 +281,7 @@ export const useDisciplineResultStore = defineStore(
         resultDisciplineType: e.resultDisciplineType ? e.resultDisciplineType : '-',
         resultTitleType: e.resultTitleType ? e.resultTitleType : '-',
         resultOc: e.resultOc ? e.resultOc : '-',
-        resultYear: e.resultYear ? e.resultYear + 543 : '-',
+        fiscalYear: e.fiscalYear ? e.fiscalYear + 543 : '-',
       }));
       rows.value = datalist;
     }