bug fixed

web/building_saas/main/js/views/fee_rate_view.js

@@ -202,7 +202,7 @@ var feeRateObject={
         let rowIdx = 0, pID = 0;
         if (fID){
             rowIdx = _.findIndex(rates,{ID:fID});
-            pID = rates[rowIdx].ParentID;
+            if(rowIdx != -1) pID = rates[rowIdx].ParentID;
         }
         // 费率现有可能有多层节点，所以要递归展开父节点
         if(pID) expandParent(pID,rates,sheet);
@@ -819,9 +819,10 @@ var feeRateObject={
     submitFeeRateFromBill:function () {
        var rate = feeRateObject.feeRateSelection;
        var selected = projectObj.project.mainTree.selected;
+       if(selected.data.feeRateID === parseInt(rate.ID)) return $("#calcBaseFeeRate").modal('hide');
         $.bootstrapLoading.start();
         projectObj.project.FeeRate.submitFeeRateFromBill(rate,selected.data,function (data) {
-            selected.data.feeRateID=rate.ID.toString();
+            selected.data.feeRateID= parseInt(rate.ID);
             selected.data.feeRate=scMathUtil.roundToString(rate.rate,getDecimal("feeRate"));
             selected.changed = true;
             projectObj.project.calcProgram.calcAndSave(selected);

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

@@ -2802,12 +2802,12 @@ $('#calcBaseFeeRateConf').click(function () {
         selected.data.userCalcBase = calcBaseValue;
         projectObj.project.calcBase.calculate(selected);
     }
-    if(!projectObj.project.calcBase.success){
-        return;
-    }
     if(validateFeeRate){
         feeRateObject.submitFeeRateFromBill();
     }
+    if(!projectObj.project.calcBase.success){
+        return;
+    }
     else if(!validateFeeRate && needToSave) {
         projectObj.project.calcProgram.calcAndSave(selected);
     }