hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้การส่งค่า & fix bug รอบ ระบบเงินเดือน

Browse source
This commit is contained in:
Warunee Tamkoo 2024-03-29 17:02:32 +07:00
parent 388e61abc2
commit b71859c5a5
5 changed files with 55 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/modules/13_salary/components/SalaryEmployeeLists/Dashboard.vue
View file

@ -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;

7
src/modules/13_salary/components/SalaryEmployeeLists/TabMain.vue
View file

@ -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

41
src/modules/13_salary/components/SalaryLists/Dashboard.vue
View file

@ -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;

7
src/modules/13_salary/components/SalaryLists/TabMain.vue
View file

@ -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

8
src/modules/13_salary/views/salaryRound.vue
View file

@ -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 () => {
</q-item>
<q-item
v-if="props.row.revisionId !== null"
v-if="
props.row.isClose === false &&
props.row.isActive === true
"
clickable
v-close-popup
@click.stop="dialogClose(props.row.id)"