|
@@ -419,8 +419,10 @@ let calcTools = {
|
|
|
sumU = undefined;
|
|
|
}
|
|
|
else if (me.isLeafBill(treeNode)){
|
|
|
- if (isGather)
|
|
|
- sumT = eTFee()
|
|
|
+ if (isGather){
|
|
|
+ me.getGLJList(treeNode, false);
|
|
|
+ sumT = eTFee();
|
|
|
+ }
|
|
|
else
|
|
|
sumT = eTFeeByChildren();
|
|
|
|
|
@@ -428,6 +430,8 @@ let calcTools = {
|
|
|
sumU = (sumT / q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
}
|
|
|
else if (me.isRationCategory(treeNode)){
|
|
|
+ me.getGLJList(treeNode, false);
|
|
|
+
|
|
|
sumU = eUFee();
|
|
|
if (isBase) return sumU;
|
|
|
|
|
@@ -1623,10 +1627,8 @@ class CalcProgram {
|
|
|
};
|
|
|
};
|
|
|
|
|
|
- if (!calcTools.isTotalCostBill(treeNode)){ // 已在上面的分支中计算过
|
|
|
- calcTools.getGLJList(treeNode, false);
|
|
|
+ if (!calcTools.isTotalCostBill(treeNode)) // 已在上面的分支中计算过
|
|
|
calcTools.estimateFee(treeNode);
|
|
|
- }
|
|
|
|
|
|
if (treeNode.changed && !changedArr.includes(treeNode)) changedArr.push(treeNode);
|
|
|
};
|