|
@@ -1080,7 +1080,7 @@ let calcTools = {
|
|
|
else if (tender == tenderTypes.ttReverseRation)
|
|
|
return node.data.rationQuantityCoe;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
};
|
|
|
|
|
@@ -1866,7 +1866,10 @@ class CalcProgram {
|
|
|
// 取费方式为子目含量,清单行/列的XX单价应 =ROUND( ∑ROUND(定额XX单价*含量,清单单价精度),清单单价精度)
|
|
|
if (me.project.property.billsCalcMode === leafBillGetFeeType.rationContent) {
|
|
|
buf = (buf + (ruf * parseFloatPlus(node.data.contain)).toDecimal(decimalObj.bills.unitPrice)).toDecimal(decimalObj.process);
|
|
|
- node.data.tenderContaion = (node.data.tenderQuantity / bq).toDecimal(decimalObj.process);
|
|
|
+ if (node.data.tenderQuantity)
|
|
|
+ node.data.tenderContaion = (node.data.tenderQuantity / bq).toDecimal(decimalObj.process)
|
|
|
+ else
|
|
|
+ node.data.tenderContaion = node.data.contain;
|
|
|
btuf = (btuf + (rtuf * parseFloatPlus(node.data.tenderContaion)).toDecimal(decimalObj.bills.unitPrice)).toDecimal(decimalObj.process);
|
|
|
};
|
|
|
sum_rtf = (sum_rtf + rtf).toDecimal(decimalObj.process);
|
|
@@ -2140,7 +2143,7 @@ class CalcProgram {
|
|
|
calcNodes(me.project.mainTree.roots);
|
|
|
me.calcFormulaNodes(changedNodes, tender);
|
|
|
|
|
|
- if (tender){
|
|
|
+ if (tender){
|
|
|
for(let node of projectObj.project.mainTree.items){
|
|
|
this.clearTenderCache(node);
|
|
|
};
|
|
@@ -2737,7 +2740,7 @@ class CalcProgram {
|
|
|
})
|
|
|
|
|
|
};
|
|
|
-
|
|
|
+
|
|
|
};
|
|
|
|
|
|
// export default analyzer;
|