From 07a6165c2a816a4a00794b5a9169cbc388d38430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com> Date: Thu, 31 Oct 2024 13:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget_income.js | 4 +- .../static/assets/js/project_budget_plan.js | 24 ++++----- .../templates/admin/project_approve.ftl | 12 ++--- .../templates/admin/project_budget_edit.ftl | 54 +++++++++++-------- 4 files changed, 53 insertions(+), 41 deletions(-) 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 881b4e2..8c5c5da 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -168,9 +168,9 @@ function appendTrIncome() { ' \n' + ' ' + '' + - '' + ' ' + - '' + + '' + '' + '' + ' \n' + 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 909505c..42f7f80 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -9,7 +9,7 @@ BUDGET_PLAN_DETAIL2={ "serviceCost ":[false,"服务付款","number"], "otherCost":[false,"其他付款","number"], "projectManageCost":[false,"经营性开支","number"], - "earnestMoneyCost":[false,"保证金支出","number"], + "earnestMoneyCost":[false,"保证金付款","number"], "totalCost":[false,"支出合计","number"], "saleIncome":[false,"销售收款","number"], "earnestMoneyIncome":[false,"保证金收款","number"], @@ -27,7 +27,7 @@ BUDGET_PLAN_DETAIL={ "serviceCost ":[false,"服务付款","number"], "otherCost":[false,"其他付款","number"], "projectManageCost":[true,"经营性开支","number"], - "earnestMoneyCost":[true,"保证金支出","number"], + "earnestMoneyCost":[true,"保证金付款","number"], "totalCost":[true,"支出合计","number"], "saleIncome":[true,"销售收款","number"], "earnestMoneyIncome":[true,"保证金收款","number"], @@ -356,7 +356,7 @@ function verifyBudgetPlan(){ //从采购成本明细中取“设备”大类下的总计---设备支出 if(costPurchaseDeviceTaxInclude != input_total_device_cost_budget_plan){ - return "采购成本明细中取“设备”费用项目下的总计["+costPurchaseDeviceTaxInclude+"]与资金计划表中设备支出["+input_total_device_cost_budget_plan+"]不等"; + return "采购成本明细中取“设备”费用项目下的总计["+costPurchaseDeviceTaxInclude+"]与资金计划表中设备付款["+input_total_device_cost_budget_plan+"]不等"; } //从采购成本明细中取“服务+施工+其他”大类的总计---工程支出 var t = f2(f2(costPurchaseBuildTaxInclude)+f2(costPurchaseServiceTaxInclude)+f2(costPurchaseOtherTaxInclude)); @@ -372,9 +372,9 @@ function verifyBudgetPlan(){ if(incomeTotalTaxInclude != input_total_sale_income_budget_plan){ return "销售收入明细金额["+incomeTotalTaxInclude+"]与资金计划表中销售收款["+input_total_sale_income_budget_plan+"]不等"; } - //保证金支出和收入一致 + //保证金付款和收入一致 if(input_total_earnest_money_cost_budget_plan != input_total_earnest_money_income_budget_plan){ - return "资金计划表中保证金支出["+input_total_earnest_money_cost_budget_plan+"]与保证金收款["+input_total_earnest_money_income_budget_plan+"]不等"; + return "资金计划表中保证金付款["+input_total_earnest_money_cost_budget_plan+"]与保证金收款["+input_total_earnest_money_income_budget_plan+"]不等"; } return ""; @@ -545,7 +545,7 @@ function bindChangeableInputBudgetPlanDetail() { //设备支出改变 $(".input-changeable-device-cost-budget-plan").change(function () { var deviceCost = f2($(this).val()); - //找到对应的工程支出、经营性支出、保证金支出 + //找到对应的工程支出、经营性支出、保证金付款 var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val()); var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); @@ -563,7 +563,7 @@ function bindChangeableInputBudgetPlanDetail() { //工程支出改变 $(".input-changeable-projectCost-cost-budget-plan").change(function () { var engineerCost = f2($(this).val()); - //找到对应的设备支出、经营性支出、保证金支出 + //找到对应的设备支出、经营性支出、保证金付款 var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val()); var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); @@ -582,7 +582,7 @@ function bindChangeableInputBudgetPlanDetail() { }); $(".input-changeable-serviceCost-cost-budget-plan").change(function () { var engineerCost = f2($(this).val()); - //找到对应的设备支出、经营性支出、保证金支出 + //找到对应的设备支出、经营性支出、保证金付款 var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val()); var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); @@ -601,7 +601,7 @@ function bindChangeableInputBudgetPlanDetail() { }); $(".input-changeable-otherCost-cost-budget-plan").change(function () { var engineerCost = f2($(this).val()); - //找到对应的设备支出、经营性支出、保证金支出 + //找到对应的设备支出、经营性支出、保证金付款 var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val()); var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); @@ -621,7 +621,7 @@ function bindChangeableInputBudgetPlanDetail() { //经营性支出改变 $(".input-changeable-project-manage-cost-budget-plan").change(function () { var projectManageCost = f2($(this).val()); - //找到对应的设备支出、工程支出、保证金支出 + //找到对应的设备支出、工程支出、保证金付款 var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val()); var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val()); var earnestMoneyCost = f2($(this).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); @@ -639,14 +639,14 @@ function bindChangeableInputBudgetPlanDetail() { //保证金改变 $(".input-changeable-earnest-money-cost-budget-plan").change(function () { var earnestMoneyCost = f2($(this).val()); - //找到对应的设备支出、经营性支出、保证金支出 + //找到对应的设备支出、经营性支出、保证金付款 var deviceCost = f2($(this).parent().parent().find(".input-changeable-device-cost-budget-plan").val()); var engineerCost = f2($(this).parent().parent().find(".input-changeable-engineer-cost-budget-plan").val()); var projectManageCost = f2($(this).parent().parent().find(".input-changeable-project-manage-cost-budget-plan").val()); //更新本月所有项支出 $(this).parent().parent().find(".input-changeable-total-cost-budget-plan").val(f2Fixed(deviceCost+engineerCost+projectManageCost+earnestMoneyCost)); - //更新所有月保证金支出总额 + //更新所有月保证金付款总额 updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-earnest-money-cost-budget-plan"); updateBudgetPlanTotal("input-changeable-earnest-money-cost-budget-plan","input-total-title-earnest-money-cost-budget-plan"); //更新所有月支出总额 diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index be896d0..8e9c4d5 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -852,7 +852,7 @@ -
+
@@ -1114,15 +1114,15 @@
-
+
- - ${projectBudget.costDetailAttr} + ${projectBudget.costDetailAttrName}
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index 54c9185..2cf6f8a 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -428,8 +428,12 @@ + + @@ -885,7 +889,7 @@ -
+
@@ -1107,18 +1111,19 @@
-
+
- ${projectBudget.costDetailAttr} + ${projectBudget.costDetailAttrName}
-
+
@@ -1177,7 +1182,7 @@ - type="text" + type="text" <#else>type="hidden" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name" value="${costDetail.category!}"> @@ -1311,56 +1316,58 @@
- style="display:none" <#else>style="float: left;" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category"> <#if costProjectManageDetail.type == 1> <#if costProjectManageDetail.type == 2> <#if costProjectManageDetail.type == 4> - type="text" - <#else>type="hidden" - class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage am-modal-prompt-input-cost-project-manage-category2" - value="${costProjectManageDetail.name!}"> + type="text" + <#else>type="hidden" + class="am-modal-prompt-input + am-modal-prompt-input-cost-project-manage + am-modal-prompt-input-cost-project-manage-category2" + value="${costProjectManageDetail.name}">