debug

web/building_saas/main/js/views/calc_base_view.js

@@ -295,7 +295,7 @@ let calcBaseView = {
             if(me.curType === me.type.bills){
                 let selected = projectObj.project.mainTree.selected;
                 projectObj.updateCellValue(selected, me.getInputExpr(), {data: {field: 'calcBase'}});
-                if(projectObj.project.calcBase.success){
+                if(projectObj.project.calcBase.success || selected.data.calcBase === me.getInputExpr()){
                     //$('#qd-jsjs').modal('hide');
                     $('#calcBaseFeeRate').modal('hide');
                 }

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

@@ -2858,10 +2858,16 @@ $('#calcBaseFeeRateConf').click(function () {
     if(validateFeeRate){
         feeRateObject.submitFeeRateFromBill();
     }
+    else {
+        if(calcBaseValue === calcBaseValue){
+            $('#calcBaseFeeRate').modal('hide');
+        }
+    }
     if(!projectObj.project.calcBase.success){
         return;
     }
     else if((!validateFeeRate || selected.data.feeRateID === parseInt(feeRateObject.feeRateSelection.ID)) && needToSave) {
         projectObj.project.calcProgram.calcAndSave(selected);
+        $('#calcBaseFeeRate').modal('hide');
     }
 });