colSetting, feeRate

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

@@ -58,8 +58,11 @@ let MainTreeCol = {
             combo.itemHeight(10).items(['m', 'm2', 'm3', 'km', 't', 'kg', '台班', '工日', '昼夜', '元', '项', '处', '个', '件',
                 '根', '组', '系统', '台', '套', '株', '丛', '缸', '支', '只', '块', '座', '对', '份', '樘', '攒', '榀']);
             return combo;
+        },
+        feeRate: function () {
+            return feeRateObject.getFeeRateEditCellType();
         }
-    },
+     },
     getEvent: function (eventName) {
         let names = eventName.split('.');
         let event = this;

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

@@ -291,12 +291,11 @@ var projectObj = {
             if (!err) {
                 that.project.calcFields = JSON.parse(JSON.stringify(feeType));
                 that.project.initCalcFields();
-                var feeRateCol = 0;
                 let str = JSON.stringify(that.project.projSetting.main_tree_col);
                 that.project.projSetting.mainGridSetting = JSON.parse(str);
                 that.project.projSetting.mainGridSetting.frozenCols = 4;
                 TREE_SHEET_HELPER.initSetting($('#billsSpread')[0], that.project.projSetting.mainGridSetting);
-                that.project.projSetting.mainGridSetting.cols.forEach(function (col,index) {
+                that.project.projSetting.mainGridSetting.cols.forEach(function (col) {
                     col.data.splitFields = col.data.field.split('.');
                     if (col.data.getText && Object.prototype.toString.apply(col.data.getText) === "[object String]") {
                         col.data.getText = MainTreeCol.getEvent(col.data.getText);
@@ -315,9 +314,6 @@ var projectObj = {
                     if (col.data.field === 'code') {
                         col.data.formatter = '@';
                     }
-                    if(col.data.field==='feeRate'){
-                        feeRateCol=index;
-                    }
                 });
 
                 that.project.calcProgram.compileAllTemps();
@@ -327,8 +323,8 @@ var projectObj = {
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
+
                 that.mainSpread.bind(GC.Spread.Sheets.Events.EditEnded, that.mainSpreadEditEnded);
-                feeRateObject.setFeeRateCellCol(that.mainSpread.getActiveSheet(),feeRateCol);
                 that.loadMainSpreadContextMenu();
             }
             else {