diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index 181a758..11f5210 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -199,7 +199,7 @@ public class ProjectController extends BaseController { BigDecimal incomePlanTotalReceiveAmount = projectBudgetService.getBudgetIncomePlanReceiveAmount(project); String[] headers6 = {"序号", "收款节点", "收款时间", "收款金额(元)"}; String[] columns6 = {"tempId", "receivePoint", "receiveTime", "receiveAmount"}; - exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收入计划表", outputStream); + exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收款计划表", outputStream); //成本明细 List budgetCostDetail = projectBudgetService.getBudgetCostDetail(project); Integer costTotalAmount = projectBudgetService.getBudgetCostAmount(project); @@ -1170,7 +1170,7 @@ public class ProjectController extends BaseController { @RequestMapping("/incomePlanExport") public void incomePlanExport(HttpServletResponse response, @RequestParam int id) throws Exception{ Project project = projectService.findById(id); - response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收入计划表")).getBytes(), StandardCharsets.ISO_8859_1))); + response.setHeader("Content-Disposition", "attachment;filename=".concat(new String((Utils.generateExcelName(project.getName() + "-收款计划表")).getBytes(), StandardCharsets.ISO_8859_1))); response.setHeader("Connection", "close"); response.setHeader("Content-Type", "application/vnd.ms-excel"); ServletOutputStream outputStream = response.getOutputStream(); @@ -1181,7 +1181,7 @@ public class ProjectController extends BaseController { BigDecimal incomePlanTotalReceiveAmount = projectBudgetService.getBudgetIncomePlanReceiveAmount(project); String[] headers6 = {"序号", "收款节点", "收款时间", "收款金额(元)"}; String[] columns6 = {"tempId", "receivePoint", "receiveTime", "receiveAmount"}; - exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收入计划表", outputStream); + exportExcelUtils.exportIncomePlanDetailExcel(headers6, columns6, project, budgetBean, budgetIncomePlanDetail, incomePlanTotalReceiveAmount, "yyyy-MM-dd", 0, "收款计划表", outputStream); exportExcelUtils.end(outputStream); } diff --git a/src/main/resources/static/assets/js/project_budget_income_plan.js b/src/main/resources/static/assets/js/project_budget_income_plan.js index 2198aee..ad78999 100644 --- a/src/main/resources/static/assets/js/project_budget_income_plan.js +++ b/src/main/resources/static/assets/js/project_budget_income_plan.js @@ -29,7 +29,7 @@ $(function () { }); }); -//保存收入计划表 +//保存收款计划表 $(function () { $("#incomePlanTableSave").click(function () { var data = collectData("am-modal-prompt-input-income-plan"); diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl index 5f26fcc..2819a5a 100644 --- a/src/main/resources/templates/admin/project_approve.ftl +++ b/src/main/resources/templates/admin/project_approve.ftl @@ -535,7 +535,7 @@