From ccbc870decbb9cf7176e7417764cfd81711776b8 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Mon, 6 Nov 2023 17:54:35 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=AA?= =?UTF-8?q?=E0=B8=B7=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B9=80=E0=B8=97=E0=B9=87=E0=B8=88=E0=B8=88=E0=B8=A3?= =?UTF-8?q?=E0=B8=B4=E0=B8=87=20=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=94?= =?UTF-8?q?=E0=B8=B6=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9?= =?UTF-8?q?=E0=B8=A5=E0=B9=80=E0=B9=80=E0=B8=A5=E0=B9=89=E0=B8=A7=E0=B9=80?= =?UTF-8?q?=E0=B8=9B=E0=B9=87=E0=B8=99=20value=20=E0=B9=81=E0=B8=97?= =?UTF-8?q?=E0=B8=99=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../11_discipline/store/InvestigateFactStore.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/modules/11_discipline/store/InvestigateFactStore.ts b/src/modules/11_discipline/store/InvestigateFactStore.ts index 7974497dc..931f5efdb 100644 --- a/src/modules/11_discipline/store/InvestigateFactStore.ts +++ b/src/modules/11_discipline/store/InvestigateFactStore.ts @@ -5,9 +5,7 @@ import type { investigatefactsDataRowType, DataOption } from '@/modules/11_disci export const useInvestigateFactStore = defineStore("DisciplineInvestigateFact", () => { const rows = ref([]) - const faultOp = ref(); - const daysExtendOp = ref(); - const investigationOp = ref(); + const daysExtendOps = ref([ { id: "000", name: "15 วัน" }, { id: "001", name: "30 วัน" }, @@ -24,6 +22,9 @@ export const useInvestigateFactStore = defineStore("DisciplineInvestigateFact", { id: "002", name: "ไม่ร้ายเเรง" }, { id: "003", name: "ร้ายเเรง" }, ]); + const daysExtendOp = ref(daysExtendOps.value); + const investigationOp = ref(investigationOps.value); + const faultOp = ref(faultOps.value); const visibleColumns = ref([ "no", "subject", @@ -108,12 +109,12 @@ export const useInvestigateFactStore = defineStore("DisciplineInvestigateFact", function fecthList(data: investigatefactsDataRowType[]) { let datalist: investigatefactsDataRowType[] = data.map((e: investigatefactsDataRowType) => { return { - id:e.id, + id: e.id, subject: e.subject, interrogated: e.interrogated, - fault: e.fault ? convertFault(e.fault):'-', - status: e.status ? convertSatatus(e.status):'-', - active: e.active ? activeStatus(e.active):'-' + fault: e.fault ? convertFault(e.fault) : '-', + status: e.status ? convertSatatus(e.status) : '-', + active: e.active ? activeStatus(e.active) : '-' }; }); rows.value = datalist;