|
@@ -512,11 +512,15 @@ class gatherTree extends baseTree {
|
|
|
order: siblings.length + 1,
|
|
|
children: [],
|
|
|
code: node.code, b_code: node.b_code, name: node.name,
|
|
|
- unit: node.unit, unit_price: node.unit_price,
|
|
|
+ unit: node.unit, unit_price: node.unit_price, drawing_code: node.drawing_code,
|
|
|
};
|
|
|
siblings.push(cur);
|
|
|
this.datas.push(cur);
|
|
|
}
|
|
|
+ if (!cur.memo && !!node.memo) cur.memo = node.memo;
|
|
|
+ if (!cur.ex_memo1 && !!node.ex_memo1) cur.ex_memo1 = node.ex_memo1;
|
|
|
+ if (!cur.ex_memo2 && !!node.ex_memo2) cur.ex_memo2 = node.ex_memo2;
|
|
|
+ if (!cur.ex_memo3 && !!node.ex_memo3) cur.ex_memo3 = node.ex_memo3;
|
|
|
loadFun(cur, node);
|
|
|
if (node.children && node.children.length > 0) {
|
|
|
for (const c of node.children) {
|
|
@@ -666,6 +670,9 @@ class gatherPos extends pos {
|
|
|
this.datas.push(gp);
|
|
|
posRange.push(gp);
|
|
|
}
|
|
|
+ if (!gp.ex_memo1 && !!spr.ex_memo1) gp.ex_memo1 = spr.ex_memo1;
|
|
|
+ if (!gp.ex_memo2 && !!spr.ex_memo2) gp.ex_memo2 = spr.ex_memo2;
|
|
|
+ if (!gp.ex_memo3 && !!spr.ex_memo3) gp.ex_memo3 = spr.ex_memo3;
|
|
|
loadFun(gp, spr);
|
|
|
}
|
|
|
}
|