|
@@ -99,19 +99,26 @@ export default {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ const dimensionIds = selectedNodes.map((item) => item.id);
|
|
|
|
+ const targetNodes = this.$refs.treeRef
|
|
|
|
+ .getCheckedNodes(false, true)
|
|
|
|
+ .filter((item) => item.children && item.children.length);
|
|
|
|
+
|
|
this.$emit(
|
|
this.$emit(
|
|
"confirm",
|
|
"confirm",
|
|
- selectedNodes.map((item) => {
|
|
|
|
|
|
+ targetNodes.map((item) => {
|
|
return {
|
|
return {
|
|
targetId: item.id,
|
|
targetId: item.id,
|
|
targetName: item.name,
|
|
targetName: item.name,
|
|
- dimensionList: item.children.map((dimension) => {
|
|
|
|
- return {
|
|
|
|
- dimensionId: dimension.dimensionId,
|
|
|
|
- dimensionCode: dimension.dimensionCode,
|
|
|
|
- dimensionName: dimension.dimensionName,
|
|
|
|
- };
|
|
|
|
- }),
|
|
|
|
|
|
+ dimensionList: item.children
|
|
|
|
+ .filter((ditem) => dimensionIds.includes(ditem.id))
|
|
|
|
+ .map((dimension) => {
|
|
|
|
+ return {
|
|
|
|
+ dimensionId: dimension.id,
|
|
|
|
+ dimensionCode: dimension.code,
|
|
|
|
+ dimensionName: dimension.name,
|
|
|
|
+ };
|
|
|
|
+ }),
|
|
};
|
|
};
|
|
})
|
|
})
|
|
);
|
|
);
|