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 @@ + + + + + + + + + + + + + + {{ props.rowIndex + 1 }} + + + {{ + findOrgNameHtml({ + root: props.row.orgRoot, + child1: props.row.orgChild1, + child2: props.row.orgChild2, + child3: props.row.orgChild3, + child4: props.row.orgChild4, + }) + }} + + + + {{ col.value ? col.value : "-" }} + + + {{ col.value ? col.value : "-" }} + + + + + + ไม่มีข้อมูล + + + + + + + บันทึก + + + + + + + + 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(() => { - + + + จัดลำดับข้อมูล { :row-data="rows" :fetch-data="fetchData" /> + +