Merge branch 'develop' of github.com:Frappet/bma-ehr-probation into develop
This commit is contained in:
commit
358a17e40d
1 changed files with 4 additions and 0 deletions
|
|
@ -1050,6 +1050,7 @@ export class ReportController extends Controller {
|
|||
refId: string
|
||||
commandAffectDate: Date | null
|
||||
commandNo: string | null
|
||||
commandId: string | null
|
||||
commandYear: number
|
||||
templateDoc: string | null
|
||||
amount: Double | null
|
||||
|
|
@ -1062,6 +1063,7 @@ export class ReportController extends Controller {
|
|||
.PostData(request, "/org/command/excexute/salary-probation", {
|
||||
data: body.refIds.map(v => ({
|
||||
profileId: v.refId,
|
||||
commandId: v.commandId,
|
||||
date: v.commandAffectDate,
|
||||
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
|
||||
salaryRef: v.templateDoc,
|
||||
|
|
@ -1131,6 +1133,7 @@ export class ReportController extends Controller {
|
|||
refId: string
|
||||
commandAffectDate: Date | null
|
||||
commandNo: string | null
|
||||
commandId: string | null
|
||||
commandYear: number
|
||||
templateDoc: string | null
|
||||
amount: Double | null
|
||||
|
|
@ -1143,6 +1146,7 @@ export class ReportController extends Controller {
|
|||
.PostData(request, "/org/command/excexute/salary-probation-leave", {
|
||||
data: body.refIds.map(v => ({
|
||||
profileId: v.refId,
|
||||
commandId: v.commandId,
|
||||
date: v.commandAffectDate,
|
||||
refCommandNo: `${v.commandNo}/${Extension.ToThaiYear(v.commandYear)}`,
|
||||
salaryRef: v.templateDoc,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue