Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation

web/users/js/main_tree_col.js

@@ -50,6 +50,9 @@ let MainTreeCol = {
         },
         forTotalFee: function (node) {
             return MainTreeCol.readOnly.non_bills(node) || MainTreeCol.readOnly.billsParent(node) || (MainTreeCol.readOnly.leafBillsWithDetail(node));
+        },
+        forFeeRate:function (node) {
+            return MainTreeCol.readOnly.non_bills(node)||MainTreeCol.readOnly.billsParent(node)||MainTreeCol.readOnly.leafBillsWithDetail(node);
         }
     },
     cellType: {
@@ -61,6 +64,9 @@ let MainTreeCol = {
         },
         feeRate: function () {
             return feeRateObject.getFeeRateEditCellType();
+        },
+        calcBase: function () {
+            return calcBaseView.getCalcBaseCellType();
         }
      },
     getEvent: function (eventName) {