设备费

modules/main/facade/calc_program_facade.js

@@ -92,6 +92,7 @@ function save (user_id, datas, callback) {
     projectCalcProgramsModel.update({"projectID": 553}, {"libName":"goo—test"}, callback(null, returnData));
 }
 
+// saveCalcItem({projectID: 597, templatesID: 4, calcItem: calcItem})
 function saveCalcItem(dataObj, callback) {
     dataObj=JSON.parse(dataObj);
     projectCalcProgramsModel.findOne({projectID: dataObj.projectID}, function (err, data) {

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

@@ -163,7 +163,7 @@ let cpFeeTypes = [
     {type: 'machineDiff', name: '机械价差'},
     {type: 'adjustLabour', name: '调整人工费'},
     {type: 'adjustMachineLabour', name: '调整机上人工费'},
-    {type: 'estimate', name: '暂估'},
+    {type: 'estimate', name: '暂估费'},
     {type: 'fee1', name: '甲供材料费'},
     // 模拟用户新增
     {type: 'common', name: '工程造价'}

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

@@ -52,8 +52,10 @@ let calcProgramManage = {
         };
         me.mainSpread = sheetCommonObj.buildSheet($('#mainSpread')[0], me.mainSetting, me.datas.length);
         me.detailSpread = sheetCommonObj.buildSheet($('#detailSpread')[0], me.detailSetting, me.datas[0].calcItems.length);
-        var fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
-        fieldName.items(projectObj.project.calcProgram.compiledFeeTypeNames);
+        let arr = projectObj.project.calcProgram.compiledFeeTypeNames.slice();
+        arr.splice(arr.findIndex(function (e){return e == '暂估费'}), 1);
+        let fieldName = new GC.Spread.Sheets.CellTypes.ComboBox();
+        fieldName.items(arr);
         me.detailSpread.getSheet(0).getRange(-1, 4, -1, 1).cellType(fieldName);
 
         me.mainSpread.getSheet(0).bind(GC.Spread.Sheets.Events.EnterCell, me.onMainEnterCell);
@@ -79,10 +81,26 @@ let calcProgramManage = {
         me.detailSpread.resumePaint();
     },
     onEditEnded: function(sender, args) {
-        var me = calcProgramManage;
-        if(me.detailSetting.header[args.col].dataCode=='feeRate'){
-            var editInfo= me.getSelectionInfo();
+        let me = calcProgramManage;
+        let editInfo= me.getSelectionInfo();
+        if(me.detailSetting.header[args.col].dataCode == 'feeRate'){
             projectObj.project.FeeRate.updateFeeRateFromCalc(args.editingText,editInfo);
+        }else {
+            if(me.detailSetting.header[args.col].dataCode == 'displayFieldName'){
+                editInfo.calcItem.fieldName = projectObj.project.calcProgram.compiledFeeTypeMaps[args.editingText];
+                editInfo.calcItem.displayFieldName = args.editingText;    // 这句不入库，仅用于切换后再切换回来时界面正确显示
+            };
+
+            let data = {
+                'projectID': projectObj.project.ID(),
+                'templatesID': editInfo.template.ID,
+                'calcItem': editInfo.calcItem
+            };
+            me.saveCalcItem(data, function (rst) {
+                if (rst){
+
+                }
+            });
         }
     },
     saveCalcItem: function (data,callback) {//data

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

@@ -806,7 +806,7 @@ var projectObj = {
     setRootsStyle: function  () {
         let me = this;
         let style = new GC.Spread.Sheets.Style();
-        // style.backColor = "#82c7ee";
+        // style.backColor = "#d5e8ee";
         style.font = 'bold 15px Microsoft YaHei';
         let count = me.project.mainTree.items.length;
         for (var i = 0; i < count; i++) {