From 438aa09866c13f4de83f9bd9d3ce9a115250a3a0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 19 Feb 2025 17:39:45 +0700 Subject: [PATCH 1/3] filter dateAppoint --- .../components/TableView.vue | 43 +++++++++---------- .../interface/request/Main.ts | 2 + src/modules/04_registryPerson/store.ts | 4 +- .../04_registryPerson/views/listView.vue | 3 +- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/modules/04_registryPerson/components/TableView.vue b/src/modules/04_registryPerson/components/TableView.vue index b61860dcf..b7c7d91aa 100644 --- a/src/modules/04_registryPerson/components/TableView.vue +++ b/src/modules/04_registryPerson/components/TableView.vue @@ -23,7 +23,7 @@ import DialogHeader from "@/components/DialogHeader.vue"; const $q = useQuasar(); const mixin = useCounterMixin(); -const { messageError } = mixin; +const { messageError, date2Thai } = mixin; const store = useRegistryNewDataStore(); const router = useRouter(); @@ -60,62 +60,52 @@ const columns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "fullName", align: "left", label: "ชื่อ-นามสกุล", - sortable: true, + sortable: false, field: "fullName", headerStyle: "font-size: 14px; min-width: 200px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "posNo", align: "left", label: "ตำแหน่งเลขที่", - sortable: true, + sortable: false, field: "posNo", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "position", align: "left", label: "ตำแหน่งในสายงาน", - sortable: true, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "posPath", align: "left", label: "ตำแหน่งประเภท", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "posLevel", align: "left", label: "ระดับ", - sortable: true, + sortable: false, field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -124,19 +114,27 @@ const columns = ref([ ? row.posTypeShortName + " " + row.posLevel : row.posLevel; }, - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { name: "org", align: "left", label: "สังกัด", - sortable: true, + sortable: false, field: "org", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + }, + { + name: "dateAppoint", + align: "left", + label: "วันที่บรรจุ", + sortable: false, + field: "dateAppoint", + headerStyle: "font-size: 14px", + format(val, row) { + return date2Thai(val); + }, + style: "font-size: 14px", }, // { // name: "year", @@ -170,6 +168,7 @@ const visibleColumns = ref([ "posType", "posLevel", "org", + "dateAppoint", ]); const pagination = ref({ page: formFilter.value.page, diff --git a/src/modules/04_registryPerson/interface/request/Main.ts b/src/modules/04_registryPerson/interface/request/Main.ts index b20996743..02fa91b39 100644 --- a/src/modules/04_registryPerson/interface/request/Main.ts +++ b/src/modules/04_registryPerson/interface/request/Main.ts @@ -58,6 +58,8 @@ interface QueryParams { isAll?: boolean; retireType?: string | null; dateAppoint?: string; + sortBy?: string; + sort?: string; } interface FormChangeName { diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts index 1c6cb0058..0ded7ece6 100644 --- a/src/modules/04_registryPerson/store.ts +++ b/src/modules/04_registryPerson/store.ts @@ -132,8 +132,8 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => { ]); const displayOrderOps = ref([ - { id: "ASC", name: "เรียงตามวันที่บรรจุแต่งตั้ง (ล่าสุด-เก่า)" }, - { id: "DESC", name: "เรียงตามวันที่บรรจุแต่งตั้ง (เก่า-ล่าสุด)" }, + { id: "DESC", name: "เรียงตามวันที่บรรจุแต่งตั้ง (ล่าสุด-เก่า)" }, + { id: "ASC", name: "เรียงตามวันที่บรรจุแต่งตั้ง (เก่า-ล่าสุด)" }, ]); return { diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue index f3e42bb88..f9ca25df5 100644 --- a/src/modules/04_registryPerson/views/listView.vue +++ b/src/modules/04_registryPerson/views/listView.vue @@ -129,7 +129,8 @@ async function fetchDataPerson() { } if (store.formFilter.dateAppoint) { - queryParams.dateAppoint = store.formFilter.dateAppoint; + queryParams.sortBy = "profile.dateAppoint"; + queryParams.sort = store.formFilter.dateAppoint; } await http From 11383febeb5a8f6278ffe188e3f3bfb3e0a5f840 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 19 Feb 2025 17:45:15 +0700 Subject: [PATCH 2/3] fix dateAppoint Emp --- src/modules/04_registryPerson/views/listView.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue index f9ca25df5..08080472d 100644 --- a/src/modules/04_registryPerson/views/listView.vue +++ b/src/modules/04_registryPerson/views/listView.vue @@ -129,7 +129,10 @@ async function fetchDataPerson() { } if (store.formFilter.dateAppoint) { - queryParams.sortBy = "profile.dateAppoint"; + queryParams.sortBy = + empType.value !== "officer" + ? "profileEmployee.dateAppoint" + : "profile.dateAppoint"; queryParams.sort = store.formFilter.dateAppoint; } From bd64e91628006f397fba5fba5377460625c86e00 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 19 Feb 2025 18:06:22 +0700 Subject: [PATCH 3/3] fix --- .../04_registryPerson/views/listView.vue | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue index 08080472d..beb426486 100644 --- a/src/modules/04_registryPerson/views/listView.vue +++ b/src/modules/04_registryPerson/views/listView.vue @@ -1,5 +1,12 @@