fix: posExecutiveName ?? ''

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-02-11 10:59:32 +07:00
parent b1cdb4eef4
commit dfdb0fc70c
4 changed files with 28 additions and 28 deletions

View file

@ -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,

View file

@ -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,

View file

@ -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,

View file

@ -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(" "),