From db072c8ba5a75d79222c41582777aaa44220c678 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Fri, 15 Dec 2023 17:54:28 +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=B8=AA=E0=B8=A3=E0=B8=B8=E0=B8=9B=E0=B8=9C=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9E=E0=B8=B4=E0=B8=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=93=E0=B8=B2=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2=20=E0=B9=80=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9F=E0=B8=B4=E0=B8=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/4_Result/Form.vue              |  3 +-
 .../11_discipline/interface/request/result.ts |  2 +-
 .../interface/response/result.ts              |  3 ++
 .../11_discipline/store/ResultStore.ts        | 33 +++++++++++++++++++
 4 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/Form.vue b/src/modules/11_discipline/components/4_Result/Form.vue
index 8735a1f63..548aed247 100644
--- a/src/modules/11_discipline/components/4_Result/Form.vue
+++ b/src/modules/11_discipline/components/4_Result/Form.vue
@@ -69,7 +69,7 @@ const formData = reactive<FormData>({
   titleType: "",
   oc: "",
   file: null,
-  disciplineComplaint_Appeal_Docs: [ArrayFile],
+  disciplineComplaint_Appeal_Docs: [],
   year: new Date().getFullYear(),
 });
 
@@ -577,7 +577,6 @@ onMounted(async () => {});
             >
           </div>
         </div>
-
         <div
           v-if="formData.disciplineComplaint_Appeal_Docs.length > 0"
           class="col-xs-12 q-pa-sm row"
diff --git a/src/modules/11_discipline/interface/request/result.ts b/src/modules/11_discipline/interface/request/result.ts
index c1a8702ca..e9022e2c6 100644
--- a/src/modules/11_discipline/interface/request/result.ts
+++ b/src/modules/11_discipline/interface/request/result.ts
@@ -4,7 +4,7 @@ interface FormData {
   titleType: string;
   oc: string;
   file: any
-  disciplineComplaint_Appeal_Docs: [FileArray]
+  disciplineComplaint_Appeal_Docs: any
   year: number | null;
 }
 
diff --git a/src/modules/11_discipline/interface/response/result.ts b/src/modules/11_discipline/interface/response/result.ts
index 2d0c54fc6..8f16e370e 100644
--- a/src/modules/11_discipline/interface/response/result.ts
+++ b/src/modules/11_discipline/interface/response/result.ts
@@ -6,6 +6,9 @@ interface DataResult {
   disciplinaryFaultLevel: string; //ระดับโทษความผิด
   disciplinaryCaseFault: string; //กรณีความผิด
   status: string; //สถานะ
+  disciplineType: string; //สถานะ
+  titleType: string; //สถานะ
+  oc: 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 9b5343e87..53e0be2c4 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -57,6 +57,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:'-' 
       }));
       rows.value = datalist;
     }
@@ -83,6 +86,9 @@ export const useDisciplineResultStore = defineStore(
       "disciplinaryFaultLevel",
       "disciplinaryCaseFault",
       "createdAt",
+      "disciplineType",
+      "titleType",
+      "oc",
       "status",
     ]);
 
@@ -158,6 +164,33 @@ export const useDisciplineResultStore = defineStore(
         headerStyle: "font-size: 14px",
         style: "font-size: 14px",
       },
+      {
+        name: "disciplineType",
+        align: "left",
+        label: "ประเภทวินัย",
+        sortable: true,
+        field: "disciplineType",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "titleType",
+        align: "left",
+        label: "ประเภทของเรื่อง",
+        sortable: true,
+        field: "titleType",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
+      {
+        name: "oc",
+        align: "left",
+        label: "หน่วยงาน/ส่วนราชการ",
+        sortable: true,
+        field: "oc",
+        headerStyle: "font-size: 14px",
+        style: "font-size: 14px",
+      },
       {
         name: "status",
         align: "left",