diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index 3adf01616..39e88605c 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -251,9 +251,9 @@ async function getDataTable(id: string, level: number = 0) { node: level, nodeId: id, typeCommand: type.value, - position: posType.value ? posType.value : "", + position: position.value ? position.value : "", posLevel: posLevel.value ? posLevel.value : "", - posType: position.value ? position.value : "", + posType: posType.value ? posType.value : "", isAll: isAll.value, isBlank: isBlank.value, }; diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue index db57ce664..049207ef2 100644 --- a/src/modules/04_registryNew/components/TableView.vue +++ b/src/modules/04_registryNew/components/TableView.vue @@ -143,8 +143,6 @@ const visibleColumns = ref([ "posType", "posLevel", "org", - // "year", - // "salary", ]); function updatePagePagination() { @@ -180,6 +178,13 @@ function onClickViewDetail(id: string) { } } +/** + * function redirect ไปหน้ารายการคำร้องขอแก้ไขข้อมูล + */ +function redirectToPagePetition() { + router.push(`/registry-new/request-edit`); +} + watch( () => formFilter.value.pageSize, () => { @@ -190,27 +195,21 @@ watch(