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([ { id: "NEW", name: "กำลังสอบสวน" }, { id: "STOP", name: "ยุติเรื่อง" }, - { id: "DONE", name: "ส่งไปสรุปผลการพิจารณา" }, + { id: "DONE", name: "ส่งไปสรุปผลการพิจารณาแล้ว" }, ]); const causeTextOptions = ref([ 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([ "no", @@ -243,7 +251,7 @@ export const useDisciplineResultStore = defineStore( visibleColumnsDirector, columnsDirector, complainantoptions, - filterSelector + filterSelector, }; } );