From a2c61353053d4aab69fe5ddc37e62674a03c619f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com> Date: Fri, 29 Nov 2024 16:36:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8?= =?UTF-8?q?=E6=97=A5=E6=9C=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/js/project_budget.js | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js index 5bb3266..fa38946 100644 --- a/src/main/resources/static/assets/js/project_budget.js +++ b/src/main/resources/static/assets/js/project_budget.js @@ -1056,8 +1056,8 @@ function checkprojectPlan() { //根据收款计划表和付款计划表更新资金计划表日期范围 function updataCostPlanMonth(data, key) { if(!data.details.length) return - let nowMaxMonth = new Date($('#planStartStr').val()).getTime() - let nowMinMonth = new Date($('#planEndStr').val()).getTime() + let nowMaxMonth = new Date($('#planEndStr').val()).getTime() + let nowMinMonth = new Date($('#planStartStr').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() @@ -1065,7 +1065,6 @@ function updataCostPlanMonth(data, key) { let dataMax = new Date(dataMonth[0][key]).getTime() let dataMin = new Date(dataMonth[dataMonth.length - 1][key]).getTime() - console.log(dataMonth) if (!nowMaxMonth || !nowMinMonth) { if(!nowMinMonth){ layui.use('laydate', function () { @@ -1087,7 +1086,6 @@ function updataCostPlanMonth(data, key) { } }); - $("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7)); }) } if(!nowMaxMonth){ @@ -1112,33 +1110,12 @@ function updataCostPlanMonth(data, key) { }); appendMultiplePlan(); $("#planEndDate").val(dataMonth[0][key].slice(0, 7)); + $("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7)); + }); } } else { - 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; @@ -1164,6 +1141,30 @@ function updataCostPlanMonth(data, key) { }); } + 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)); + }); + + } } }