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 a4e806c..40c1e28 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -856,9 +856,13 @@ function updateEachCapitalInterest() { var underwrittenPlan = summationByClass($(this),".input-changeable-underwritten-plan-budget-plan", index); var repaymentPlan= summationByClass($(this),".input-changeable-repayment-plan-budget-plan", index); - var underwrittenPlanTr =f2($(this).parent().parent().find('.input-changeable-underwritten-plan-budget-plan').val()) - var repaymentPlanTr=f2($(this).parent().parent().find('.input-changeable-repayment-plan-budget-plan').val()) - var capitalInterest = f2((underwrittenPlanTr-repaymentPlanTr)*underwrittenPlanTaxRate/100/12); + // var underwrittenPlanTr =f2($(this).parent().parent().find('.input-changeable-underwritten-plan-budget-plan').val()) + // var repaymentPlanTr=f2($(this).parent().parent().find('.input-changeable-repayment-plan-budget-plan').val()) + var money=f2($(this).parent().parent().find('.input-changeable-fund-balance-budget-plan').val()) + var capitalInterest = f2(money*underwrittenPlanTaxRate/100/12)*-1; + if(capitalInterest<0){ + capitalInterest=0 + } // 如果余额为负数 // if(underwrittenPlan>repaymentPlan){ // var capitalInterest = f2((underwrittenPlan-repaymentPlan)*0.08/12)*-1; @@ -867,7 +871,6 @@ function updateEachCapitalInterest() { // } total += capitalInterest; - console.log($(this),underwrittenPlanTr,repaymentPlanTr); $(this).val(f2Fixed(capitalInterest));