From 79adced54cd04be6af72135bb4f8aad1a702fc85 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Fri, 31 Dec 2021 17:05:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget_cost.js | 20 ++++++++++++++ .../js/project_budget_cost_project_manage.js | 20 ++++++++++++++ .../static/assets/js/project_budget_income.js | 20 ++++++++++++++ .../static/assets/js/project_budget_plan.js | 27 +++++++++++++++++++ .../templates/admin/project_approve.ftl | 19 +++++++------ 5 files changed, 98 insertions(+), 8 deletions(-) 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 050a285..c90774d 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -106,6 +106,26 @@ SELECT_CATEGORY_TYPE_MAP_DATA={}; getAjax(base+"/procurement/type/map", null, initTypeCategory); });*/ +$(function () { + $("#cost-detail").click(function () { + $('#my-prompt-cost-detail').modal({ + relatedTarget: this, + closeOnConfirm:false, + onConfirm: function(e) { + //不能使用e.data，因为无法获取动态添加的 + var data = collectData("am-modal-prompt-input-cost"); + //data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false); + data = prepareAjaxDataVerify(data, COST_DETAIL, $("#id").val()); + if(data){ + postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData); + } + }, + onCancel: function(e) { + } + }); + }); +}); + //保存采购成本明细表 $(function () { $("#costTableSave").click(function () { 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 1b005d0..89cd281 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 @@ -49,6 +49,26 @@ SELECT_CATEGORY_TYPE_MAP_DATA_MANAGER={}; initTypeCategoryManage(); });*/ +$(function () { + $("#cost-project-manage-detail").click(function () { + $('#my-prompt-cost-project-manage-detail').modal({ + relatedTarget: this, + closeOnConfirm:false, + onConfirm: function(e) { + //不能使用e.data，因为无法获取动态添加的 + var data = collectData("am-modal-prompt-input-cost-project-manage"); + //data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true); + data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL, $("#id").val()); + if(data){ + postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData); + } + }, + onCancel: function(e) { + } + }); + }); +}); + //保存项目管理成本表 $(function () { 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 543e026..fc5ab3f 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -36,6 +36,26 @@ INCOME_DETAIL={ }); });*/ +$(function () { + $("#income-detail").click(function () { + $('#my-prompt-income-detail').modal({ + relatedTarget: this, + closeOnConfirm:false, + onConfirm: function(e) { + //不能使用e.data，因为无法获取动态添加的 + var data = collectData("am-modal-prompt-input-income"); + //data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val(),false); + data = prepareAjaxDataVerify(data, INCOME_DETAIL, $("#id").val()); + if(data.details){ + postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData); + } + }, + onCancel: function(e) { + } + }); + }); +}); + //保存收入明细表 $(function () { $("#incomeTableSave").click(function () { 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 240f7ff..0270cbe 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -63,6 +63,33 @@ BUDGET_PLAN_DETAIL={ });*/ +$(function () { + $(".budget-plan-detail").click(function () { + $('#my-prompt-budget-plan-detail').modal({ + relatedTarget: this, + closeOnConfirm:false, + onConfirm: function(e) { + //校验数据正确性 + var message = verifyBudgetPlan(); + if (message) { + layuiAlert(message); + return; + } + //不能使用e.data，因为无法获取动态添加的 + var data = collectData("am-modal-prompt-input-budget-plan-detail"); + //data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false); + data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL, $("#id").val()); + if(data){ + postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData); + } + }, + onCancel: function(e) { + } + }); + }); +}); + + //保存资金计划表 $(function () { $("#budgetPlanDetailTableSave").click(function () { diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 8e1d3a0..e82c6b6 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -430,6 +430,9 @@ 收入 收入明细表 + 采购成本明细表 + 项目管理成本表 + 资金计划表 @@ -465,8 +468,8 @@
成本 - 采购成本明细表 - 项目管理成本表 + <#-- 采购成本明细表 + 项目管理成本表--> @@ -528,7 +531,7 @@
管理 - 资金计划表 + <#--资金计划表--> @@ -576,7 +579,7 @@
现金流量表 - 资金计划表 + <#--资金计划表--> @@ -1377,7 +1380,7 @@
-
新增销售收入明细表——${project.name}
+
销售收入明细表——${project.name}
@@ -1462,7 +1465,7 @@
-
新增采购成本明细表——${project.name}
+
采购成本明细表——${project.name}
@@ -1557,7 +1560,7 @@
-
新增项目管理成本明细表——${project.name}
+
项目管理成本明细表——${project.name}
@@ -1658,7 +1661,7 @@
-
新增资金计划明细表——${project.name}
+
资金计划明细表——${project.name}