From 8b0eeb5f9536859302efa19e223a49f2af82bec0 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 8 Mar 2024 09:34:14 +0700
Subject: [PATCH 1/2] salary - get list persons by agency rootId

---
 .../13_salary/components/SalaryLists/DialogAddPerson.vue      | 4 ++++
 src/modules/13_salary/interface/index/SalaryList.ts           | 1 +
 src/modules/13_salary/views/salaryLists.vue                   | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
index 3985213bb..81ed4e349 100644
--- a/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
+++ b/src/modules/13_salary/components/SalaryLists/DialogAddPerson.vue
@@ -96,6 +96,7 @@ const formFilter = reactive<DataFilterPerson>({
   page: 1,
   pageSize: 10,
   keyword: "",
+  rootId: ""
 });
 const maxPage = ref<number>(1);
 
@@ -109,6 +110,9 @@ function closeModal() {
 /** function เรียกรายชื่อ คนเลื่อนเงินเดือน*/
 function fetchListPerson() {
   showLoader();
+  console.log(store.rootId);
+  
+  formFilter.rootId = store.rootId;
   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 4a2767dfd..a490b5dff 100644
--- a/src/modules/13_salary/interface/index/SalaryList.ts
+++ b/src/modules/13_salary/interface/index/SalaryList.ts
@@ -9,6 +9,7 @@ interface DataFilterPerson {
   page: number;
   pageSize: number;
   keyword: string;
+  rootId: string;
 }
 
 export type { DataFilter, DataFilterPerson };
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 56c4d262f..554150035 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -168,6 +168,7 @@ async function getAgencyPosition(id: string) {
       .then(async (res) => {
         const data = await res.data.result;
 
+        store.rootId = data.rootId;
         const position = agencyOptions.value?.find(
           (e: DataOption) => e.id === data.rootId
         );
@@ -256,6 +257,8 @@ async function onChangeSnap() {
 
 /** function เปลี่ยนหน่วยงาน*/
 async function onChangeAgency() {
+  store.rootId = agencyFilter.value;
+
   if (agencyFilter.value && roundFilter.value.id && snapFilter.value) {
     await fetchSalalyPeriod(
       agencyFilter.value,

From 2e0f98448f50dbe3c05323002035b49fcc8d0a22 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 8 Mar 2024 09:48:49 +0700
Subject: [PATCH 2/2] 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<string>("");
   const roundMainCode = ref<string>("");
   const roundCode = ref<string>("");
+  const isClosedRound = ref<boolean>(false); // การปิดรอบ
   /** List Menu*/
   const itemMenu = ref<ItemsMenu[]>([
     {
@@ -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 () => {
     </q-card>
   </q-card>
 
-  <q-card v-if="isLoad" flat bordered class="row col-12 q-mt-xs">
+  <q-card v-if="isLoad && !store.isClosedRound" flat bordered class="row col-12 q-mt-xs">
     <ProcessStep />
   </q-card>