mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

资金计划表资金利息问题，按钮问题

dev_1.0.0
‘wangjiuyun 2024-11-11 16:24:08 +08:00
parent 42150fe0a8
commit ea1647b97f
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/resources/static/assets/js/project_budget_plan.js
View File

@ -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());
}

22
src/main/resources/templates/admin/project_approve.ftl
View File

@ -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()