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

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

@@ -948,7 +948,7 @@ let calcTools = {
     hasQuantity: function (treeNode){
         return (treeNode.data.quantity && parseFloat(treeNode.data.quantity));
     },
-    
+
     getRationsByProjectGLJ(PGLJID){
         let rationIDs = [];
         let RGs = projectObj.project.ration_glj.datas;
@@ -1055,7 +1055,7 @@ let calcTools = {
         }
         return totalFee < +minPrice;
     },
-    
+
     getTenderCalcType: function () {
         let tenderSetting = projectObj.project.property.tenderSetting;
         let ct = tenderSetting && tenderSetting.calcPriceOption? tenderSetting.calcPriceOption : "priceBase_RCJ";
@@ -2517,15 +2517,17 @@ class CalcProgram {
         else if (sOption =='priceBase_ZM')
             tender = tenderTypes.ttReverseRation;
         if (tender == tenderTypes.ttReverseGLJ || tender == tenderTypes.ttReverseRation){
-            if (!tender_obj.tenderTree)
-                tender_obj.createTree();
+          if (!tender_obj.tenderTree){
+            tender_obj.createTree();
+            tender_obj.createTreeNodes();
+          }
 
-            this.initReverseTenderDatas();
-            this.prepareForDistribute(tender_obj.tenderTree.roots[0]);
-            this.distributeTargetTotalFee(tender_obj.tenderTree.roots[0]);
+          this.initReverseTenderDatas();
+          this.prepareForDistribute(tender_obj.tenderTree.roots[0]);
+          this.distributeTargetTotalFee(tender_obj.tenderTree.roots[0]);
         };
         this.calcAllNodesAndSave(calcAllType.catAll, callback, tender);
     };
 };
 
-// export default analyzer;
+// export default analyzer;