chenshilong 7 gadi atpakaļ
vecāks
revīzija
e86f176e56
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      web/building_saas/main/js/models/calc_program.js

+ 2 - 1
web/building_saas/main/js/models/calc_program.js

@@ -1800,7 +1800,8 @@ class CalcProgram {
                     // console.log(`[${calcItem.ID}]: ${calcItem.compiledExpr}`);   // for test.
                     // console.log(`[${calcItem.ID}]: ${calcItem.compiledExpr}`);   // for test.
                     let tf = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.process);
                     let tf = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.process);
                     calcItem.totalFee = tf.toDecimal(decimalObj.decimal('totalPrice', treeNode));
                     calcItem.totalFee = tf.toDecimal(decimalObj.decimal('totalPrice', treeNode));
-                    calcItem.unitFee = uf.toDecimal(decimalObj.decimal('unitPrice', treeNode));
+                    let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 1;
+                    calcItem.unitFee = (tf / nodeQ).toDecimal(decimalObj.decimal('unitPrice', treeNode));
 
 
                     if (tender == tenderTypes.ttCalc) {
                     if (tender == tenderTypes.ttCalc) {
                         let tExpr = analyzer.getCompiledTenderExpr(calcItem.compiledExpr);
                         let tExpr = analyzer.getCompiledTenderExpr(calcItem.compiledExpr);