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

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

@@ -953,9 +953,14 @@ let calcTools = {
      },
     getFeeRateByNode(node){
         let decimal = getDecimal("feeRate");
-        if(node.data.feeRateID) return scMathUtil.roundForObj(projectObj.project.FeeRate.getFeeRateByID(node.data.feeRateID).rate,decimal);
-        if (node.data.feeRate || node.data.feeRate == 0) return scMathUtil.roundForObj(node.data.feeRate,decimal);
-        return 100
+        if(node.data.feeRateID) {
+            let r = projectObj.project.FeeRate.getFeeRateByID(node.data.feeRateID);
+            if (r) return scMathUtil.roundForObj(r.rate, decimal);
+        };
+        if (node.data.feeRate || node.data.feeRate == 0)
+            return scMathUtil.roundForObj(node.data.feeRate,decimal);
+
+        return 100;
     }
 };