From 386e1a9811dd9dd26c2e8e0ff2e6710bfb15c17e Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 5 Jan 2024 12:03:31 +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?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../interface/response/result.ts              |  6 ++---
 .../11_discipline/store/ResultStore.ts        | 24 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/modules/11_discipline/interface/response/result.ts b/src/modules/11_discipline/interface/response/result.ts
index 8f16e370e..602ce1c59 100644
--- a/src/modules/11_discipline/interface/response/result.ts
+++ b/src/modules/11_discipline/interface/response/result.ts
@@ -6,9 +6,9 @@ interface DataResult {
   disciplinaryFaultLevel: string; //ระดับโทษความผิด
   disciplinaryCaseFault: string; //กรณีความผิด
   status: string; //สถานะ
-  disciplineType: string; //สถานะ
-  titleType: string; //สถานะ
-  oc: string; //สถานะ
+  resultDisciplineType: string; //สถานะ
+  resultTitleType: string; //สถานะ
+  resultOc: 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 754af92bc..284a8a572 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -47,9 +47,9 @@ export const useDisciplineResultStore = defineStore(
       "disciplinaryFaultLevel",
       "disciplinaryCaseFault",
       "createdAt",
-      "disciplineType",
-      "titleType",
-      "oc",
+      "resultDisciplineType",
+      "resultTitleType",
+      "resultOc",
       "status",
     ]);
 
@@ -126,29 +126,29 @@ export const useDisciplineResultStore = defineStore(
         style: "font-size: 14px",
       },
       {
-        name: "disciplineType",
+        name: "resultDisciplineType",
         align: "left",
         label: "ประเภทวินัย",
         sortable: true,
-        field: "disciplineType",
+        field: "resultDisciplineType",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
       {
-        name: "titleType",
+        name: "resultTitleType",
         align: "left",
         label: "ประเภทของเรื่อง",
         sortable: true,
-        field: "titleType",
+        field: "resultTitleType",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
       {
-        name: "oc",
+        name: "resultOc",
         align: "left",
         label: "หน่วยงาน/ส่วนราชการ",
         sortable: true,
-        field: "oc",
+        field: "resultOc",
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
@@ -268,9 +268,9 @@ export const useDisciplineResultStore = defineStore(
           : "-",
         status: e.status && convertStatus(e.status),
         createdAt: e.createdAt && date2Thai(e.createdAt),
-        disciplineType: e.disciplineType ? e.disciplineType : '-',
-        titleType: e.titleType ? e.titleType : '-',
-        oc: e.oc ? e.oc : '-'
+        resultDisciplineType: e.resultDisciplineType ? e.resultDisciplineType : '-',
+        resultTitleType: e.resultTitleType ? e.resultTitleType : '-',
+        resultOc: e.resultOc ? e.resultOc : '-'
       }));
       rows.value = datalist;
     }