no message
This commit is contained in:
parent
a98170ff0a
commit
2c86badef2
1 changed files with 627 additions and 264 deletions
|
|
@ -216,6 +216,7 @@ export class ReportController extends Controller {
|
||||||
orgRoot.posMasters
|
orgRoot.posMasters
|
||||||
.sort((a, b) => a.posMasterOrder - b.posMasterOrder)
|
.sort((a, b) => a.posMasterOrder - b.posMasterOrder)
|
||||||
.map(async (posMaster) => {
|
.map(async (posMaster) => {
|
||||||
|
if (posMaster.orgChild1 == null) {
|
||||||
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))];
|
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))];
|
||||||
const posType = [...new Set(posMaster.positions.map((x) => x.posType.posTypeName))];
|
const posType = [...new Set(posMaster.positions.map((x) => x.posType.posTypeName))];
|
||||||
const posLevel = [
|
const posLevel = [
|
||||||
|
|
@ -249,7 +250,9 @@ export class ReportController extends Controller {
|
||||||
...new Set(positionMasterOld.positions.map((x: any) => x.posType.posTypeName)),
|
...new Set(positionMasterOld.positions.map((x: any) => x.posType.posTypeName)),
|
||||||
];
|
];
|
||||||
profilePosLevel = [
|
profilePosLevel = [
|
||||||
...new Set(positionMasterOld.positions.map((x: any) => x.posLevel.posLevelName)),
|
...new Set(
|
||||||
|
positionMasterOld.positions.map((x: any) => x.posLevel.posLevelName),
|
||||||
|
),
|
||||||
];
|
];
|
||||||
profilePosExecutive = [
|
profilePosExecutive = [
|
||||||
...new Set(
|
...new Set(
|
||||||
|
|
@ -274,7 +277,8 @@ export class ReportController extends Controller {
|
||||||
posMaster.next_holder == null
|
posMaster.next_holder == null
|
||||||
? posType.join(" หรือ ")
|
? posType.join(" หรือ ")
|
||||||
: posMaster.isSit == false
|
: posMaster.isSit == false
|
||||||
? posMaster.positions.find((x: any) => (x.isSit = true))?.posType?.posTypeName
|
? posMaster.positions.find((x: any) => (x.isSit = true))?.posType
|
||||||
|
?.posTypeName
|
||||||
: posMaster.next_holder.posType == null
|
: posMaster.next_holder.posType == null
|
||||||
? ""
|
? ""
|
||||||
: posMaster.next_holder.posType.posTypeName,
|
: posMaster.next_holder.posType.posTypeName,
|
||||||
|
|
@ -375,25 +379,94 @@ export class ReportController extends Controller {
|
||||||
(x: any) => (x.positionIsSelected = true),
|
(x: any) => (x.positionIsSelected = true),
|
||||||
)?.posExecutive?.posExecutiveName,
|
)?.posExecutive?.posExecutiveName,
|
||||||
};
|
};
|
||||||
if (_node != null) {
|
if (_node == null) {
|
||||||
if (node.orgTreeName == _node.orgTreeName) node.orgTreeName = "";
|
const head = {
|
||||||
if (node.orgTreeShortName == _node.orgTreeShortName) node.orgTreeShortName = "";
|
posMasterNo: node.orgTreeShortName,
|
||||||
if (node.profileOrgName == _node.profileOrgName) node.profileOrgName = "";
|
profileFullname: node.orgTreeName,
|
||||||
if (node.profileOrgShortName == _node.profileOrgShortName)
|
posExecutive: "",
|
||||||
node.profileOrgShortName = "";
|
positionName: "",
|
||||||
if (node.positionName == _node.positionName) node.positionName = "";
|
posType: "",
|
||||||
if (node.posType == _node.posType) node.posType = "";
|
posLevel: "",
|
||||||
if (node.posLevel == _node.posLevel) node.posLevel = "";
|
profilePosMasterNo: node.profileOrgShortName,
|
||||||
if (node.posExecutive == _node.posExecutive) node.posExecutive = "";
|
profilePosExecutive: node.profileOrgName,
|
||||||
if (node.profilePositionName == _node.profilePositionName)
|
profilePositionName: "",
|
||||||
node.profilePositionName = "";
|
profilePosType: "",
|
||||||
if (node.profilePosType == _node.profilePosType) node.profilePosType = "";
|
profilePosLevel: "",
|
||||||
if (node.profilePosLevel == _node.profilePosLevel) node.profilePosLevel = "";
|
};
|
||||||
if (node.profilePosExecutive == _node.profilePosExecutive)
|
data.push(head);
|
||||||
node.profilePosExecutive = "";
|
const _head = {
|
||||||
|
posMasterNo: node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive,
|
||||||
|
positionName: node.positionName,
|
||||||
|
posType: node.posType,
|
||||||
|
posLevel: node.posLevel,
|
||||||
|
profilePosMasterNo: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive: node.profilePosExecutive,
|
||||||
|
profilePositionName: node.profilePositionName,
|
||||||
|
profilePosType: node.profilePosType,
|
||||||
|
profilePosLevel: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(_head);
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
node.orgTreeShortName != _node.orgTreeShortName &&
|
||||||
|
node.orgTreeName != _node.orgTreeName &&
|
||||||
|
node.profileOrgShortName != _node.profileOrgShortName &&
|
||||||
|
node.profileOrgName != _node.profileOrgName
|
||||||
|
) {
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.orgTreeShortName == _node.orgTreeShortName
|
||||||
|
? ""
|
||||||
|
: node.orgTreeShortName,
|
||||||
|
profileFullname:
|
||||||
|
node.orgTreeName == _node.orgTreeName ? "" : node.orgTreeName,
|
||||||
|
posExecutive: "",
|
||||||
|
positionName: "",
|
||||||
|
posType: "",
|
||||||
|
posLevel: "",
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profileOrgShortName == _node.profileOrgShortName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgShortName,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profileOrgName == _node.profileOrgName ? "" : node.profileOrgName,
|
||||||
|
profilePositionName: "",
|
||||||
|
profilePosType: "",
|
||||||
|
profilePosLevel: "",
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
|
_node == null;
|
||||||
|
}
|
||||||
|
const head = {
|
||||||
|
posMasterNo: node.posMasterNo == _node.posMasterNo ? "" : node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||||
|
positionName: node.positionName == _node.positionName ? "" : node.positionName,
|
||||||
|
posType: node.posType == _node.posType ? "" : node.posType,
|
||||||
|
posLevel: node.posLevel == _node.posLevel ? "" : node.posLevel,
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profilePosMasterNo == _node.profilePosMasterNo
|
||||||
|
? ""
|
||||||
|
: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profilePosExecutive == _node.profilePosExecutive
|
||||||
|
? ""
|
||||||
|
: node.profilePosExecutive,
|
||||||
|
profilePositionName:
|
||||||
|
node.profilePositionName == _node.profilePositionName
|
||||||
|
? ""
|
||||||
|
: node.profilePositionName,
|
||||||
|
profilePosType:
|
||||||
|
node.profilePosType == _node.profilePosType ? "" : node.profilePosType,
|
||||||
|
profilePosLevel:
|
||||||
|
node.profilePosLevel == _node.profilePosLevel ? "" : node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
}
|
}
|
||||||
_node = node;
|
_node = node;
|
||||||
data.push(node);
|
}
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
_node = null;
|
_node = null;
|
||||||
|
|
@ -405,8 +478,11 @@ export class ReportController extends Controller {
|
||||||
orgChild1.posMasters
|
orgChild1.posMasters
|
||||||
.sort((a, b) => a.posMasterOrder - b.posMasterOrder)
|
.sort((a, b) => a.posMasterOrder - b.posMasterOrder)
|
||||||
.map(async (posMaster) => {
|
.map(async (posMaster) => {
|
||||||
|
if (posMaster.orgChild2Id == null) {
|
||||||
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))];
|
const positionName = [...new Set(posMaster.positions.map((x) => x.positionName))];
|
||||||
const posType = [...new Set(posMaster.positions.map((x) => x.posType.posTypeName))];
|
const posType = [
|
||||||
|
...new Set(posMaster.positions.map((x) => x.posType.posTypeName)),
|
||||||
|
];
|
||||||
const posLevel = [
|
const posLevel = [
|
||||||
...new Set(posMaster.positions.map((x) => x.posLevel.posLevelName)),
|
...new Set(posMaster.positions.map((x) => x.posLevel.posLevelName)),
|
||||||
];
|
];
|
||||||
|
|
@ -435,7 +511,9 @@ export class ReportController extends Controller {
|
||||||
...new Set(positionMasterOld.positions.map((x: any) => x.positionName)),
|
...new Set(positionMasterOld.positions.map((x: any) => x.positionName)),
|
||||||
];
|
];
|
||||||
profilePosType = [
|
profilePosType = [
|
||||||
...new Set(positionMasterOld.positions.map((x: any) => x.posType.posTypeName)),
|
...new Set(
|
||||||
|
positionMasterOld.positions.map((x: any) => x.posType.posTypeName),
|
||||||
|
),
|
||||||
];
|
];
|
||||||
profilePosLevel = [
|
profilePosLevel = [
|
||||||
...new Set(
|
...new Set(
|
||||||
|
|
@ -444,7 +522,9 @@ export class ReportController extends Controller {
|
||||||
];
|
];
|
||||||
profilePosExecutive = [
|
profilePosExecutive = [
|
||||||
...new Set(
|
...new Set(
|
||||||
positionMasterOld.positions.map((x: any) => x.posExecutive.posExecutiveName),
|
positionMasterOld.positions.map(
|
||||||
|
(x: any) => x.posExecutive.posExecutiveName,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
@ -567,25 +647,96 @@ export class ReportController extends Controller {
|
||||||
(x: any) => (x.positionIsSelected = true),
|
(x: any) => (x.positionIsSelected = true),
|
||||||
)?.posExecutive?.posExecutiveName,
|
)?.posExecutive?.posExecutiveName,
|
||||||
};
|
};
|
||||||
if (_node != null) {
|
if (_node == null) {
|
||||||
if (node.orgTreeName == _node.orgTreeName) node.orgTreeName = "";
|
const head = {
|
||||||
if (node.orgTreeShortName == _node.orgTreeShortName) node.orgTreeShortName = "";
|
posMasterNo: node.orgTreeShortName,
|
||||||
if (node.profileOrgName == _node.profileOrgName) node.profileOrgName = "";
|
profileFullname: node.orgTreeName,
|
||||||
if (node.profileOrgShortName == _node.profileOrgShortName)
|
posExecutive: "",
|
||||||
node.profileOrgShortName = "";
|
positionName: "",
|
||||||
if (node.positionName == _node.positionName) node.positionName = "";
|
posType: "",
|
||||||
if (node.posType == _node.posType) node.posType = "";
|
posLevel: "",
|
||||||
if (node.posLevel == _node.posLevel) node.posLevel = "";
|
profilePosMasterNo: node.profileOrgShortName,
|
||||||
if (node.posExecutive == _node.posExecutive) node.posExecutive = "";
|
profilePosExecutive: node.profileOrgName,
|
||||||
if (node.profilePositionName == _node.profilePositionName)
|
profilePositionName: "",
|
||||||
node.profilePositionName = "";
|
profilePosType: "",
|
||||||
if (node.profilePosType == _node.profilePosType) node.profilePosType = "";
|
profilePosLevel: "",
|
||||||
if (node.profilePosLevel == _node.profilePosLevel) node.profilePosLevel = "";
|
};
|
||||||
if (node.profilePosExecutive == _node.profilePosExecutive)
|
data.push(head);
|
||||||
node.profilePosExecutive = "";
|
const _head = {
|
||||||
|
posMasterNo: node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive,
|
||||||
|
positionName: node.positionName,
|
||||||
|
posType: node.posType,
|
||||||
|
posLevel: node.posLevel,
|
||||||
|
profilePosMasterNo: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive: node.profilePosExecutive,
|
||||||
|
profilePositionName: node.profilePositionName,
|
||||||
|
profilePosType: node.profilePosType,
|
||||||
|
profilePosLevel: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(_head);
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
node.orgTreeShortName != _node.orgTreeShortName &&
|
||||||
|
node.orgTreeName != _node.orgTreeName &&
|
||||||
|
node.profileOrgShortName != _node.profileOrgShortName &&
|
||||||
|
node.profileOrgName != _node.profileOrgName
|
||||||
|
) {
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.orgTreeShortName == _node.orgTreeShortName
|
||||||
|
? ""
|
||||||
|
: node.orgTreeShortName,
|
||||||
|
profileFullname:
|
||||||
|
node.orgTreeName == _node.orgTreeName ? "" : node.orgTreeName,
|
||||||
|
posExecutive: "",
|
||||||
|
positionName: "",
|
||||||
|
posType: "",
|
||||||
|
posLevel: "",
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profileOrgShortName == _node.profileOrgShortName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgShortName,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profileOrgName == _node.profileOrgName ? "" : node.profileOrgName,
|
||||||
|
profilePositionName: "",
|
||||||
|
profilePosType: "",
|
||||||
|
profilePosLevel: "",
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
|
_node == null;
|
||||||
|
}
|
||||||
|
const head = {
|
||||||
|
posMasterNo: node.posMasterNo == _node.posMasterNo ? "" : node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive:
|
||||||
|
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||||
|
positionName:
|
||||||
|
node.positionName == _node.positionName ? "" : node.positionName,
|
||||||
|
posType: node.posType == _node.posType ? "" : node.posType,
|
||||||
|
posLevel: node.posLevel == _node.posLevel ? "" : node.posLevel,
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profilePosMasterNo == _node.profilePosMasterNo
|
||||||
|
? ""
|
||||||
|
: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profilePosExecutive == _node.profilePosExecutive
|
||||||
|
? ""
|
||||||
|
: node.profilePosExecutive,
|
||||||
|
profilePositionName:
|
||||||
|
node.profilePositionName == _node.profilePositionName
|
||||||
|
? ""
|
||||||
|
: node.profilePositionName,
|
||||||
|
profilePosType:
|
||||||
|
node.profilePosType == _node.profilePosType ? "" : node.profilePosType,
|
||||||
|
profilePosLevel:
|
||||||
|
node.profilePosLevel == _node.profilePosLevel ? "" : node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
}
|
}
|
||||||
_node = node;
|
_node = node;
|
||||||
data.push(node);
|
}
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
_node = null;
|
_node = null;
|
||||||
|
|
@ -765,25 +916,95 @@ export class ReportController extends Controller {
|
||||||
(x: any) => (x.positionIsSelected = true),
|
(x: any) => (x.positionIsSelected = true),
|
||||||
)?.posExecutive?.posExecutiveName,
|
)?.posExecutive?.posExecutiveName,
|
||||||
};
|
};
|
||||||
if (_node != null) {
|
if (_node == null) {
|
||||||
if (node.orgTreeName == _node.orgTreeName) node.orgTreeName = "";
|
const head = {
|
||||||
if (node.orgTreeShortName == _node.orgTreeShortName) node.orgTreeShortName = "";
|
posMasterNo: node.orgTreeShortName,
|
||||||
if (node.profileOrgName == _node.profileOrgName) node.profileOrgName = "";
|
profileFullname: node.orgTreeName,
|
||||||
if (node.profileOrgShortName == _node.profileOrgShortName)
|
posExecutive: "",
|
||||||
node.profileOrgShortName = "";
|
positionName: "",
|
||||||
if (node.positionName == _node.positionName) node.positionName = "";
|
posType: "",
|
||||||
if (node.posType == _node.posType) node.posType = "";
|
posLevel: "",
|
||||||
if (node.posLevel == _node.posLevel) node.posLevel = "";
|
profilePosMasterNo: node.profileOrgShortName,
|
||||||
if (node.posExecutive == _node.posExecutive) node.posExecutive = "";
|
profilePosExecutive: node.profileOrgName,
|
||||||
if (node.profilePositionName == _node.profilePositionName)
|
profilePositionName: "",
|
||||||
node.profilePositionName = "";
|
profilePosType: "",
|
||||||
if (node.profilePosType == _node.profilePosType) node.profilePosType = "";
|
profilePosLevel: "",
|
||||||
if (node.profilePosLevel == _node.profilePosLevel) node.profilePosLevel = "";
|
};
|
||||||
if (node.profilePosExecutive == _node.profilePosExecutive)
|
data.push(head);
|
||||||
node.profilePosExecutive = "";
|
const _head = {
|
||||||
|
posMasterNo: node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive,
|
||||||
|
positionName: node.positionName,
|
||||||
|
posType: node.posType,
|
||||||
|
posLevel: node.posLevel,
|
||||||
|
profilePosMasterNo: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive: node.profilePosExecutive,
|
||||||
|
profilePositionName: node.profilePositionName,
|
||||||
|
profilePosType: node.profilePosType,
|
||||||
|
profilePosLevel: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(_head);
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
node.orgTreeShortName != _node.orgTreeShortName &&
|
||||||
|
node.orgTreeName != _node.orgTreeName &&
|
||||||
|
node.profileOrgShortName != _node.profileOrgShortName &&
|
||||||
|
node.profileOrgName != _node.profileOrgName
|
||||||
|
) {
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.orgTreeShortName == _node.orgTreeShortName
|
||||||
|
? ""
|
||||||
|
: node.orgTreeShortName,
|
||||||
|
profileFullname:
|
||||||
|
node.orgTreeName == _node.orgTreeName ? "" : node.orgTreeName,
|
||||||
|
posExecutive: "",
|
||||||
|
positionName: "",
|
||||||
|
posType: "",
|
||||||
|
posLevel: "",
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profileOrgShortName == _node.profileOrgShortName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgShortName,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profileOrgName == _node.profileOrgName ? "" : node.profileOrgName,
|
||||||
|
profilePositionName: "",
|
||||||
|
profilePosType: "",
|
||||||
|
profilePosLevel: "",
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
|
_node == null;
|
||||||
|
}
|
||||||
|
const head = {
|
||||||
|
posMasterNo: node.posMasterNo == _node.posMasterNo ? "" : node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive:
|
||||||
|
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||||
|
positionName:
|
||||||
|
node.positionName == _node.positionName ? "" : node.positionName,
|
||||||
|
posType: node.posType == _node.posType ? "" : node.posType,
|
||||||
|
posLevel: node.posLevel == _node.posLevel ? "" : node.posLevel,
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profilePosMasterNo == _node.profilePosMasterNo
|
||||||
|
? ""
|
||||||
|
: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profilePosExecutive == _node.profilePosExecutive
|
||||||
|
? ""
|
||||||
|
: node.profilePosExecutive,
|
||||||
|
profilePositionName:
|
||||||
|
node.profilePositionName == _node.profilePositionName
|
||||||
|
? ""
|
||||||
|
: node.profilePositionName,
|
||||||
|
profilePosType:
|
||||||
|
node.profilePosType == _node.profilePosType ? "" : node.profilePosType,
|
||||||
|
profilePosLevel:
|
||||||
|
node.profilePosLevel == _node.profilePosLevel ? "" : node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
}
|
}
|
||||||
_node = node;
|
_node = node;
|
||||||
data.push(node);
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
_node = null;
|
_node = null;
|
||||||
|
|
@ -966,26 +1187,95 @@ export class ReportController extends Controller {
|
||||||
(x: any) => (x.positionIsSelected = true),
|
(x: any) => (x.positionIsSelected = true),
|
||||||
)?.posExecutive?.posExecutiveName,
|
)?.posExecutive?.posExecutiveName,
|
||||||
};
|
};
|
||||||
if (_node != null) {
|
if (_node == null) {
|
||||||
if (node.orgTreeName == _node.orgTreeName) node.orgTreeName = "";
|
const head = {
|
||||||
if (node.orgTreeShortName == _node.orgTreeShortName)
|
posMasterNo: node.orgTreeShortName,
|
||||||
node.orgTreeShortName = "";
|
profileFullname: node.orgTreeName,
|
||||||
if (node.profileOrgName == _node.profileOrgName) node.profileOrgName = "";
|
posExecutive: "",
|
||||||
if (node.profileOrgShortName == _node.profileOrgShortName)
|
positionName: "",
|
||||||
node.profileOrgShortName = "";
|
posType: "",
|
||||||
if (node.positionName == _node.positionName) node.positionName = "";
|
posLevel: "",
|
||||||
if (node.posType == _node.posType) node.posType = "";
|
profilePosMasterNo: node.profileOrgShortName,
|
||||||
if (node.posLevel == _node.posLevel) node.posLevel = "";
|
profilePosExecutive: node.profileOrgName,
|
||||||
if (node.posExecutive == _node.posExecutive) node.posExecutive = "";
|
profilePositionName: "",
|
||||||
if (node.profilePositionName == _node.profilePositionName)
|
profilePosType: "",
|
||||||
node.profilePositionName = "";
|
profilePosLevel: "",
|
||||||
if (node.profilePosType == _node.profilePosType) node.profilePosType = "";
|
};
|
||||||
if (node.profilePosLevel == _node.profilePosLevel) node.profilePosLevel = "";
|
data.push(head);
|
||||||
if (node.profilePosExecutive == _node.profilePosExecutive)
|
const _head = {
|
||||||
node.profilePosExecutive = "";
|
posMasterNo: node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive,
|
||||||
|
positionName: node.positionName,
|
||||||
|
posType: node.posType,
|
||||||
|
posLevel: node.posLevel,
|
||||||
|
profilePosMasterNo: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive: node.profilePosExecutive,
|
||||||
|
profilePositionName: node.profilePositionName,
|
||||||
|
profilePosType: node.profilePosType,
|
||||||
|
profilePosLevel: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(_head);
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
node.orgTreeShortName != _node.orgTreeShortName &&
|
||||||
|
node.orgTreeName != _node.orgTreeName &&
|
||||||
|
node.profileOrgShortName != _node.profileOrgShortName &&
|
||||||
|
node.profileOrgName != _node.profileOrgName
|
||||||
|
) {
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.orgTreeShortName == _node.orgTreeShortName
|
||||||
|
? ""
|
||||||
|
: node.orgTreeShortName,
|
||||||
|
profileFullname:
|
||||||
|
node.orgTreeName == _node.orgTreeName ? "" : node.orgTreeName,
|
||||||
|
posExecutive: "",
|
||||||
|
positionName: "",
|
||||||
|
posType: "",
|
||||||
|
posLevel: "",
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profileOrgShortName == _node.profileOrgShortName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgShortName,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profileOrgName == _node.profileOrgName ? "" : node.profileOrgName,
|
||||||
|
profilePositionName: "",
|
||||||
|
profilePosType: "",
|
||||||
|
profilePosLevel: "",
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
|
_node == null;
|
||||||
|
}
|
||||||
|
const head = {
|
||||||
|
posMasterNo: node.posMasterNo == _node.posMasterNo ? "" : node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive:
|
||||||
|
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||||
|
positionName:
|
||||||
|
node.positionName == _node.positionName ? "" : node.positionName,
|
||||||
|
posType: node.posType == _node.posType ? "" : node.posType,
|
||||||
|
posLevel: node.posLevel == _node.posLevel ? "" : node.posLevel,
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profilePosMasterNo == _node.profilePosMasterNo
|
||||||
|
? ""
|
||||||
|
: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profilePosExecutive == _node.profilePosExecutive
|
||||||
|
? ""
|
||||||
|
: node.profilePosExecutive,
|
||||||
|
profilePositionName:
|
||||||
|
node.profilePositionName == _node.profilePositionName
|
||||||
|
? ""
|
||||||
|
: node.profilePositionName,
|
||||||
|
profilePosType:
|
||||||
|
node.profilePosType == _node.profilePosType ? "" : node.profilePosType,
|
||||||
|
profilePosLevel:
|
||||||
|
node.profilePosLevel == _node.profilePosLevel ? "" : node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
}
|
}
|
||||||
_node = node;
|
_node = node;
|
||||||
data.push(node);
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
_node = null;
|
_node = null;
|
||||||
|
|
@ -1168,27 +1458,100 @@ export class ReportController extends Controller {
|
||||||
(x: any) => (x.positionIsSelected = true),
|
(x: any) => (x.positionIsSelected = true),
|
||||||
)?.posExecutive?.posExecutiveName,
|
)?.posExecutive?.posExecutiveName,
|
||||||
};
|
};
|
||||||
if (_node != null) {
|
if (_node == null) {
|
||||||
if (node.orgTreeName == _node.orgTreeName) node.orgTreeName = "";
|
const head = {
|
||||||
if (node.orgTreeShortName == _node.orgTreeShortName)
|
posMasterNo: node.orgTreeShortName,
|
||||||
node.orgTreeShortName = "";
|
profileFullname: node.orgTreeName,
|
||||||
if (node.profileOrgName == _node.profileOrgName) node.profileOrgName = "";
|
posExecutive: "",
|
||||||
if (node.profileOrgShortName == _node.profileOrgShortName)
|
positionName: "",
|
||||||
node.profileOrgShortName = "";
|
posType: "",
|
||||||
if (node.positionName == _node.positionName) node.positionName = "";
|
posLevel: "",
|
||||||
if (node.posType == _node.posType) node.posType = "";
|
profilePosMasterNo: node.profileOrgShortName,
|
||||||
if (node.posLevel == _node.posLevel) node.posLevel = "";
|
profilePosExecutive: node.profileOrgName,
|
||||||
if (node.posExecutive == _node.posExecutive) node.posExecutive = "";
|
profilePositionName: "",
|
||||||
if (node.profilePositionName == _node.profilePositionName)
|
profilePosType: "",
|
||||||
node.profilePositionName = "";
|
profilePosLevel: "",
|
||||||
if (node.profilePosType == _node.profilePosType) node.profilePosType = "";
|
};
|
||||||
if (node.profilePosLevel == _node.profilePosLevel)
|
data.push(head);
|
||||||
node.profilePosLevel = "";
|
const _head = {
|
||||||
if (node.profilePosExecutive == _node.profilePosExecutive)
|
posMasterNo: node.posMasterNo,
|
||||||
node.profilePosExecutive = "";
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive: node.posExecutive,
|
||||||
|
positionName: node.positionName,
|
||||||
|
posType: node.posType,
|
||||||
|
posLevel: node.posLevel,
|
||||||
|
profilePosMasterNo: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive: node.profilePosExecutive,
|
||||||
|
profilePositionName: node.profilePositionName,
|
||||||
|
profilePosType: node.profilePosType,
|
||||||
|
profilePosLevel: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(_head);
|
||||||
|
} else {
|
||||||
|
if (
|
||||||
|
node.orgTreeShortName != _node.orgTreeShortName &&
|
||||||
|
node.orgTreeName != _node.orgTreeName &&
|
||||||
|
node.profileOrgShortName != _node.profileOrgShortName &&
|
||||||
|
node.profileOrgName != _node.profileOrgName
|
||||||
|
) {
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.orgTreeShortName == _node.orgTreeShortName
|
||||||
|
? ""
|
||||||
|
: node.orgTreeShortName,
|
||||||
|
profileFullname:
|
||||||
|
node.orgTreeName == _node.orgTreeName ? "" : node.orgTreeName,
|
||||||
|
posExecutive: "",
|
||||||
|
positionName: "",
|
||||||
|
posType: "",
|
||||||
|
posLevel: "",
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profileOrgShortName == _node.profileOrgShortName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgShortName,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profileOrgName == _node.profileOrgName
|
||||||
|
? ""
|
||||||
|
: node.profileOrgName,
|
||||||
|
profilePositionName: "",
|
||||||
|
profilePosType: "",
|
||||||
|
profilePosLevel: "",
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
|
_node == null;
|
||||||
|
}
|
||||||
|
const head = {
|
||||||
|
posMasterNo:
|
||||||
|
node.posMasterNo == _node.posMasterNo ? "" : node.posMasterNo,
|
||||||
|
profileFullname: node.profileFullname,
|
||||||
|
posExecutive:
|
||||||
|
node.posExecutive == _node.posExecutive ? "" : node.posExecutive,
|
||||||
|
positionName:
|
||||||
|
node.positionName == _node.positionName ? "" : node.positionName,
|
||||||
|
posType: node.posType == _node.posType ? "" : node.posType,
|
||||||
|
posLevel: node.posLevel == _node.posLevel ? "" : node.posLevel,
|
||||||
|
profilePosMasterNo:
|
||||||
|
node.profilePosMasterNo == _node.profilePosMasterNo
|
||||||
|
? ""
|
||||||
|
: node.profilePosMasterNo,
|
||||||
|
profilePosExecutive:
|
||||||
|
node.profilePosExecutive == _node.profilePosExecutive
|
||||||
|
? ""
|
||||||
|
: node.profilePosExecutive,
|
||||||
|
profilePositionName:
|
||||||
|
node.profilePositionName == _node.profilePositionName
|
||||||
|
? ""
|
||||||
|
: node.profilePositionName,
|
||||||
|
profilePosType:
|
||||||
|
node.profilePosType == _node.profilePosType ? "" : node.profilePosType,
|
||||||
|
profilePosLevel:
|
||||||
|
node.profilePosLevel == _node.profilePosLevel
|
||||||
|
? ""
|
||||||
|
: node.profilePosLevel,
|
||||||
|
};
|
||||||
|
data.push(head);
|
||||||
}
|
}
|
||||||
_node = node;
|
_node = node;
|
||||||
data.push(node);
|
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
_node = null;
|
_node = null;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue