From 96c2c826626e678c9f6baeefdcbd027cc500a222 Mon Sep 17 00:00:00 2001 From: xxssyyyyssxx Date: Mon, 8 Nov 2021 14:41:33 +0800 Subject: [PATCH] =?UTF-8?q?ajax=E7=9A=84=E5=9B=9E=E8=B0=83data=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget.js | 14 -------------- .../static/assets/js/project_budget_cost.js | 5 +++-- .../js/project_budget_cost_project_manage.js | 5 +++-- .../static/assets/js/project_budget_income.js | 5 +++-- .../static/assets/js/project_budget_plan.js | 5 +++-- .../static/assets/js/project_common.js | 18 ++++++++++++++++-- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 7d3ea2b..1018a4a 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/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); } \ No newline at end of file diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index 1c81252..9065897 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/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; diff --git a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js b/src/main/resources/static/assets/js/project_budget_cost_project_manage.js index 886e768..b6ce589 100644 --- a/src/main/resources/static/assets/js/project_budget_cost_project_manage.js +++ b/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"]); diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js index c9ed111..f615648 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/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; diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js index 2a5103c..47d4321 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/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()); //更新项目贡献率 diff --git a/src/main/resources/static/assets/js/project_common.js b/src/main/resources/static/assets/js/project_common.js index f890fa4..de580d0 100644 --- a/src/main/resources/static/assets/js/project_common.js +++ b/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); } }); }