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

Merge branch 'develop' of github.com:Frappet/bma-ehr-probation into develop

Browse source
This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-10-22 08:21:39 +07:00
commit 2b03ec8d39
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ReportController.ts
View file

@ -1067,6 +1067,9 @@ export class ReportController extends Controller {
date: v.commandAffectDate, date: v.commandAffectDate,
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`, refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
salaryRef: v.templateDoc, salaryRef: v.templateDoc,
amount: v.amount,
positionSalaryAmount: v.positionSalaryAmount,
mouthSalaryAmount: v.mouthSalaryAmount
})), })),
}) })
.then(async res => { .then(async res => {
@ -1150,6 +1153,9 @@ export class ReportController extends Controller {
date: v.commandAffectDate, date: v.commandAffectDate,
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`, refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
salaryRef: v.templateDoc, salaryRef: v.templateDoc,
amount: v.amount,
positionSalaryAmount: v.positionSalaryAmount,
mouthSalaryAmount: v.mouthSalaryAmount
})), })),
}) })
.then(async res => { .then(async res => {