no message
This commit is contained in:
parent
dd72971252
commit
8f7dfc96af
1 changed files with 14 additions and 14 deletions
|
|
@ -3002,8 +3002,8 @@ export class CommandController extends Controller {
|
||||||
refCommandNo: item.refCommandNo,
|
refCommandNo: item.refCommandNo,
|
||||||
templateDoc: item.salaryRef,
|
templateDoc: item.salaryRef,
|
||||||
position: profile.position,
|
position: profile.position,
|
||||||
positionType: profile.posType.posTypeName,
|
positionType: profile?.posType?.posTypeName ?? null,
|
||||||
positionLevel: profile.posLevel.posLevelName,
|
positionLevel: profile?.posLevel?.posLevelName ?? null,
|
||||||
posNo: shortName ? shortName : null,
|
posNo: shortName ? shortName : null,
|
||||||
positionLine: position?.positionField ?? null,
|
positionLine: position?.positionField ?? null,
|
||||||
positionPathSide: position?.positionArea ?? null,
|
positionPathSide: position?.positionArea ?? null,
|
||||||
|
|
@ -3187,8 +3187,8 @@ export class CommandController extends Controller {
|
||||||
refCommandNo: item.refCommandNo,
|
refCommandNo: item.refCommandNo,
|
||||||
templateDoc: item.salaryRef,
|
templateDoc: item.salaryRef,
|
||||||
position: profile.position,
|
position: profile.position,
|
||||||
positionType: profile.posType.posTypeName,
|
positionType: profile?.posType?.posTypeName ?? null,
|
||||||
positionLevel: profile.posLevel.posLevelName,
|
positionLevel: profile?.posLevel?.posLevelName ?? null,
|
||||||
posNo: shortName ? shortName : null,
|
posNo: shortName ? shortName : null,
|
||||||
// positionLine: position?.positionField ?? "-",
|
// positionLine: position?.positionField ?? "-",
|
||||||
// positionPathSide: position?.positionArea ?? "-",
|
// positionPathSide: position?.positionArea ?? "-",
|
||||||
|
|
@ -3411,8 +3411,8 @@ export class CommandController extends Controller {
|
||||||
refCommandNo: item.refCommandNo,
|
refCommandNo: item.refCommandNo,
|
||||||
templateDoc: item.salaryRef,
|
templateDoc: item.salaryRef,
|
||||||
position: profile.position,
|
position: profile.position,
|
||||||
positionType: profile.posType.posTypeName,
|
positionType: profile?.posType?.posTypeName ?? null,
|
||||||
positionLevel: profile.posLevel.posLevelName,
|
positionLevel: profile?.posLevel?.posLevelName ?? null,
|
||||||
posNo: shortName ? shortName : null,
|
posNo: shortName ? shortName : null,
|
||||||
// positionLine: position?.positionField ?? "-",
|
// positionLine: position?.positionField ?? "-",
|
||||||
// positionPathSide: position?.positionArea ?? "-",
|
// positionPathSide: position?.positionArea ?? "-",
|
||||||
|
|
@ -3629,8 +3629,8 @@ export class CommandController extends Controller {
|
||||||
templateDoc: item.salaryRef,
|
templateDoc: item.salaryRef,
|
||||||
commandId: item.commandId,
|
commandId: item.commandId,
|
||||||
position: profile.position,
|
position: profile.position,
|
||||||
positionType: profile.posType.posTypeName,
|
positionType: profile?.posType?.posTypeName ?? null,
|
||||||
positionLevel: profile.posLevel.posLevelName,
|
positionLevel: profile?.posLevel?.posLevelName ?? null,
|
||||||
posNo: shortName ? shortName : null,
|
posNo: shortName ? shortName : null,
|
||||||
positionLine: position?.positionField ?? null,
|
positionLine: position?.positionField ?? null,
|
||||||
positionPathSide: position?.positionArea ?? null,
|
positionPathSide: position?.positionArea ?? null,
|
||||||
|
|
@ -3800,8 +3800,8 @@ export class CommandController extends Controller {
|
||||||
templateDoc: item.salaryRef,
|
templateDoc: item.salaryRef,
|
||||||
commandId: item.commandId,
|
commandId: item.commandId,
|
||||||
position: profile.position,
|
position: profile.position,
|
||||||
positionType: profile.posType.posTypeName,
|
positionType: profile?.posType?.posTypeName ?? null,
|
||||||
positionLevel: profile.posLevel.posLevelName,
|
positionLevel: profile?.posLevel?.posLevelName ?? null,
|
||||||
posNo: shortName,
|
posNo: shortName,
|
||||||
positionLine: position?.positionField ?? null,
|
positionLine: position?.positionField ?? null,
|
||||||
positionPathSide: position?.positionArea ?? null,
|
positionPathSide: position?.positionArea ?? null,
|
||||||
|
|
@ -4511,8 +4511,8 @@ export class CommandController extends Controller {
|
||||||
/*(posMasterAct.posMasterChild?.current_holder?.position ?? "-") +
|
/*(posMasterAct.posMasterChild?.current_holder?.position ?? "-") +
|
||||||
"/" +*/
|
"/" +*/
|
||||||
_organization ?? "-",
|
_organization ?? "-",
|
||||||
postype: posMasterAct.posMasterChild?.current_holder?.posType?.posTypeName ?? "-",
|
postype: posMasterAct?.posMasterChild?.current_holder?.posType?.posTypeName ?? "-",
|
||||||
poslevel: posMasterAct.posMasterChild?.current_holder?.posLevel?.posLevelName ?? "-",
|
poslevel: posMasterAct?.posMasterChild?.current_holder?.posLevel?.posLevelName ?? "-",
|
||||||
organizationNew:
|
organizationNew:
|
||||||
/*(posMasterAct.posMaster?.current_holder?.position ?? "-") +
|
/*(posMasterAct.posMaster?.current_holder?.position ?? "-") +
|
||||||
"/" +*/
|
"/" +*/
|
||||||
|
|
@ -4620,8 +4620,8 @@ export class CommandController extends Controller {
|
||||||
mouthSalaryAmount: item.mouthSalaryAmount,
|
mouthSalaryAmount: item.mouthSalaryAmount,
|
||||||
posNo: shortName ?? null,
|
posNo: shortName ?? null,
|
||||||
position: position?.positionName ?? null,
|
position: position?.positionName ?? null,
|
||||||
positionType: position?.posType.posTypeName ?? null,
|
positionType: position?.posType?.posTypeName ?? null,
|
||||||
positionLevel: position?.posLevel.posLevelName ?? null,
|
positionLevel: position?.posLevel?.posLevelName ?? null,
|
||||||
refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`,
|
refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`,
|
||||||
templateDoc: item.templateDoc,
|
templateDoc: item.templateDoc,
|
||||||
order: dest_item == null ? 1 : dest_item.order + 1,
|
order: dest_item == null ? 1 : dest_item.order + 1,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue