From da304aed7d020b6ad6d9f09d99bda35eed201a05 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 9 Jan 2024 11:14:54 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=20=E0=B8=9B=E0=B8=B5=E0=B8=87?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A1=E0=B8=B2=E0=B8=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../11_discipline/interface/response/result.ts      |  1 +
 src/modules/11_discipline/store/ResultStore.ts      | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/modules/11_discipline/interface/response/result.ts b/src/modules/11_discipline/interface/response/result.ts
index 602ce1c59..cec07e516 100644
--- a/src/modules/11_discipline/interface/response/result.ts
+++ b/src/modules/11_discipline/interface/response/result.ts
@@ -9,6 +9,7 @@ interface DataResult {
   resultDisciplineType: string; //สถานะ
   resultTitleType: string; //สถานะ
   resultOc: string; //สถานะ
+  resultYear: 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 284a8a572..8bace4140 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -50,6 +50,7 @@ export const useDisciplineResultStore = defineStore(
       "resultDisciplineType",
       "resultTitleType",
       "resultOc",
+      "resultYear",
       "status",
     ]);
 
@@ -152,6 +153,15 @@ export const useDisciplineResultStore = defineStore(
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
+      {
+        name: "resultYear",
+        align: "left",
+        label: "ปีงบประมาณ",
+        sortable: true,
+        field: "resultYear",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
       {
         name: "status",
         align: "left",
@@ -270,7 +280,8 @@ export const useDisciplineResultStore = defineStore(
         createdAt: e.createdAt && date2Thai(e.createdAt),
         resultDisciplineType: e.resultDisciplineType ? e.resultDisciplineType : '-',
         resultTitleType: e.resultTitleType ? e.resultTitleType : '-',
-        resultOc: e.resultOc ? e.resultOc : '-'
+        resultOc: e.resultOc ? e.resultOc : '-',
+        resultYear: e.resultYear ? e.resultYear + 543 : '-',
       }));
       rows.value = datalist;
     }