Merge branch 'master' into new-node-version

web/building_saas/main/js/views/project_glj_view.js

@@ -1429,7 +1429,7 @@ let projectGljObject={
         }
     },
     applyInfoPrice:function (projectGLJData,price,coe) {
-      let priceFrom= me.getPriceFrom();
+      let priceFrom= this.getPriceFrom();
       projectObj.project.projectGLJ.updatePrice(projectGLJData,"market_price",price*coe,'pg',{"priceFrom":priceFrom});
       
     },

web/building_saas/main/js/views/project_view.js

@@ -3468,11 +3468,11 @@ function disableTools(){
     $('#calcProgramFileSelect').prop('disabled', 'disabled');
     //调价
     $('#calcPriceOption').prop('disabled', 'disabled');
-    $('#gljPriceTenderCoe').prop('disabled', 'disabled');
+    $('#gljPriceTenderCoe').prop('readOnly', true);
     $('#tenderGLJQuantity').prop('disabled', 'disabled');
     $('#tenderRationQuantity').prop('disabled', 'disabled');
-    // $('#tenderPrice').prop('disabled', 'disabled');
     $('#cleanTender').prop('disabled', 'disabled');
+    $('#calcTender').prop('disabled', 'disabled');
 }
 //项目只读，表格只读
 function disableSpread(spread){

web/building_saas/main/js/views/tender_price_view.js

@@ -99,6 +99,12 @@ let tender_obj={
     showTenderData:function () {
         let me = this;
         this.tenderSheet.setRowCount(0);
+        this.tenderTreeSetting.cols.forEach(function (col) {
+            if (col.data.field.hasSubStr(".totalFee") || col.data.field.hasSubStr(".tenderTotalFee"))
+                col.data.formatter = MainTreeCol.getNumberFormatter(decimalObj.ration.totalPrice, true);
+            else if (col.data.field.hasSubStr(".unitFee") || col.data.field.hasSubStr(".tenderUnitFee"))
+                col.data.formatter = MainTreeCol.getNumberFormatter(decimalObj.ration.unitPrice, true);
+        });
         me.tenderController.showTreeData();
     },
     onTenderRangeChange:function (sender,info) {