From e7076ee06c4cd659dadecc704f6b3f4d5b804710 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 29 Mar 2024 17:07:52 +0700 Subject: [PATCH] fix bug query isRetire for round special --- .../13_salary/components/SalaryEmployeeLists/TabMain.vue | 2 +- src/modules/13_salary/components/SalaryLists/TabMain.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue index 949b3347c..5dc803417 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue @@ -257,7 +257,7 @@ function fetchDataPeriod(id: string) { keyword: formFilter.keyword, type: store.tabType, isRetire: - store.roundMainCode === "APR" + store.roundMainCode !== "OCT" ? null : isRetire.value === true ? "1" diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index e62e96084..c340ca980 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -266,7 +266,7 @@ function fetchDataPeriod(id: string) { keyword: formFilter.keyword, type: store.tabType, isRetire: - store.roundMainCode === "APR" + store.roundMainCode !== "OCT" ? null : isRetire.value === true ? "1"