From ccebcc08854159294226c49ab02c2da60b901b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com> Date: Fri, 29 Nov 2024 11:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=94=B6=E6=AC=BE=E5=92=8C?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=98=8E=E7=BB=86=E4=B8=8E=E8=B5=84=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8=E7=9A=84=E8=81=94=E5=8A=A8=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B6=E6=AC=BE=E5=92=8C=E4=BB=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=A1=A8=E4=B8=8E=E8=B5=84=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=A1=A8=E7=9A=84=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget.js | 61 ++++++++++++ .../static/assets/js/project_budget_cost.js | 10 +- .../static/assets/js/project_budget_income.js | 6 +- .../assets/js/project_budget_income_plan.js | 32 +++--- .../static/assets/js/project_budget_pay.js | 97 ++++++++++--------- .../static/assets/js/project_budget_plan.js | 8 +- 6 files changed, 143 insertions(+), 71 deletions(-) diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 48e55c5..43194c0 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -1053,3 +1053,64 @@ function checkprojectPlan() { } +//根据收款计划表和付款计划表更新资金计划表日期范围 +function updataCostPlanMonth(data,key){ + let nowMaxMonth = new Date($('.input-changeable-month-budget-plan:last-child').val()).getTime() + let nowMinMonth = new Date($('.input-changeable-month-budget-plan:first-child').val()).getTime() + let dataMonth = data.details + dataMonth.sort((a, b) => { + return new Date(b[key].slice(0, 7)).getTime() - new Date(a[key].slice(0, 7)).getTime() + }) + let dataMax = new Date(dataMonth[0][key]).getTime() + let dataMin = new Date(dataMonth[dataMonth.length - 1][key]).getTime() + if (dataMax > nowMaxMonth) { + layui.use('laydate', function () { + var laydate = layui.laydate; + laydate.render({ + elem: '#planEndStr', + type: 'month', + btns: ['confirm'], + trigger: 'click', + value: dataMonth[0][key].slice(0, 7), + ready: function () { + + }, + done: function () { + var time = $(this.elem).val(); + appendMultiplePlan(); + $("#planEndDate").val(time); + }, + + }); + appendMultiplePlan(); + $("#planEndDate").val(dataMonth[0][key].slice(0, 7)); + }); + + } + if (nowMinMonth > dataMin) { + layui.use('laydate', function () { + var laydate = layui.laydate; + laydate.render({ + elem: '#planStartStr', + type: 'month', + btns: ['confirm'], + trigger: 'click', + value: dataMonth[dataMonth.length - 1][key].slice(0, 7), + + ready: function () { + + }, + done: function () { + var time = $(this.elem).val(); + appendMultiplePlan(); + $("#planStartDate").val(time); + + } + }); + appendMultiplePlan(); + $("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7)); + }); + + } +} + diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index ad8e672..485ae42 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -344,11 +344,11 @@ function updateCostData(data, returnData) { //资金计划表中的 - $(".input-total-title-device-cost-budget-plan").val(f2Fixed(deviceTaxInclude)); - $(".input-total-title-engineer-cost-budget-plan").val(f2Fixed(f2(serviceTaxInclude) + f2(buildTaxInclude) + f2(otherTaxInclude))); - $(".input-total-title-total-cost-budget-plan").val(f2Fixed(f2(deviceTaxInclude) + f2(buildTaxInclude) + f2(serviceTaxInclude) + f2(otherTaxInclude) - + f2($(".input-total-title-project-manage-cost-budget-plan").val()) - + f2($(".input-total-title-earnest-money-cost-budget-plan").val()))); + // $(".input-total-title-device-cost-budget-plan").val(f2Fixed(deviceTaxInclude)); + // $(".input-total-title-engineer-cost-budget-plan").val(f2Fixed(f2(serviceTaxInclude) + f2(buildTaxInclude) + f2(otherTaxInclude))); + // $(".input-total-title-total-cost-budget-plan").val(f2Fixed(f2(deviceTaxInclude) + f2(buildTaxInclude) + f2(serviceTaxInclude) + f2(otherTaxInclude) + // + f2($(".input-total-title-project-manage-cost-budget-plan").val()) + // + f2($(".input-total-title-earnest-money-cost-budget-plan").val()))); /* var costOtherOtherTaxInclude = f2($("input[name='costOtherOtherTaxInclude']").val()); var costOtherOtherTaxExclude = f2($("input[name='costOtherOtherTaxExclude']").val()); diff --git a/src/main/resources/static/assets/js/project_budget_income.js b/src/main/resources/static/assets/js/project_budget_income.js index 8c5c5da..1e7bf88 100644 --- a/src/main/resources/static/assets/js/project_budget_income.js +++ b/src/main/resources/static/assets/js/project_budget_income.js @@ -139,9 +139,9 @@ function updateIncomeData(data, returnData) { $("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028 * (deviceTaxExclude + engineerTaxExclude + serviceTaxExclude))); - $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val()); - $(".input-total-title-total-income-budget-plan").val(f2Fixed(f2($("input[name='incomeTotalTaxInclude']").val()) - + f2($(".input-total-title-earnest-money-income-budget-plan").val()))); + // $(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val()); + // $(".input-total-title-total-income-budget-plan").val(f2Fixed(f2($("input[name='incomeTotalTaxInclude']").val()) + // + f2($(".input-total-title-earnest-money-income-budget-plan").val()))); updateProjectContributionProfitRate(); diff --git a/src/main/resources/static/assets/js/project_budget_income_plan.js b/src/main/resources/static/assets/js/project_budget_income_plan.js index 32c2cf4..3ebabb3 100644 --- a/src/main/resources/static/assets/js/project_budget_income_plan.js +++ b/src/main/resources/static/assets/js/project_budget_income_plan.js @@ -57,23 +57,27 @@ $(function () { * 更新页面收入的数据【累加】 */ function updateIncomePlanData(data,returnData) { - layuiAlert("保存成功"); - $('.input-changeable-sale-income-budget-plan').val(0) - $('.input-changeable-sale-income-budget-plan').each( (index,ele) =>{ - let time=$(ele).parent().parent().find('.input-changeable-month-budget-plan').val() - let total=0 - data.details.forEach((ele)=>{ + updataCostPlanMonth(data,'receiveTime') + setTimeout(()=>{ + layuiAlert("保存成功"); + $('.input-changeable-sale-income-budget-plan').val(0) + $('.input-changeable-sale-income-budget-plan').each( (index,ele) =>{ + let time=$(ele).parent().parent().find('.input-changeable-month-budget-plan').val() + let total=0 + data.details.forEach((ele)=>{ + + if(time==ele.receiveTime.slice(0, 7)) + total+=ele.receiveAmount + }) + $(ele).val(total) + var eventChange= new Event('change',{bubbles:true}); + ele.dispatchEvent(eventChange); + updateTotal('input-changeable-sale-income-budget-plan','input-total-title-sale-income-budget-plan') - if(time==ele.receiveTime.slice(0, 7)) - total+=ele.receiveAmount }) - $(ele).val(total) - var eventChange= new Event('change',{bubbles:true}); - ele.dispatchEvent(eventChange); - updateTotal('input-changeable-sale-income-budget-plan','input-total-title-sale-income-budget-plan') + $('#my-prompt-income-plan-detail').modal('close'); + },500) - }) - $('#my-prompt-income-plan-detail').modal('close'); } diff --git a/src/main/resources/static/assets/js/project_budget_pay.js b/src/main/resources/static/assets/js/project_budget_pay.js index 561bb2c..960c556 100644 --- a/src/main/resources/static/assets/js/project_budget_pay.js +++ b/src/main/resources/static/assets/js/project_budget_pay.js @@ -217,56 +217,59 @@ function bindPayTotal() { * 更新页面收入的数据【累加】 */ function updatePayData(data) { + + updataCostPlanMonth(data,'payTime') // 更新资金计划表数据 - $('.input-changeable-device-cost-budget-plan').val(0) - $('.input-changeable-project-cost-budget-plan').val(0) - $('.input-changeable-service-cost-budget-plan').val(0) - $('.input-changeable-other-cost-budget-plan').val(0) + setTimeout(() => { + $('.input-changeable-device-cost-budget-plan').val(0) + $('.input-changeable-project-cost-budget-plan').val(0) + $('.input-changeable-service-cost-budget-plan').val(0) + $('.input-changeable-other-cost-budget-plan').val(0) + data.details.forEach((ele) => { + let time = ele.payTime.slice(0, 7) + let type = ele.payProject + switch (type) { + case 1: + var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-device-cost-budget-plan').get(0) + var val = parseFloat($(input).val()) + $(input).val(f2(ele.payAmount + val)) + break; + case 2: + var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-project-cost-budget-plan') + var val = parseFloat($(input).val()) + $(input).val(f2(ele.payAmount + val)) + break; + case 3: + var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-service-cost-budget-plan') + var val = parseFloat($(input).val()) + $(input).val(f2(ele.payAmount + val)) + break; + case 4: + var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-other-cost-budget-plan') + var val = parseFloat($(input).val()) + $(input).val(f2(ele.payAmount + val)) + break; - data.details.forEach((ele) => { - let time = ele.payTime.slice(0, 7) - let type = ele.payProject - switch (type) { - case 1: - var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-device-cost-budget-plan').get(0) - var val = parseFloat($(input).val()) - $(input).val(f2(ele.payAmount + val)) - break; - case 2: - var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-project-cost-budget-plan') - var val = parseFloat($(input).val()) - $(input).val(f2(ele.payAmount + val)) - break; - case 3: - var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-service-cost-budget-plan') - var val = parseFloat($(input).val()) - $(input).val(f2(ele.payAmount + val)) - break; - case 4: - var input = $(`#tab6 .input-changeable-month-budget-plan[value="${time}"]`).parent().parent().find('.input-changeable-other-cost-budget-plan') - var val = parseFloat($(input).val()) - $(input).val(f2(ele.payAmount + val)) - break; - - } - }) - updateTotal("input-changeable-device-cost-budget-plan", "input-total-title-device-cost-budget-plan"); - updateTotal("input-changeable-project-cost-budget-plan", "input-total-title-projectCost-cost-budget-plan"); - updateTotal("input-changeable-service-cost-budget-plan", "input-total-title-serviceCost-cost-budget-plan"); - updateTotal("input-changeable-other-cost-budget-plan", "input-total-total-otherCost-cost-budget-plan"); - $('.input-changeable-project-manage-cost-budget-plan').each((index, element) => { - var engineer1 = f2($(element).parent().parent().find(".input-changeable-device-cost-budget-plan").val()) - var engineer2 = f2($(element).parent().parent().find(".input-changeable-project-cost-budget-plan").val()) - var engineer3 = f2($(element).parent().parent().find(".input-changeable-service-cost-budget-plan").val()) - var engineer4 = f2($(element).parent().parent().find(".input-changeable-other-cost-budget-plan").val()) - var projectManageCost = f2($(element).val()); - var earnestMoneyCost = f2($(element).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); - var engineerCost = f2(engineer1 + engineer2 + engineer3 + engineer4); - $(element).parent().parent().find('.input-changeable-total-cost-budget-plan').val(f2Fixed(engineerCost + projectManageCost + earnestMoneyCost)); - }) - updateTotal("input-changeable-total-cost-budget-plan", "input-total-title-total-cost-budget-plan"); - layuiAlert("保存成功"); + } + }) + updateTotal("input-changeable-device-cost-budget-plan", "input-total-title-device-cost-budget-plan"); + updateTotal("input-changeable-project-cost-budget-plan", "input-total-title-projectCost-cost-budget-plan"); + updateTotal("input-changeable-service-cost-budget-plan", "input-total-title-serviceCost-cost-budget-plan"); + updateTotal("input-changeable-other-cost-budget-plan", "input-total-title-otherCost-cost-budget-plan"); + $('.input-changeable-project-manage-cost-budget-plan').each((index, element) => { + var engineer1 = f2($(element).parent().parent().find(".input-changeable-device-cost-budget-plan").val()) + var engineer2 = f2($(element).parent().parent().find(".input-changeable-project-cost-budget-plan").val()) + var engineer3 = f2($(element).parent().parent().find(".input-changeable-service-cost-budget-plan").val()) + var engineer4 = f2($(element).parent().parent().find(".input-changeable-other-cost-budget-plan").val()) + var projectManageCost = f2($(element).val()); + var earnestMoneyCost = f2($(element).parent().parent().find(".input-changeable-earnest-money-cost-budget-plan").val()); + var engineerCost = f2(engineer1 + engineer2 + engineer3 + engineer4); + $(element).parent().parent().find('.input-changeable-total-cost-budget-plan').val(f2Fixed(engineerCost + projectManageCost + earnestMoneyCost)); + }) + updateTotal("input-changeable-total-cost-budget-plan", "input-total-title-total-cost-budget-plan"); + layuiAlert("保存成功"); + }, 500) } /** 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 8288423..7462856 100644 --- a/src/main/resources/static/assets/js/project_budget_plan.js +++ b/src/main/resources/static/assets/js/project_budget_plan.js @@ -125,6 +125,7 @@ layui.use('laydate', function(){ console.log("planStartStr:" + time) appendMultiplePlan(); $("#planStartDate").val(time); + } }); }); @@ -145,6 +146,7 @@ layui.use('laydate', function(){ console.log("planEndStr:" + time); appendMultiplePlan(); $("#planEndDate").val(time); + } }); }); @@ -159,6 +161,7 @@ function appendMultiplePlan() { } var planStartDate = $("#planStartDate").val(); var planEndDate = $("#planEndDate").val(); + var startYear = planStartStr.substring(0, 4); var startMonth = planStartStr.substring(5, 7); var totalStartMonth = startYear * 12 + parseInt(startMonth); @@ -214,7 +217,7 @@ function appendMultiplePlan() { } }); } else if (totalEndMonth > totalEndMonth2) { - console.log("增加结束"); + console.log("增加结束",totalEndMonth,totalEndMonth2); diff = totalEndMonth - totalEndMonth2; while (planIndex < diff) { appendTrBudgetPlan(); @@ -408,7 +411,8 @@ function appendTrBudgetPlan() { ' \n' + ' \n' + ' '; - $("#budgetPlanDetailTable").append(template); + console.log(123123123) + $("#budgetPlanDetailTable tbody").append(template); // let width=0 // $('#budgetPlanDetailTable tr').each(function (){ // width+=$(this).width()