diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index f59af9c..713abbd 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -354,20 +354,6 @@ $(function () { $("#pmsForm").submit(); }); - function checkName() { - var name = $("#name").val(); - var id = $("#id").val(); - $.ajax({ - url: base + "/project/checkName", - data: {name: name, id: id}, - type: "post", - dataType: "json", - async: false, - success: function (data) { - result = data.status; - } - }); - }; }); //立项表填写检查 @@ -554,10 +540,10 @@ function checkIfFillIn() { * 判断是否重名 */ function checkName() { - var name = $("#name").val(); + var name = $("#nameBudget").val(); var id = $("#id").val(); $.ajax({ - url: "${base}/project/checkName", + url: base+"/project/checkName", data: {name: name, id: id}, type: "post", dataType: "json", 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 3ec5584..d1293a5 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -973,7 +973,7 @@ function updateCashFlow() { var underwrittenPlan = classVal("input-total-underwritten-plan-budget-plan"); var repaymentPlan = classVal("input-total-repayment-plan-budget-plan"); - var d = f2(f2(deviceCost)+f2(engineerCost)); + var d = f2(engineerCost); var f = f2(f2(projectManageCost)+f2(earnestMoneyCost)+f2(capitalInterest)); var g = f2(f2(saleIncome)+0+f2(earnestMoneyIncome)-d-0-f); var m = f2(f2(underwrittenPlan)-f2(repaymentPlan));