diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue index 88bf12082..ae406442c 100644 --- a/src/modules/02_organizationalNew/components/DialogMovePos.vue +++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue @@ -255,7 +255,7 @@ watch( selected-color="primary" :nodes="nodeTree" node-key="orgTreeId" - label-key="orgTreeName" + label-key="labelName" :filter="filterTree" no-results-label="ไม่พบข้อมูลที่ค้นหา" no-nodes-label="ไม่มีข้อมูล" diff --git a/src/modules/02_organizationalNew/components/DialogSuccession.vue b/src/modules/02_organizationalNew/components/DialogSuccession.vue index 68616410c..51f37a424 100644 --- a/src/modules/02_organizationalNew/components/DialogSuccession.vue +++ b/src/modules/02_organizationalNew/components/DialogSuccession.vue @@ -112,7 +112,7 @@ const reqMaster = reactive({ page: 1, pageSize: 10, keyword: "", - revisionId: store.activeId + revisionId: store.activeId, }); const totalRow = ref(0); const selectedPos = ref([]); @@ -264,7 +264,7 @@ function clearForm() { selected-color="primary" :nodes="nodeTree" node-key="orgTreeId" - label-key="orgTreeName" + label-key="labelName" :filter="filterTree" no-results-label="ไม่พบข้อมูลที่ค้นหา" no-nodes-label="ไม่มีข้อมูล" diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 005c98762..a4c521142 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -38,34 +38,13 @@ const periodLatest = ref(); const isLoad = ref(false); +/** ตัวแปร select*/ const page = ref(1); const pageSize = ref(50); const lastPage = ref(0); const loading = ref(false); const nextPage = ref(1); -function onScroll({ to, ref }: { to: number; ref: any }) { - const lastIndex = roundOptions.value.length - 1; - - if ( - loading.value !== true && - nextPage.value < lastPage.value && - to === lastIndex - ) { - loading.value = true; - - setTimeout(() => { - nextPage.value++; - page.value = nextPage.value; - getRound(); - nextTick(() => { - ref.refresh(); - loading.value = false; - }); - }, 500); - } -} - /**function เรียกข้อมูลรอบการขึ้นเงินเดือน*/ async function getRound() { showLoader(); @@ -278,6 +257,29 @@ async function onChangeAgency() { } } +/** function onScrollSelect รอบการขึ้นเงินเดือน*/ +function onScroll({ to, ref }: { to: number; ref: any }) { + const lastIndex = roundOptions.value.length - 1; + + if ( + loading.value !== true && + nextPage.value < lastPage.value && + to === lastIndex + ) { + loading.value = true; + + setTimeout(() => { + nextPage.value++; + page.value = nextPage.value; + getRound(); + nextTick(() => { + ref.refresh(); + loading.value = false; + }); + }, 500); + } +} + onMounted(async () => { await getRound(); }); @@ -289,7 +291,7 @@ onMounted(async () => { รายการเงินเดือน - +