diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue index 9e161c03c..6aaeefa4d 100644 --- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue @@ -97,6 +97,8 @@ const formFilter = reactive({ pageSize: 10, keyword: "", rootId: "", + year: 0, + period: "", }); const maxPage = ref(1); @@ -111,6 +113,8 @@ function closeModal() { function fetchListPerson() { showLoader(); formFilter.rootId = store.rootId; + formFilter.period = store.roundMainCode; + formFilter.year = store.roundYear; http .post(config.API.salaryListPerson, formFilter) .then((res) => { diff --git a/src/modules/13_salary/interface/index/SalaryList.ts b/src/modules/13_salary/interface/index/SalaryList.ts index a490b5dff..0d62b7224 100644 --- a/src/modules/13_salary/interface/index/SalaryList.ts +++ b/src/modules/13_salary/interface/index/SalaryList.ts @@ -10,6 +10,8 @@ interface DataFilterPerson { pageSize: number; keyword: string; rootId: string; + year: number; + period: string; } export type { DataFilter, DataFilterPerson }; diff --git a/src/modules/13_salary/store/SalaryListsStore.ts b/src/modules/13_salary/store/SalaryListsStore.ts index 2b43dc022..ff11a843e 100644 --- a/src/modules/13_salary/store/SalaryListsStore.ts +++ b/src/modules/13_salary/store/SalaryListsStore.ts @@ -21,6 +21,7 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => { const groupId = ref(""); const rootId = ref(""); const roundMainCode = ref(""); + const roundYear = ref(0); const roundCode = ref(""); const isClosedRound = ref(false); // การปิดรอบ /** List Menu*/ @@ -152,6 +153,7 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => { groupOp, roundMainCode, remaining, - isClosedRound + isClosedRound, + roundYear, }; }); diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index aa126ca50..e2122f53a 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -4,7 +4,7 @@ import { useQuasar } from "quasar"; import config from "@/app.config"; import http from "@/plugins/http"; import ProcessStep from "@/modules/13_salary/components/SalaryLists/ProcessStep.vue"; -import PageDashBoard from '@/modules/13_salary/components/SalaryLists/Dashboard.vue' +import PageDashBoard from "@/modules/13_salary/components/SalaryLists/Dashboard.vue"; /** importType*/ import type { DataOption, @@ -63,6 +63,7 @@ function getRound() { revisionId: x.revisionId, shortCode: x.period, isClose: x.isClose, + year: x.year, name: (x.period === "OCT" ? "รอบตุลาคม " @@ -78,6 +79,7 @@ function getRound() { : ""); store.roundMainCode = roundFilter.value.shortCode; + store.roundYear = roundFilter.value.year; store.isClosedRound = roundFilter.value.isClose; await getSnap(roundFilter.value.shortCode); @@ -239,6 +241,7 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) { async function onChangeRound() { // เก็บสถานะการปิดรอบในตัวแปร isClosedRound เพื่อใช้ในการเช็ค store.isClosedRound = roundFilter.value.isClose; + console.log(roundFilter.value); await getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); @@ -251,6 +254,7 @@ async function onChangeRound() { // ); store.tabType = "PENDING"; store.roundMainCode = roundFilter.value.shortCode; + store.roundYear = roundFilter.value.year; } else { isLoad.value = false; } @@ -271,7 +275,11 @@ async function onChangeSnap() { async function onChangeAgency() { store.rootId = agencyFilter.value; - if (agencyFilter.value !== 'ALL' && roundFilter.value.id && snapFilter.value) { + if ( + agencyFilter.value !== "ALL" && + roundFilter.value.id && + snapFilter.value + ) { await fetchSalalyPeriod( agencyFilter.value, roundFilter.value.id, @@ -394,20 +402,18 @@ onMounted(async () => { -->
- - - - -
- - ไม่มีข้อมูล - -
-
-
-
- -
+ + +
+ + ไม่มีข้อมูล + +
+
+ +
+ +