zhangweicheng 7 年 前
コミット
a0f47207ef

+ 2 - 0
web/building_saas/main/js/views/calc_program_manage.js

@@ -120,11 +120,13 @@ let calcProgramManage = {
                 if(!result.error){
                     if(callback){
                         callback(result);
+                        return;
                     }
                 }
                 else{
                     alert('失败:' + result.message);
                 }
+                $.bootstrapLoading.end();
             }
         })
     },

+ 3 - 0
web/building_saas/main/js/views/fee_rate_view.js

@@ -648,6 +648,7 @@ var feeRateObject={
     submitFeeRateFromBill:function () {
        var rate = feeRateObject.feeRateSelection;
        var selected = projectObj.project.mainTree.selected;
+        $.bootstrapLoading.start();
         projectObj.project.FeeRate.submitFeeRateFromBill(rate,selected.data,function (data) {
             selected.data.feeRateID=rate.ID.toString();
             selected.data.feeRate=scMathUtil.roundToString(rate.rate,getDecimal("feeRate"));
@@ -663,9 +664,11 @@ var feeRateObject={
         calInfo.calcItem.feeRateID=rate.ID;
         calInfo.calcItem.feeRate=null;
         var data={'projectID': projectObj.project.ID(),'templatesID': calInfo.template.ID,'calcItem': calInfo.calcItem};
+        $.bootstrapLoading.start();
         calcProgramManage.saveCalcItem(data,function (result) {
             calInfo.calcItem.feeRate=rate.rate;
             projectObj.project.calcProgram.compileAllTemps();
+            projectObj.project.calcProgram.calcAllNodesAndSave();
             calcProgramManage.refreshDetailSheet();
             $("#fee_rate_tree").modal('hide');
         });