diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index 9c5bd8b1e..f34bf8a48 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -366,13 +366,13 @@ async function onSave(data: FormDataAppoint) { nodeId: data.nodeId, orgRevisionId: data.orgRevisionId, positionId: data.positionId, - posMasterNo: data.posMasterNo, - positionName: data.positionName, + posMasterNo: data.posMasterNo ?? "", + positionName: data.positionName ?? "", posTypeId: data.posTypeId, - posTypeName: data.posTypeName, + posTypeName: data.posTypeName ?? "", posLevelId: data.posLevelId, - posLevelName: data.posLevelName, - posExecutiveName: data.posExecutiveName, + posLevelName: data.posLevelName ?? "", + posExecutiveName: data.posExecutiveName ?? "", reportingDate: data.reportingDate, posmasterId: data.posmasterId, typeCommand: data.typeCommand, diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue index 05819bcf9..9abaa643d 100644 --- a/src/modules/05_placement/views/06_appointPromoteMain.vue +++ b/src/modules/05_placement/views/06_appointPromoteMain.vue @@ -445,14 +445,14 @@ async function onSave(data: FormDataAppoint) { nodeId: data.nodeId, orgRevisionId: data.orgRevisionId, positionId: data.positionId, - posMasterNo: data.posMasterNo, - positionName: data.positionName, + posMasterNo: data.posMasterNo ?? "", + positionName: data.positionName ?? "", posTypeId: data.posTypeId, - posTypeName: data.posTypeName, + posTypeName: data.posTypeName ?? "", posLevelId: data.posLevelId, - posLevelName: data.posLevelName, + posLevelName: data.posLevelName ?? "", reportingDate: data.reportingDate, - posExecutiveName: data.posExecutiveName, + posExecutiveName: data.posExecutiveName ?? "", posmasterId: data.posmasterId, typeCommand: data.typeCommand, positionExecutiveField: data.positionExecutiveField, diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue index a8acad511..19ba41342 100644 --- a/src/modules/05_placement/views/08_otherMain.vue +++ b/src/modules/05_placement/views/08_otherMain.vue @@ -274,13 +274,13 @@ async function onSaveSelectOrg(data: any) { nodeId: data.nodeId, orgRevisionId: data.orgRevisionId, positionId: data.positionId, - posMasterNo: data.posMasterNo, - positionName: data.positionName, + posMasterNo: data.posMasterNo ?? "", + positionName: data.positionName ?? "", posTypeId: data.posTypeId, - posTypeName: data.posTypeName, + posTypeName: data.posTypeName ?? "", posLevelId: data.posLevelId, - posLevelName: data.posLevelName, - posExecutiveName: data.posExecutiveName, + posLevelName: data.posLevelName ?? "", + posExecutiveName: data.posExecutiveName ?? "", reportingDate: data.reportingDate, posmasterId: data.posmasterId, typeCommand: data.typeCommand, diff --git a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue index c534a5b77..42bb546f4 100644 --- a/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue +++ b/src/modules/09_leave/components/05_Leave/Dialog/DialogAddCommander.vue @@ -145,24 +145,24 @@ function onSubmit() { dialogConfirm($q, async () => { const body = selected.value.map((items: any, index: any) => ({ seq: index, - prefix: items.prefix, - firstName: items.firstName, - lastName: items.lastName, - positionName: items.position, - positionSign: items.positionSign ?? items.posExecutiveName, + prefix: items.prefix ?? "", + firstName: items.firstName ?? "", + lastName: items.lastName ?? "", + positionName: items.position ?? "", + positionSign: items.positionSign ?? items.posExecutiveName ?? "", profileId: items.id, keycloakId: items.keycloakId, positionLeaveName: items.posType == "บริหาร" || items.posType == "อำนวยการ" - ? items.posType + items.posLevel - : items.posLevel, - posExecutiveName: items.posExecutiveName, + ? (items.posType ?? "") + (items.posLevel ?? "") + : items.posLevel ?? "", + posExecutiveName: items.posExecutiveName ?? "", organizationName: [ - items.orgChild4, - items.orgChild3, - items.orgChild2, - items.orgChild1, - items.orgRoot, + items.orgChild4 ?? "", + items.orgChild3 ?? "", + items.orgChild2 ?? "", + items.orgChild1 ?? "", + items.orgRoot ?? "", ] .filter(Boolean) .join(" "),