From f0c7c995418543a6f507e81bfdfeff33c2336287 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Tue, 23 Nov 2021 16:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=98=BE=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_final.js         | 26 +++++++--------
 .../templates/admin/project_approve.ftl       | 32 +++++++++----------
 .../templates/admin/project_final_add.ftl     |  4 +--
 .../templates/admin/project_final_edit.ftl    |  4 +--
 4 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/static/assets/js/project_final.js b/src/main/resources/static/assets/js/project_final.js
index 4efd6d3..d4fb114 100644
--- a/src/main/resources/static/assets/js/project_final.js
+++ b/src/main/resources/static/assets/js/project_final.js
@@ -49,17 +49,17 @@ function calculateFinal() {
 
 
     $("input[name='saleIncomeCash']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='taxReturn']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='earnestMoneyIncome']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
     });
@@ -69,46 +69,46 @@ function calculateFinal() {
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='taxCost']").change(function () {
-        calCashFluxFinalTotal();
+       // calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='earnestMoneyCost']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calNetCashFlow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='netCashFlow']").change(function () {
-        calCashFluxFinalTotal();
+       // calCashFluxFinalTotal();
     });
     $("input[name='cashInflowFromInvestingActivities']").change(function () {
-        calCashFluxFinalTotal();
+       // calCashFluxFinalTotal();
         calNetCashFromInvestingActivities();
         calNetIncreaseMonetaryFunds();
     })
     $("input[name='cashOutflowFromInvestingActivities']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calNetCashFromInvestingActivities();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='netCashFromInvestingActivities']").change(function () {
-        calCashFluxFinalTotal();
+       // calCashFluxFinalTotal();
     });
     $("input[name='financingCapitalInflow']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calFinancingCapitalCashflow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='financingCapitalOutflow']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
         calFinancingCapitalCashflow();
         calNetIncreaseMonetaryFunds();
     });
     $("input[name='financingCapitalCashflow']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
     });
     $("input[name='netIncreaseMonetaryFunds']").change(function () {
-        calCashFluxFinalTotal();
+        //calCashFluxFinalTotal();
     });
 
 
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 2066a27..949faeb 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -99,13 +99,13 @@
                 <div class="am-tabs am-margin" data-am-tabs>
                     <ul class="am-tabs-nav am-nav am-nav-tabs">
                         <li class="am-active"><a href="#tab1">项目基本信息</a></li>
-                    <#if project.status==1>
+                    <#if project.status==1 || project.status==5 || project.status==10 || project.status==15>
                         <li><a href="#tab2">项目概算信息</a></li>
                     </#if>
-                    <#if project.status==5>
+                    <#if project.status==5 || project.status==10 || project.status==15>
                         <li><a href="#tab3">项目预算信息</a></li>
                     </#if>
-                    <#if project.status==10>
+                    <#if project.status==10 || project.status==15>
                         <li><a href="#tab4">项目结算信息</a></li>
                     </#if>
                     <#if project.status==15>
@@ -255,13 +255,13 @@
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab2">
-                            <#if project.status ==1 && project.approveStatusEstimate == 1>
+                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1>
                                 <div class="approve-topass"></div>
                             </#if>
-                            <#if project.status ==1 && project.approveStatusEstimate == 2>
+                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2>
                                 <div class="approve-passed"></div>
                             </#if>
-                            <#if project.status ==1 && project.approveStatusEstimate == 3>
+                            <#if (project.status==1 || project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
                             <span class="am-text-lg">收入</span>
@@ -407,13 +407,13 @@
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab3">
-                            <#if project.status ==5 && project.approveStatusEstimate == 1>
+                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 1>
                                 <div class="approve-topass"></div>
                             </#if>
-                            <#if project.status ==5 && project.approveStatusEstimate == 2>
+                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 2>
                                 <div class="approve-passed"></div>
                             </#if>
-                            <#if project.status ==5 && project.approveStatusEstimate == 3>
+                            <#if (project.status==5 || project.status==10 || project.status==15) && project.approveStatusEstimate == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
                             <span class="am-text-lg">收入</span>
@@ -630,13 +630,13 @@
 
                     <div class="am-tabs-bd">
                         <div class="am-tab-panel am-fade am-in" id="tab4">
-                            <#if project.status ==10 && project.approveStatusEstimate == 1>
+                            <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 1>
                                 <div class="approve-topass"></div>
                             </#if>
-                            <#if project.status ==10 && project.approveStatusEstimate == 2>
+                            <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 2>
                                 <div class="approve-passed"></div>
                             </#if>
-                            <#if project.status ==10 && project.approveStatusEstimate == 3>
+                            <#if (project.status==10 || project.status==15) && project.approveStatusEstimate == 3>
                                 <div class="approve-nopass"></div>
                             </#if>
                             <input name="id" id="id" type="hidden" value="${project.id}" />
@@ -985,14 +985,14 @@
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="netIncreaseMonetaryFunds" value="${Utils.format(monthBean.netIncreaseMonetaryFunds,'0')}" required readonly title="本月结算金额"></td>
                                     <td><input name="netIncreaseMonetaryFundsSettle" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly title="结算总额"></td>
                                 </tr>
-                                <tr>
+                                <#--<tr>
                                     <td>合计</td>
                                     <td><input name="cashFlowBudgetTotal" type="number" value="${Utils.format(cashFlowBean.saleIncomeCash + cashFlowBean.earnestMoneyIncome + cashFlowBean.purchaseCost + cashFlowBean.earnestMoneyCost + cashFlowBean.getNetCashFlow() +
                                         cashFlowBean.financingCapitalInflow + cashFlowBean.financingCapitalOutflow + cashFlowBean.getFinancingCapitalCashflow() + cashFlowBean.getNetIncreaseMonetaryFunds(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="cashFlowFormerSettleTotal" type="number" value="${Utils.format(formerBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="cashFlowTotal" type="number" value="${Utils.format(monthBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="cashFlowSettleTotal" type="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
-                                </tr>
+                                </tr>-->
                                 </tbody>
                             </table>
                         </div>
@@ -1311,12 +1311,12 @@
                                     <td><input name="type14SettleTotal" type="number" value="${Utils.format(currentBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
                                     <td><input name="netIncreaseMonetaryFunds" type="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" required readonly title="决算总额"></td>
                                 </tr>
-                                <tr>
+                                <#--<tr>
                                     <td>合计</td>
                                     <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(currentBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                                     <td><input name="cashFluxFinalTotal" type="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
-                                </tr>
+                                </tr>-->
                                 </tbody>
                             </table>
                         </div>
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index 69fd1d7..2a24e9e 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -333,12 +333,12 @@
                         <td><input name="type14SettleTotal" type="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
                         <td><input name="netIncreaseMonetaryFunds" type="number" readonly required title="决算总额"></td>
                     </tr>
-                    <tr>
+                    <#--<tr>
                         <td>合计</td>
                         <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
                         <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                         <td><input name="cashFluxFinalTotal" type="number" readonly required title="此列累计"></td>
-                    </tr>
+                    </tr>-->
                     </tbody>
                 </table>
             </div>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index f743a9d..bf0e8a7 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -333,12 +333,12 @@
                         <td><input name="type14SettleTotal" type="number" value="${Utils.format(settleBean.netIncreaseMonetaryFunds,'0')}" readonly required title="结算总额"></td>
                         <td><input name="netIncreaseMonetaryFunds" type="number" value="${Utils.format(finalBean.netIncreaseMonetaryFunds,'0')}" readonly required title="决算总额"></td>
                     </tr>
-                    <tr>
+                    <#--<tr>
                         <td>合计</td>
                         <td><input name="cashFluxBudgetTotal" type="number" value="${Utils.format(cashFlowBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
                         <td><input name="cashFluxSettleTotal" type="number" value="${Utils.format(settleBean.getCashFlowTotal(),'0')}" readonly required title="此列累计"></td>
                         <td><input name="cashFluxFinalTotal" type="number" value="${Utils.format(finalBean.getCashFluxTotal(),'0')}" readonly required title="此列累计"></td>
-                    </tr>
+                    </tr>-->
                     </tbody>
                 </table>
             </div>