#170 and calAge
This commit is contained in:
parent
a45d3744e5
commit
4be0b068bc
5 changed files with 12 additions and 10 deletions
|
|
@ -2127,7 +2127,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
|
||||
employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
|
||||
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
|
||||
dateEmployment: dateEmployment,
|
||||
dateAppoint: _data.dateAppoint,
|
||||
dateStart: _data.dateStart,
|
||||
|
|
@ -2995,7 +2995,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
: _data.profileSalary[0].posNo || "",
|
||||
employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
|
||||
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
|
||||
dateEmployment: dateEmployment,
|
||||
dateAppoint: _data.dateAppoint,
|
||||
dateStart: _data.dateStart,
|
||||
|
|
@ -3417,7 +3417,7 @@ export class ProfileEmployeeController extends Controller {
|
|||
posNo: _data.employeeClass == "TEMP" ? _data.posMasterNoTemp : shortName,
|
||||
employeeClass: _data.employeeClass == null ? null : _data.employeeClass,
|
||||
govAge: Extension.CalculateGovAge(_data.dateAppoint, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0),
|
||||
age: Extension.CalculateAgeStrV2(_data.birthDate, 0, 0, "GET"),
|
||||
dateEmployment: dateEmployment,
|
||||
dateAppoint: _data.dateAppoint,
|
||||
dateStart: _data.dateStart,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue