|
|
@@ -468,15 +468,21 @@ let calcTools = {
|
|
|
sumU = undefined;
|
|
|
}
|
|
|
else if (me.isLeafBill(treeNode)){
|
|
|
- if (isGather){
|
|
|
- me.getGLJList(treeNode, false);
|
|
|
- sumT = eTFee();
|
|
|
+ if (projectObj.project.Bills.isEngineerEst(treeNode)){
|
|
|
+ sumT = treeNode.data.feesIndex['common'].totalFee;
|
|
|
+ sumU = treeNode.data.feesIndex['common'].unitFee;
|
|
|
}
|
|
|
- else
|
|
|
- sumT = eTFeeByChildren();
|
|
|
+ else{
|
|
|
+ if (isGather){
|
|
|
+ me.getGLJList(treeNode, false);
|
|
|
+ sumT = eTFee();
|
|
|
+ }
|
|
|
+ else
|
|
|
+ sumT = eTFeeByChildren();
|
|
|
|
|
|
- let q = nodeQ ? nodeQ : 1;
|
|
|
- sumU = (sumT / q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ let q = nodeQ ? nodeQ : 1;
|
|
|
+ sumU = (sumT / q).toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ }
|
|
|
}
|
|
|
else if (me.isRationCategory(treeNode)){
|
|
|
me.getGLJList(treeNode, false);
|