Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

web/building_saas/main/js/models/bills.js

@@ -42,10 +42,10 @@ var Bills = {
                 }
                 if (uData.fees) {
                     for (let fee of uData.fees) {
-                        fee.unitFee = fee.unitFee.toFixed(2);
-                        fee.totalFee = fee.totalFee.toFixed(2);
-                        fee.tenderUnitFee = fee.tenderUnitFee.toFixed(2);
-                        fee.tenderTotalFee = fee.tenderTotalFee.toFixed(2);
+                        if(fee.unitFee) fee.unitFee = fee.unitFee.toFixed(2);
+                        if(fee.totalFee) fee.totalFee = fee.totalFee.toFixed(2);
+                        if(fee.tenderUnitFee) fee.tenderUnitFee = fee.tenderUnitFee.toFixed(2);
+                        if(fee.tenderTotalFee) fee.tenderTotalFee = fee.tenderTotalFee.toFixed(2);
                     }
                 }
                 return uData;

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

@@ -1850,6 +1850,8 @@ class CalcProgram {
     saveNodes(treeNodes, callback){
         if (treeNodes.length < 1) {
             $.bootstrapLoading.end();
+            this.rationMap = null;
+            this.pgljMap = null;
             return;
         }
 
@@ -2163,6 +2165,7 @@ class CalcProgram {
         } else{
             if(!this.rationMap) return [];
             let result = this.rationMap[ration.ID];
+            if(!result) return [];
             result = gljOprObj.combineWithProjectGlj(result,false,ration,this.pgljMap);
             return result;
         }