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!}'">
导出
-