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

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

@@ -289,9 +289,19 @@ var projectObj = {
                     if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("unitPrice", node))};
                 }
                 else if (fieldName === 'calcBase') {
-                    if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("totalPrice", node))};
+                    //zhong
+                    if(value){
+                        node.data.userCalcBase = value;
+                        project.calcBase.calculate(node);
+                        if(!project.calcBase.success){
+                            let activeCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];
+                            projectObj.mainSpread.getActiveSheet().setValue(activeCell.row, activeCell.col, node.data.calcBase? node.data.calcBase: '');
+                        }
+                    }
+                    $.bootstrapLoading.end();
+                    return;
+                   // if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("totalPrice", node))};
                 };
-
                 node.changed = true;
                 if (fieldName == 'feesIndex.common.unitFee'){
                     project.calcProgram.initFeeField(node, 'common');
@@ -320,6 +330,7 @@ var projectObj = {
         } else {
             projectObj.mainController.refreshTreeNode([node], false);
         }
+        $.bootstrapLoading.end();
     },
     mainSpreadEditEnded: function (sender, info) {
         $.bootstrapLoading.start();
@@ -329,7 +340,6 @@ var projectObj = {
         let fieldName = projectObj.mainController.setting.cols[info.col].data.field;
         // 检查输入类型等
         let value = projectObj.checkSpreadEditingText(info.editingText, colSetting);
-
         projectObj.updateCellValue(node, value, colSetting);
     },
     mainSpreadRangeChanged: function (sender, info) {