From 959b023e056987b70491c8bd4177f21001e57658 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 1 Dec 2023 17:57:18 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=AA=E0=B8=96?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../11_discipline/store/InvestigateDisStore.ts |  2 +-
 src/modules/11_discipline/store/ResultStore.ts | 18 +++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index 8c31b22ec..49d327240 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -59,7 +59,7 @@ export const useInvestigateDisStore = defineStore(
     const statusOps = ref<DataOption[]>([
       { id: "NEW", name: "กำลังสอบสวน" },
       { id: "STOP", name: "ยุติเรื่อง" },
-      { id: "DONE", name: "ส่งไปสรุปผลการพิจารณา" },
+      { id: "DONE", name: "ส่งไปสรุปผลการพิจารณาแล้ว" },
     ]);
 
     const causeTextOptions = ref<DataOption[]>([
diff --git a/src/modules/11_discipline/store/ResultStore.ts b/src/modules/11_discipline/store/ResultStore.ts
index 5a8762b44..a4f74f377 100644
--- a/src/modules/11_discipline/store/ResultStore.ts
+++ b/src/modules/11_discipline/store/ResultStore.ts
@@ -2,7 +2,6 @@ import { defineStore } from "pinia";
 import { ref } from "vue";
 import type { QTableProps } from "quasar";
 import type {
-  investigateDisDataRowType,
   DataOption,
   directorType,
 } from "@/modules/11_discipline/interface/index/Main";
@@ -56,14 +55,23 @@ export const useDisciplineResultStore = defineStore(
         disciplinaryCaseFault: e.disciplinaryCaseFault
           ? e.disciplinaryCaseFault
           : "-",
-        status: e.status && storeMain.convertStatus(e.status),
+        status: e.status && convertStatus(e.status),
         createdAt: e.createdAt && date2Thai(e.createdAt),
       }));
       rows.value = datalist;
     }
 
-    
-
+    /** function สถานะ*/
+    function convertStatus(val: string) {
+      switch (val) {
+        case "NEW":
+          return "กำลังสรุปผลการพิจารณา";
+        case "STOP":
+          return "ยุติเรื่อง";
+        case "DONE":
+          return "เสร็จสิ้น";
+      }
+    }
 
     const visibleColumns = ref<String[]>([
       "no",
@@ -243,7 +251,7 @@ export const useDisciplineResultStore = defineStore(
       visibleColumnsDirector,
       columnsDirector,
       complainantoptions,
-      filterSelector
+      filterSelector,
     };
   }
 );