From ac1bec1302e348813f983a3b88413a1f5e2e2329 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 19 Apr 2022 11:02:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E7=9C=8B=E5=A4=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=80=BB=E8=AE=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/backend/ProjectController.java |  8 +++
 .../templates/admin/project_approve.ftl       | 58 ++++++++++++++++++-
 .../templates/admin/project_budget_edit.ftl   | 44 +++++++-------
 3 files changed, 85 insertions(+), 25 deletions(-)

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 4e4f86d..4a6b850 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -389,6 +389,11 @@ public class ProjectController extends BaseController {
         model.put("project", project);
         model.put("listFrom", listFrom);
 
+        model.put("planStartStr", project.getPlanStartStr());
+        model.put("planStartDate", project.getPlanStartStr());
+        model.put("planEndStr", project.getPlanEndStr());
+        model.put("planEndDate", project.getPlanEndStr());
+
         //概算信息
         EstimateBean estimateBean = projectEstimateService.getEstimate(project);
         model.put("estimateBean", estimateBean);
@@ -399,10 +404,13 @@ public class ProjectController extends BaseController {
         model.put("budgetBean", budgetBean);
         //收入明细
         model.put("incomeDetails", projectBudgetService.getBudgetIncomeDetail(project));
+        model.put("incomeTotalAmount", projectBudgetService.getBudgetIncomeAmount(project));
         //成本明细
         model.put("costDetails", projectBudgetService.getBudgetCostDetail(project));
+        model.put("costTotalAmount", projectBudgetService.getBudgetCostAmount(project));
         //项目管理成本明细
         model.put("costProjectManageDetails", projectBudgetService.getBudgetCostProjectManageDetail(project));
+        model.put("costProjectManageTotalAmount", projectBudgetService.getBudgetCostProjectManageAmount(project));
         List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(project);
         //资金计划明细
         model.put("projectBudgetPlanDetails", projectBudgetPlanDetails);
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 21d7848..43251ca 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -503,7 +503,18 @@
                                                 </tr>
                                             </#list>
                                         </#if>
-
+                                        <tr class="total-new" id="incomeTotal">
+                                            <td>总计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-amount-income" value="${incomeTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-include-income" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-exclude-income" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly></td>
+                                            <td></td>
+                                        </tr>
                                         </tbody>
                                     </table>
                                 </div>
@@ -591,7 +602,19 @@
                                                 </tr>
                                             </#list>
                                         </#if>
-
+                                        <tr class="total-new" id="costTotal">
+                                            <td>总计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-amount-cost" value="${costTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0')}" readonly></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-exclude-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxExclude,'0')}" readonly></td>
+                                            <td></td>
+                                        </tr>
                                         </tbody>
                                     </table>
                                 </div>
@@ -684,12 +707,41 @@
                                                 </tr>
                                             </#list>
                                         </#if>
-
+                                        <tr class="total-new" id="manageTotal">
+                                            <td>总计</td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage" value="${costProjectManageTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
+                                            <td></td>
+                                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                            <td></td>
+                                        </tr>
                                         </tbody>
                                     </table>
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab34">
                                     <#--<span class="am-text-lg">资金计划表</span>-->
+                                    <input type="hidden" id="planStartDate" name="planStartDate" value='${planStartDate!""}'/>
+                                    <input type="hidden" id="planEndDate" name="planEndDate" value='${planEndDate!""}'/>
+                                    <td width="700px">
+                                        <div class="am-u-sm-10">
+                                            <div class="am-form am-form-inline">
+                                                <div class="am-form-group am-form-icon">
+                                                    <input type="text" id="planStartStr" name="planStartStr" placeholder="开始日期(请选择)" autocomplete="off" readonly value="${planStartStr!}">
+                                                </div>
+                                                <div class="am-form-group">至</div>
+                                                <div class="am-form-group am-form-icon">
+                                                    <input type="text" id="planEndStr" name="planEndStr" placeholder="结束日期(请选择)" autocomplete="off" readonly value="${planEndStr!}">
+                                                </div>
+                                                <div class="am-form-group">必填</div>
+                                            </div>
+                                        </div>
+                                    </td>
                                     <table class="am-table table-main" style="display: block;border-collapse: collapse;width: 1700px;overflow-x: scroll;padding:0;"
                                            id="budgetPlanDetailTable">
                                         <thead style="display: inline-block;overflow-x: scroll;width: 200px;">
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 73e6614..467050c 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -407,13 +407,13 @@
                             </#list>
                         </#if>
                         <tr class="total-new" id="incomeTotal">
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="" readonly></td>
-                            <td><input style="width: 80px;float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="总计" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="" readonly></td>
+                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="总计" readonly></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
                             <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-amount-income" value="${incomeTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income" value="" readonly></td>
+                            <td></td>
+                            <td></td>
                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-include-income" value="${Utils.format(budgetBean.incomeTotalTaxInclude,'0')}" readonly></td>
                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-income input-changeable-total-total-tax-exclude-income" value="${Utils.format(budgetBean.incomeTotalTaxExclude,'0')}" readonly></td>
                             <td></td>
@@ -488,14 +488,14 @@
                             </#list>
                         </#if>
                         <tr class="total-new" id="costTotal">
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
-                            <td><input style="width: 80px;float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="总计" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
+                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="总计" readonly></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
                             <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-amount-cost" value="${costTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost" value="" readonly></td>
+                            <td></td>
+                            <td></td>
                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0')}" readonly></td>
                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-exclude-cost" value="${Utils.format(budgetBean.costPurchaseTotalTaxExclude,'0')}" readonly></td>
                             <td></td>
@@ -574,17 +574,17 @@
                             </#list>
                         </#if>
                         <tr class="total-new" id="manageTotal">
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
-                            <td><input style="width: 80px;float: left;" type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="总计" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
+                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="总计" readonly></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
                             <td><input type="number" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage" value="${costProjectManageTotalAmount!0}" readonly <#--onkeyup="integerNumber(this)"-->></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
+                            <td></td>
                             <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
-                            <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="" readonly></td>
+                            <td></td>
+                            <td></td>
+                            <td></td>
                             <td></td>
                         </tr>