ajax的回调data优化

src/main/resources/static/assets/js/project_budget.js

@@ -69,18 +69,4 @@ function updateProjectContributionProfitRate() {
     $("input[name='projectGrossProfitRate']").val(projectGrossProfitRate);
     $("input[name='projectContributionProfit']").val(projectContributionProfit);
     $("input[name='projectContributionProfitRate']").val(projectContributionProfitRate);
-}
-
-/**
- * 计算利润率
- * @param r1
- * @param r2
- * @returns {*}
- */
-function rate(r1,r2) {
-    if(!r1 || !r2 || r1==0 || r2==0){
-        return 0;
-    }
-
-    return f2(r1*100/r2);
 }

src/main/resources/static/assets/js/project_budget_cost.js

@@ -10,7 +10,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost");
                 data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val());
-                saveDetail(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
+                postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
             },
             onCancel: function(e) {
             }
@@ -63,7 +63,8 @@ function appendTrCost() {
 /**
  * 更新页面收入的数据【累加】
  */
-function updateCostData(details) {
+function updateCostData(data, returnData) {
+    var details = data.details;
     var deviceTaxInclude = 0;
     var deviceTaxExclude = 0;
     var buildTaxInclude = 0;

src/main/resources/static/assets/js/project_budget_cost_project_manage.js

@@ -10,7 +10,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-cost-project-manage");
                 data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val());
-                saveDetail(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
+                postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
             },
             onCancel: function(e) {
             }
@@ -74,7 +74,8 @@ function bindChangeableInputProjectManage() {
 /**
  * 更新页面收入的数据【累加】
  */
-function updateCostProjectManageData(details) {
+function updateCostProjectManageData(data,returnData) {
+    var details = data.details;
     var total = 0;
     details.forEach(function (t, number, ts) {
         total += f2(t["total"]);

src/main/resources/static/assets/js/project_budget_income.js

@@ -11,7 +11,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-income");
                 data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val());
-                saveDetail(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
+                postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
             },
             onCancel: function(e) {
             }
@@ -26,7 +26,8 @@ $(function () {
 /**
  * 更新页面收入的数据【累加】
  */
-function updateIncomeData(incomeDetails) {
+function updateIncomeData(data,returnData) {
+    var incomeDetails = data.details;
     var deviceTaxInclude = 0;
     var deviceTaxExclude = 0;
     var engineerTaxInclude = 0;

src/main/resources/static/assets/js/project_budget_plan.js

@@ -19,7 +19,7 @@ $(function () {
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-budget-plan-detail");
                 data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val());
-                saveDetail(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
+                postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
             },
             onCancel: function(e) {
             }
@@ -527,7 +527,8 @@ function updateUnderwrittenInfo() {
 /**
  * 更新页面收入的数据
  */
-function updateBudgetPlanDetailData(details) {
+function updateBudgetPlanDetailData(data,returnData) {
+    //var details = data.details;
     //主页面上的财务费用
     $("input[name='costExpropriationTaxExclude']").val($(".input-underwritten-plan-statistic-capital-interest-budget-plan").val());
     //更新项目贡献率

src/main/resources/static/assets/js/project_common.js

@@ -16,6 +16,20 @@ function f2(x) {
 }
 
 
+/**
+ * 计算利润率
+ * @param r1
+ * @param r2
+ * @returns {*}
+ */
+function rate(r1,r2) {
+    if(!r1 || !r2 || r1==0 || r2==0){
+        return 0;
+    }
+
+    return f2(r1*100/r2);
+}
+
 /**
  * 一维数组变二维数组
  * @param list
@@ -103,7 +117,7 @@ function prepareAjaxData(data,detailPropertyArr,projectId){
     };
 }
 
-function saveDetail(url, data, callback) {
+function postAjax(url, data, callback) {
     $.ajax({
         url: url,
         data: JSON.stringify(data),
@@ -113,7 +127,7 @@ function saveDetail(url, data, callback) {
         async: false,
         success: function (d) {
             console.log(d);
-            callback(data.details);
+            callback(data, d);
         }
     });
 }