From b71859c5a51fa0da04ab6b78af44f062dc4d52ec Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 29 Mar 2024 17:02:32 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=84=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=20&=20fix=20bug=20=E0=B8=A3=E0=B8=AD=E0=B8=9A=20=E0=B8=A3?= =?UTF-8?q?=E0=B8=B0=E0=B8=9A=E0=B8=9A=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99?= =?UTF-8?q?=E0=B9=80=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryEmployeeLists/Dashboard.vue | 5 ++- .../SalaryEmployeeLists/TabMain.vue | 7 +++- .../components/SalaryLists/Dashboard.vue | 41 +++++++++++++++---- .../components/SalaryLists/TabMain.vue | 7 +++- src/modules/13_salary/views/salaryRound.vue | 8 ++-- 5 files changed, 55 insertions(+), 13 deletions(-) diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue index f74d35699..0d760227a 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue @@ -387,7 +387,10 @@ function fetchDataDashboard() { .then((res) => { const quota = res.data.result.dashboard; itemsCardAPR.value[0].total = quota.total; - itemsCardAPR.value[1].total = quota.fifteenPercent; + itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardAPR.value[2].total = quota.chosen; itemsCardAPR.value[3].total = quota.remaining; itemsCardAPR.value[4].total = quota.totalBackup; diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue index 99bb2d72f..949b3347c 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue @@ -256,7 +256,12 @@ function fetchDataPeriod(id: string) { pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, - isRetire: isRetire.value === true ? "1" : "0", + isRetire: + store.roundMainCode === "APR" + ? null + : isRetire.value === true + ? "1" + : "0", }; http diff --git a/src/modules/13_salary/components/SalaryLists/Dashboard.vue b/src/modules/13_salary/components/SalaryLists/Dashboard.vue index ecbd1c1c3..7da38e319 100644 --- a/src/modules/13_salary/components/SalaryLists/Dashboard.vue +++ b/src/modules/13_salary/components/SalaryLists/Dashboard.vue @@ -392,17 +392,44 @@ function fetchDataDashboard() { .then((res) => { const quota = res.data.result.dashboard; itemsCardAPR.value[0].total = quota.total; - itemsCardAPR.value[1].total = quota.fifteenPercent; + itemsCardAPR.value[1].total = quota.fifteenPercent.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardAPR.value[2].total = quota.chosen; itemsCardAPR.value[3].total = quota.remaining; itemsCardAPR.value[4].total = quota.totalBackup; - itemsCardOCT.value[0].total = quota.currentAmount; - itemsCardOCT.value[1].total = quota.sixPercentAmount; - itemsCardOCT.value[2].total = quota.spentAmount; - itemsCardOCT.value[3].total = quota.sixPercentSpentAmount; - itemsCardOCT.value[4].total = quota.useAmount; - itemsCardOCT.value[5].total = quota.remainingAmount; + itemsCardOCT.value[0].total = quota.currentAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[1].total = quota.sixPercentAmount.toLocaleString( + "en", + { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + } + ); + itemsCardOCT.value[2].total = quota.spentAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[3].total = quota.sixPercentSpentAmount.toLocaleString( + "en", + { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + } + ); + itemsCardOCT.value[4].total = quota.useAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); + itemsCardOCT.value[5].total = quota.remainingAmount.toLocaleString("en", { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + }); itemsCardOCT.value[6].total = quota.totalBackup; itemsCardSpeciel.value[0].total = quota.total; diff --git a/src/modules/13_salary/components/SalaryLists/TabMain.vue b/src/modules/13_salary/components/SalaryLists/TabMain.vue index ffcbd5e5f..e62e96084 100644 --- a/src/modules/13_salary/components/SalaryLists/TabMain.vue +++ b/src/modules/13_salary/components/SalaryLists/TabMain.vue @@ -265,7 +265,12 @@ function fetchDataPeriod(id: string) { pageSize: formFilter.pageSize.toString(), keyword: formFilter.keyword, type: store.tabType, - isRetire: isRetire.value === true ? "1" : "0", + isRetire: + store.roundMainCode === "APR" + ? null + : isRetire.value === true + ? "1" + : "0", }; http diff --git a/src/modules/13_salary/views/salaryRound.vue b/src/modules/13_salary/views/salaryRound.vue index 7c5c84242..8ddfb48b5 100644 --- a/src/modules/13_salary/views/salaryRound.vue +++ b/src/modules/13_salary/views/salaryRound.vue @@ -421,8 +421,7 @@ onMounted(async () => { color="edit" size="17px" :name=" - dateToISO(new Date()) >= - dateToISO(props.row.effectiveDate) + props.row.revisionId !== null ? 'mdi-eye-outline' : 'edit' " @@ -439,7 +438,10 @@ onMounted(async () => {