From ea1647b97f971aef659bb9b56f84442595d57e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Mon, 11 Nov 2024 16:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?=
 =?UTF-8?q?=E8=B5=84=E9=87=91=E5=88=A9=E6=81=AF=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/assets/js/project_budget_plan.js   | 17 +++++++++++---
 .../templates/admin/project_approve.ftl       | 22 +++++++++++++++----
 2 files changed, 32 insertions(+), 7 deletions(-)

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 61e666d..3aedb15 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -855,9 +855,19 @@ function updateEachCapitalInterest() {
         //找到本月之前的所有的垫资和回款
         var underwrittenPlan = summationByClass($(this),".input-changeable-underwritten-plan-budget-plan", index);
         var repaymentPlan= summationByClass($(this),".input-changeable-repayment-plan-budget-plan", index);
-        console.log(underwrittenPlan, repaymentPlan);
-        var capitalInterest = f2((underwrittenPlan-repaymentPlan)*underwrittenPlanTaxRate/100/12);
+
+        var underwrittenPlanTr =$(this).parent().parent().find('.input-changeable-underwritten-plan-budget-plan').val()
+        var repaymentPlanTr=$(this).parent().parent().find('.input-changeable-repayment-plan-budget-plan').val()
+        var capitalInterest = f2((underwrittenPlanTr-repaymentPlanTr)*underwrittenPlanTaxRate/100/12);
+        // 如果余额为负数
+        // if(underwrittenPlan>repaymentPlan){
+        //     var capitalInterest = f2((underwrittenPlan-repaymentPlan)*0.08/12)*-1;
+        // }else{
+        //     var capitalInterest=0
+        // }
+
         total += capitalInterest;
+        console.log($(this));
 
         $(this).val(f2Fixed(capitalInterest));
 
@@ -876,9 +886,10 @@ function updateEachCapitalInterest() {
 function summationByClass(input, className, myIndex) {
     var total = 0;
     var trs = input.parent().parent().parent().find("tr");
+    console.log(trs)
     trs.each(function (index, element) {
         //myIndex从0开始，刨除表头和总计、总计两行
-        index-=2;
+        index-=1;
         if(index>=0 && index<=myIndex){
             total += f2($(this).find(className).val());
         }
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index d7445bb..3343f48 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -1407,16 +1407,16 @@
                                                     onclick="location.href='${base}/project/budgetPlanExport?id=${project.id!}'">
                                                 <span class="am-icon-archive"></span> 导出
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default" onclick="openDetail()">
+                                            <button type="button" class="am-btn am-btn-default openDetail" onclick="openDetail()">
                                                 <span class="am-icon-archive"></span> 拓展明细
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default" onclick="closeDetail()">
+                                            <button style="display: none" type="button" class="am-btn am-btn-default closeDetail" onclick="closeDetail()">
                                                 <span class="am-icon-archive"></span> 隐藏明细
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default" onclick="closeEmpty()">
+                                            <button type="button" style="display: none" class="am-btn am-btn-default closeEmpty" onclick="closeEmpty()">
                                                 <span class="am-icon-archive"></span> 隐藏无金额月份
                                             </button>
-                                            <button type="button" class="am-btn am-btn-default" onclick="openEmpty()">
+                                            <button type="button" class="am-btn am-btn-default openEmpty" onclick="openEmpty()">
                                                 <span class="am-icon-archive"></span> 展示无金额月份
                                             </button>
                                             <#--                                                <button type="button" class="am-btn am-btn-default" onclick="printPage('tab34')">-->
@@ -4102,12 +4102,18 @@
     var closeDetail = function () {
         $('.am-modal-prompt-input-budget-plan-income').css('display', 'none');
         $('.am-modal-prompt-input-budget-plan-cost').css('display', 'none');
+        $('.openDetail').css('display', 'inline-block');
+        $('.closeDetail').css('display', 'none');
+
     };
     closeDetail()
 
     var openDetail = function () {
         $('.am-modal-prompt-input-budget-plan-income').css('display', 'block');
         $('.am-modal-prompt-input-budget-plan-cost').css('display', 'block');
+        $('.closeDetail').css('display', 'inline-block');
+        $('.openDetail').css('display', 'none');
+
     };
 
     function downFile() {
@@ -4124,10 +4130,18 @@
 
     function closeEmpty() {
         $('.tr-budget-plan-empty').css('display', 'none');
+        $('.openEmpty').css('display', 'inline-block');
+        $('.closeEmpty').css('display', 'none');
+
+
     }
     closeEmpty()
     function openEmpty() {
         $('.tr-budget-plan-empty').css('display', 'inline-block');
+        $('.closeEmpty').css('display', 'inline-block');
+        $('.openEmpty').css('display', 'none');
+
+
     }
     $('#tab34').on('scroll', (event) => {
         let top = $('#tab34').scrollTop()