From 2e0f98448f50dbe3c05323002035b49fcc8d0a22 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 8 Mar 2024 09:48:49 +0700 Subject: [PATCH] salary - check isClose round --- .../13_salary/components/SalaryLists/DialogAddPerson.vue | 4 +--- src/modules/13_salary/interface/response/SalaryList.ts | 1 + src/modules/13_salary/store/SalaryListsStore.ts | 2 ++ src/modules/13_salary/views/salaryLists.vue | 7 ++++++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue index 81ed4e349..43c04b675 100644 --- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue @@ -109,9 +109,7 @@ function closeModal() { /** function เรียกรายชื่อ คนเลื่อนเงินเดือน*/ function fetchListPerson() { - showLoader(); - console.log(store.rootId); - + showLoader(); formFilter.rootId = store.rootId; http .post(config.API.salaryListPerson, formFilter) diff --git a/src/modules/13_salary/interface/response/SalaryList.ts b/src/modules/13_salary/interface/response/SalaryList.ts index d32951527..2f5c3fb0f 100644 --- a/src/modules/13_salary/interface/response/SalaryList.ts +++ b/src/modules/13_salary/interface/response/SalaryList.ts @@ -20,6 +20,7 @@ interface DataRound { revisionId: string; status: string; year: number; + isClose: boolean } interface DataAgency { diff --git a/src/modules/13_salary/store/SalaryListsStore.ts b/src/modules/13_salary/store/SalaryListsStore.ts index 11393fee5..acad72648 100644 --- a/src/modules/13_salary/store/SalaryListsStore.ts +++ b/src/modules/13_salary/store/SalaryListsStore.ts @@ -22,6 +22,7 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => { const rootId = ref(""); const roundMainCode = ref(""); const roundCode = ref(""); + const isClosedRound = ref(false); // การปิดรอบ /** List Menu*/ const itemMenu = ref([ { @@ -151,5 +152,6 @@ export const useSalaryListSDataStore = defineStore("salaryListStore", () => { groupOp, roundMainCode, remaining, + isClosedRound }; }); diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue index 554150035..c6c8d7d1a 100644 --- a/src/modules/13_salary/views/salaryLists.vue +++ b/src/modules/13_salary/views/salaryLists.vue @@ -62,6 +62,7 @@ function getRound() { id: x.id, revisionId: x.revisionId, shortCode: x.period, + isClose: x.isClose, name: (x.period === "OCT" ? "รอบตุลาคม " @@ -77,6 +78,7 @@ function getRound() { : ""); store.roundMainCode = roundFilter.value.shortCode; + store.isClosedRound = roundFilter.value.isClose; await getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); @@ -228,6 +230,9 @@ function fetchSalalyPeriod(rootId: string, periodId: string, snap: string) { /** function เปลี่ยนรอบการขั้นเงินเดือน*/ async function onChangeRound() { + // เก็บสถานะการปิดรอบในตัวแปร isClosedRound เพื่อใช้ในการเช็ค + store.isClosedRound = roundFilter.value.isClose; + await getSnap(roundFilter.value.shortCode); await getAgency(roundFilter.value.revisionId); await getAgencyPosition(roundFilter.value.revisionId); @@ -391,7 +396,7 @@ onMounted(async () => { - +