修改跳转和字段

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<ProjectBudgetCostDetail> 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);
     }

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");

src/main/resources/templates/admin/project_approve.ftl

@@ -535,7 +535,7 @@
                                 <ul class="am-tabs-nav am-nav am-nav-tabs">
                                     <li class="am-active"><a href="#tab35">预算信息</a></li>
                                     <li><a href="#tab31">收入明细表</a></li>
-                                    <li><a href="#tab36">收入计划表</a></li>
+                                    <li><a href="#tab36">收款计划表</a></li>
                                     <li><a href="#tab32">采购成本明细表</a></li>
                                     <li><a href="#tab33">项目管理成本表</a></li>
                                     <li><a href="#tab34">资金计划表</a></li>

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -200,7 +200,7 @@
                 <li class="am-active"><a href="#tab1">项目立项（概算）基本信息</a></li>
                 <li><a href="#tab2">项目立项（概算）其他信息</a></li>
                 <li><a href="#tab3">收入明细表</a></li>
-                <li><a href="#tab8">收入计划表</a></li>
+                <li><a href="#tab8">收款计划表</a></li>
                 <li><a href="#tab4">采购成本明细表</a></li>
                 <li><a href="#tab5">项目管理成本表</a></li>
                 <li><a href="#tab6">资金计划表</a></li>

src/main/resources/templates/admin/project_list_approve.ftl

@@ -449,7 +449,7 @@
                             <tr>
                                 <td width="60px">${list.tempId!}</td>
                                 <td class="huanhang" width="120px">${list.projectNo!}</td>
-                                <td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve(${list.id})">${list.name!}</a></td>
+                                <td class="huanhang" width="480px"><a style="cursor: pointer;text-decoration:none" onclick="approve2(${list.id})">${list.name!}</a></td>
                                 <td>${list.typeDesc!}</td>
                                 <td>${list.underwrittenModeStr!}</td>
                                 <td>${Utils.format(list.advanceInterestAmount, "0.00")}</td>
@@ -625,4 +625,12 @@
 
     });
 
+    var approve2 = function (id) {
+        var pageNumber = $("#pageNumber").val();
+        var keywords = $("#keywords").val();
+        keywords = keywords.replace(/\{/g, '%7b').replace(/\}/g, '%7d');
+        console.log("keywords: " + keywords);
+        location.href = '${base}/project/approve?listFrom=list&type=2&id=' + id + '&pageNumber=' + pageNumber + '&keywords=' + keywords;
+    };
+
 </script>