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

This commit is contained in:
DESKTOP-2S5P7D1\Windows 10 2024-10-22 08:21:39 +07:00
commit 2b03ec8d39

View file

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