Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

web/building_saas/main/js/models/calc_program.js

@@ -1926,13 +1926,16 @@ class CalcProgram {
         bttf = 0;
 
       if (commonCalcType == 2) {
+        let isFB = calcTools.isBill_FB(treeNode);
         for (let node of nodes) {
           if (node.data.feesIndex && node.data.feesIndex[ft.type]) {
             btf = (btf + parseFloatPlus(node.data.feesIndex[ft.type].totalFee)).toDecimal(decimalObj.process);
             bttf = (bttf + parseFloatPlus(node.data.feesIndex[ft.type].tenderTotalFee)).toDecimal(decimalObj.process);
             // TASK #3834 （概算）造价书界面，新增“指标”列，指标=定额建安费（分部的合价）/ 分部的工程量，取两位小数。针对分部。
-            if (calcTools.isBill_FB(node))
-              buf = (btf / bq).toDecimal(-2);
+            if (isFB){
+                if (nQ)
+                    buf = (btf / nQ).toDecimal(-2);
+            }
           }
         }
       }
@@ -1945,7 +1948,8 @@ class CalcProgram {
             btf = (bq * buf).toDecimal(decimalObj.bills.totalPrice);
             bttf = (btq * btuf).toDecimal(decimalObj.bills.totalPrice);
           }
-        } else {
+        }
+        else {
           let sum_rtf = 0,
             sum_rttf = 0;
           for (let node of nodes) {

web/building_saas/main/js/views/main_tree_col.js

@@ -86,13 +86,13 @@ let MainTreeCol = {
         },
         commonUnitFee:function (node) {
             if (calcTools.isRationItem(node))
-              return node.data.feesIndex && node.data.feesIndex.common?  node.data.feesIndex.common.unitFee:'';
+                return node.data.feesIndex && node.data.feesIndex.common ? node.data.feesIndex.common.unitFee : '';
             else
-              return "";
+                return "";
         },
         commonIndex:function (node) {
             if (calcTools.isBill_FB(node))
-                return node.data.feesIndex&&node.data.feesIndex.common?node.data.feesIndex.common.unitFee:'';
+                return node.data.feesIndex && node.data.feesIndex.common ? node.data.feesIndex.common.unitFee : '';
             else
                 return "";
         },