From ee35a2e7096cb44512a853855f4b6293158408aa Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 21 May 2025 15:22:10 +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=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5=E0=B8=A2=E0=B8=99?= =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4?= =?UTF-8?q?=20=3D=3D>=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20?= =?UTF-8?q?=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DialogSortEducation.vue | 4 +- .../views/edit/components/DialogSort.vue | 165 ++++++++++++++++++ .../views/edit/components/Table.vue | 23 ++- 3 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 src/modules/04_registryPerson/views/edit/components/DialogSort.vue diff --git a/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue b/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue index dd9a1ae14..e84953544 100644 --- a/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue +++ b/src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue @@ -262,7 +262,7 @@ function onSubmit() { watch(modal, async () => { if (modal.value && props.dataSort) { const dataList = props.dataSort; - rows.value = dataList; + rows.value.push(...dataList); selected.value = dataList.filter((item: any) => item.isUse == true); } else { selected.value = []; @@ -294,7 +294,7 @@ watch(modal, async () => { bordered :rows="rows" :columns="columns" - :rows-per-page-options="[100]" + :rows-per-page-options="[0]" row-key="id" hide-bottom hide-pagination diff --git a/src/modules/04_registryPerson/views/edit/components/DialogSort.vue b/src/modules/04_registryPerson/views/edit/components/DialogSort.vue new file mode 100644 index 000000000..2eb33fb9d --- /dev/null +++ b/src/modules/04_registryPerson/views/edit/components/DialogSort.vue @@ -0,0 +1,165 @@ + + + + diff --git a/src/modules/04_registryPerson/views/edit/components/Table.vue b/src/modules/04_registryPerson/views/edit/components/Table.vue index 241a43c54..86f34ba6f 100644 --- a/src/modules/04_registryPerson/views/edit/components/Table.vue +++ b/src/modules/04_registryPerson/views/edit/components/Table.vue @@ -12,6 +12,7 @@ import type { QTableColumn } from "quasar"; import type { DataPosition } from "@/modules/04_registryPerson/interface/response/Edit"; import DialogForm from "@/modules/04_registryPerson/views/edit/components/DialogForm.vue"; +import DialogSort from "@/modules/04_registryPerson/views/edit/components/DialogSort.vue"; const $q = useQuasar(); const route = useRoute(); @@ -276,6 +277,7 @@ const columns = computed(() => { }); const modal = ref(false); +const modalSort = ref(false); /** function fetch ข้อมูลรายการตำแหน่งเงินเดือน*/ async function fetchData() { @@ -410,7 +412,19 @@ onMounted(() => {