diff --git a/src/modules/11_discipline/interface/response/result.ts b/src/modules/11_discipline/interface/response/result.ts index 602ce1c59..cec07e516 100644 --- a/src/modules/11_discipline/interface/response/result.ts +++ b/src/modules/11_discipline/interface/response/result.ts @@ -9,6 +9,7 @@ interface DataResult { resultDisciplineType: string; //สถานะ resultTitleType: string; //สถานะ resultOc: string; //สถานะ + resultYear: 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 284a8a572..8bace4140 100644 --- a/src/modules/11_discipline/store/ResultStore.ts +++ b/src/modules/11_discipline/store/ResultStore.ts @@ -50,6 +50,7 @@ export const useDisciplineResultStore = defineStore( "resultDisciplineType", "resultTitleType", "resultOc", + "resultYear", "status", ]); @@ -152,6 +153,15 @@ export const useDisciplineResultStore = defineStore( headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "resultYear", + align: "left", + label: "ปีงบประมาณ", + sortable: true, + field: "resultYear", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "status", align: "left", @@ -270,7 +280,8 @@ export const useDisciplineResultStore = defineStore( createdAt: e.createdAt && date2Thai(e.createdAt), resultDisciplineType: e.resultDisciplineType ? e.resultDisciplineType : '-', resultTitleType: e.resultTitleType ? e.resultTitleType : '-', - resultOc: e.resultOc ? e.resultOc : '-' + resultOc: e.resultOc ? e.resultOc : '-', + resultYear: e.resultYear ? e.resultYear + 543 : '-', })); rows.value = datalist; }