From 53b9b37d0a665c50f7977c4d1fe87019edcfc9c6 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 15 Mar 2024 10:12:13 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20api=20pa?=
 =?UTF-8?q?th=20period=20active?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/13_salary/api.salary.ts                     | 6 ++++--
 src/modules/13_salary/views/salaryEmployeeLists.vue | 2 +-
 src/modules/13_salary/views/salaryLists.vue         | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/13_salary/api.salary.ts b/src/api/13_salary/api.salary.ts
index 7b484cfe0..8e0cc161c 100644
--- a/src/api/13_salary/api.salary.ts
+++ b/src/api/13_salary/api.salary.ts
@@ -20,6 +20,7 @@ export default {
   salaryRateListByid: (id: string) => `${salaryRate}/${id}`,
   salaryReportByid: (id: string) => `${salary}/report/${id}`,
   salaryPeriod: () => `${salary}/period`,
+  salaryPeriodActive: () => `${salary}/period/active`,
 
   /** รายการเงินเดือน*/
   keycloakPositionByid: (id: string) =>
@@ -44,6 +45,7 @@ export default {
   salaryEmployeeRateList: `${salaryRate}/employee`,
   salaryEmployeeRateListByid: (id: string) => `${salaryRate}/employee/${id}`,
 
-  salaryEmployeePosType:()=>`${salaryOrg}/pos/type`,
-  salaryEmployeePositionType:(key:string)=>`${salaryOrg}/pos/position?keyword=${key}&type=positionType`
+  salaryEmployeePosType: () => `${salaryOrg}/pos/type`,
+  salaryEmployeePositionType: (key: string) =>
+    `${salaryOrg}/pos/position?keyword=${key}&type=positionType`,
 };
diff --git a/src/modules/13_salary/views/salaryEmployeeLists.vue b/src/modules/13_salary/views/salaryEmployeeLists.vue
index 09beb1080..b285ef056 100644
--- a/src/modules/13_salary/views/salaryEmployeeLists.vue
+++ b/src/modules/13_salary/views/salaryEmployeeLists.vue
@@ -52,7 +52,7 @@ function getRound() {
   showLoader();
   http
     .get(
-      config.API.salaryPeriod() +
+      config.API.salaryPeriodActive() +
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {
diff --git a/src/modules/13_salary/views/salaryLists.vue b/src/modules/13_salary/views/salaryLists.vue
index 589a4d1da..11228afba 100644
--- a/src/modules/13_salary/views/salaryLists.vue
+++ b/src/modules/13_salary/views/salaryLists.vue
@@ -51,7 +51,7 @@ function getRound() {
   showLoader();
   http
     .get(
-      config.API.salaryPeriod() +
+      config.API.salaryPeriodActive() +
         `?page=${page.value}&pageSize=${pageSize.value}&keyword=&year=0`
     )
     .then(async (res) => {