按钮bugs

web/building_saas/main/js/views/calc_base_view.js

@@ -343,7 +343,7 @@ let calcBaseView = {
             }
         });
     },
-    onCalcBaseButtonClick:function (hitinfo) {
+    onCalcBaseButtonClick:function (hitinfo,type='bills') {
         let me = calcBaseView;
         let node = projectObj.project.mainTree.items[hitinfo.row] ? projectObj.project.mainTree.items[hitinfo.row] : null;
         if(hitinfo.sheet.getParent() === projectObj.mainSpread){
@@ -353,7 +353,7 @@ let calcBaseView = {
         calcBaseView.confirmBtn.attr('toggle', 'calcBase');
         changeCalcBaseFeeRate('calcBase');
         $('#tabCalcBase').tab('show');
-        calcBaseView.initCalctor('ration');
+        calcBaseView.initCalctor(type);
     }
 };
 

web/building_saas/main/js/views/calc_program_manage.js

@@ -40,7 +40,7 @@ let calcProgramManage = {
         //callback 和disable都是和 cusButton配套使用的
         callback:{
             calcBase:function (hitinfo) {
-                calcBaseView.onCalcBaseButtonClick(hitinfo);
+                calcBaseView.onCalcBaseButtonClick(hitinfo,'ration');
             }
         },
         disable:{

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

@@ -304,8 +304,10 @@ let MainTreeCol = {
                 return  quantityEditObj.getQuantityEditCellType();
             }
         },
-        calcBase: function () {
-            return calcBaseView.getCalcBaseCellType('bills');
+        calcBase: function (node) {
+            let readOnly = projectReadOnly || !calcBaseView.ifEdit('bills', projectObj.project.mainTree.items.indexOf(node));
+            return sheetCommonObj.getCusButtonCellType(calcBaseView.onCalcBaseButtonClick,readOnly)
+            //return calcBaseView.getCalcBaseCellType('bills');
         },
 
         // CSL, 2017-11-28