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

comma

Browse source
This commit is contained in:
Bright 2024-04-01 14:11:06 +07:00
parent 3284fdbb86
commit 139da05b0c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/ReportController.ts
View file

@ -1591,18 +1591,18 @@ export class ReportController extends Controller {
amount:
profile.amount == undefined || profile.amount == null || profile.amount == 0
? ""
: Extension.ToThaiNumber(String(profile.amount)),
: Extension.ToThaiNumber(String(profile.amount.toLocaleString())),
amountSpecial:
(profile.positionSalaryAmount == undefined ||
profile.positionSalaryAmount == null ||
profile.positionSalaryAmount == 0
? ""
: Extension.ToThaiNumber(String(profile.positionSalaryAmount))) +
: Extension.ToThaiNumber(String(profile.positionSalaryAmount.toLocaleString()))) +
(profile.amountSpecial == undefined ||
profile.amountSpecial == null ||
profile.amountSpecial == 0
? ""
: `(${Extension.ToThaiNumber(String(profile.amountSpecial))})`),
: `(${Extension.ToThaiNumber(String(profile.amountSpecial.toLocaleString()))})`),
score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
remark:
`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
@ -1687,18 +1687,18 @@ export class ReportController extends Controller {
amount:
profile.amount == undefined || profile.amount == null || profile.amount == 0
? ""
: Extension.ToThaiNumber(String(profile.amount)),
: Extension.ToThaiNumber(String(profile.amount.toLocaleString())),
amountSpecial:
(profile.positionSalaryAmount == undefined ||
profile.positionSalaryAmount == null ||
profile.positionSalaryAmount == 0
? ""
: Extension.ToThaiNumber(String(profile.positionSalaryAmount))) +
: Extension.ToThaiNumber(String(profile.positionSalaryAmount.toLocaleString()))) +
(profile.amountSpecial == undefined ||
profile.amountSpecial == null ||
profile.amountSpecial == 0
? ""
: `(${Extension.ToThaiNumber(String(profile.amountSpecial))})`),
: `(${Extension.ToThaiNumber(String(profile.amountSpecial.toLocaleString()))})`),
score: null, //สรุปผลการประเมินฯ ระดับและคะแนน
remark:
`${profile.type === "FULL" ? "หนึ่งขั้น" : ""}\n` +
@ -1948,11 +1948,11 @@ export class ReportController extends Controller {
amount:
item.amount == undefined || item.amount == null
? "๐"
: Extension.ToThaiNumber(String(item.amount)),
: Extension.ToThaiNumber(String(item.amount.toLocaleString())),
positionSalaryAmount:
item.positionSalaryAmount == undefined || item.positionSalaryAmount == null
? "๐"
: Extension.ToThaiNumber(String(item.positionSalaryAmount)) +
: Extension.ToThaiNumber(String(item.positionSalaryAmount.toLocaleString())) +
(item.amountSpecial > 0
? `(${Extension.ToThaiNumber(String(item.positionSalaryAmount))})`
: ""),
@ -2070,11 +2070,11 @@ export class ReportController extends Controller {
amount:
item.amount == undefined || item.amount == null
? "๐"
: Extension.ToThaiNumber(String(item.amount)),
: Extension.ToThaiNumber(String(item.amount.toLocaleString())),
amountSpecial:
item.amountSpecial == undefined || item.amountSpecial == null
? "๐"
: Extension.ToThaiNumber(String(item.amountSpecial)),
: Extension.ToThaiNumber(String(item.amountSpecial.toLocaleString())),
remark: null,
}));