bug

web/building_saas/main/js/models/fee_rate.js

@@ -408,12 +408,20 @@ var FeeRate = {
                     $.bootstrapLoading.end();
                 }
             }
-            if(editInfo.calcItem.feeRateID && value!= null){
+/*            if(editInfo.calcItem.feeRateID && value!= null){
                 var rate = this.getFeeRateByID(editInfo.calcItem.feeRateID);
                 if(rate!=undefined){
                     this.updateFeeRateByCalc(rate,value);
                     return;
                 }
+            }*/
+            if(editInfo.calcItem.feeRateID){
+                var rate = this.getFeeRateByID(editInfo.calcItem.feeRateID);
+                if(rate!=undefined){
+                    if (value == null) value = 0;
+                    this.updateFeeRateByCalc(rate,value);
+                    return;
+                }
             }
             editInfo.calcItem.feeRate=value;
             editInfo.calcItem.feeRateID=null;

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

@@ -421,11 +421,14 @@ var projectObj = {
         let project = projectObj.project, fieldName = colSetting.data.field;
         if(node.sourceType==project.ration_glj.getSourceType()){
             project.ration_glj.updateFromMainSpread(value,node,fieldName);
-        }else if(fieldName === 'remark'){
+        }
+        else if(fieldName === 'remark'){
             projectObj.updateNodeField(node,value,'remark');
-        }  else if(calcTools.isGljRation(node)){
+        }
+        else if(calcTools.isGljRation(node)){
             gljOprObj.updateRationTypeGLJ(value,node,fieldName,editingText);
-        } else if (value !== calcFees.getFee(node.data, fieldName)||fieldName == 'quantity') {//工程量需要进行转换，所以做特殊处理
+        }
+        else if (value !== calcFees.getFee(node.data, fieldName)||fieldName == 'quantity') {//工程量需要进行转换，所以做特殊处理
             if (fieldName === 'code' && value != '' && !calcTools.isVolumePrice(node)) {
                 projectObj.updateCode(node, value);
             }