。。。。

dev_2.0.2
‘wangjiuyun 2024-11-29 16:02:58 +08:00
parent ccebcc0885
commit c2599b40bf
1 changed files with 75 additions and 17 deletions

View File

@ -214,7 +214,7 @@ $(function () {
$("#saveApprove").click(function () { $("#saveApprove").click(function () {
$("#saveApprove").attr('disabled', true); $("#saveApprove").attr('disabled', true);
$("#collaboratorUrl").val($("#collaboratorUrl_span").text()); $("#collaboratorUrl").val($("#collaboratorUrl_span").text());
if(!checkprojectPlan()){ if (!checkprojectPlan()) {
$("#saveApprove").attr('disabled', false); $("#saveApprove").attr('disabled', false);
return return
} }
@ -967,9 +967,9 @@ function updateIncomeDataUnsubmit(incomeDetails) {
$("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028 * (deviceTaxExclude + engineerTaxExclude + serviceTaxExclude))); $("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-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val());
$(".input-total-title-total-income-budget-plan").val(f2Fixed(f2($("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()))); // + f2($(".input-total-title-earnest-money-income-budget-plan").val())));
updateProjectContributionProfitRate(); updateProjectContributionProfitRate();
@ -1041,29 +1041,38 @@ function checkprojectPlan() {
// 收款总计 // 收款总计
let saleTatol = f2($('.input-total-title-total-income-budget-plan').val()) let saleTatol = f2($('.input-total-title-total-income-budget-plan').val())
// 保证金收款 // 保证金收款
let saleEarnest=f2($('.input-total-title-earnest-money-income-budget-plan').val()) let saleEarnest = f2($('.input-total-title-earnest-money-income-budget-plan').val())
// 收入明细表总计 // 收入明细表总计
let incomeTotal=f2($('.input-changeable-total-total-tax-include-income').val()) let incomeTotal = f2($('.input-changeable-total-total-tax-include-income').val())
if (saleTatol != (saleEarnest + incomeTotal)) { if (saleTatol != (saleEarnest + incomeTotal)) {
layuiAlert('资金计划表的收款合计需= 保证金收款+收入明细表总计') layuiAlert('资金计划表的收款合计需= 保证金收款+收入明细表总计')
return false; return false;
} }
return true return true
} }
//根据收款计划表和付款计划表更新资金计划表日期范围 //根据收款计划表和付款计划表更新资金计划表日期范围
function updataCostPlanMonth(data,key){ function updataCostPlanMonth(data, key) {
let nowMaxMonth = new Date($('.input-changeable-month-budget-plan:last-child').val()).getTime() if(!data.length) return
let nowMinMonth = new Date($('.input-changeable-month-budget-plan:first-child').val()).getTime() let nowMaxMonth = new Date($('#planStartStr').val()).getTime()
let nowMinMonth = new Date($('#planEndStr').val()).getTime()
let dataMonth = data.details let dataMonth = data.details
dataMonth.sort((a, b) => { dataMonth.sort((a, b) => {
return new Date(b[key].slice(0, 7)).getTime() - new Date(a[key].slice(0, 7)).getTime() 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 dataMax = new Date(dataMonth[0][key]).getTime()
let dataMin = new Date(dataMonth[dataMonth.length - 1][key]).getTime() let dataMin = new Date(dataMonth[dataMonth.length - 1][key]).getTime()
if (dataMax > nowMaxMonth) {
console.log(dataMonth)
if (!nowMaxMonth || !nowMinMonth) {
if(!nowMinMonth){
$('#planStartStr').val(dataMonth[dataMonth.length - 1][key].slice(0, 7))
}
if(!nowMaxMonth){
$('#planEndStr').val(dataMonth[0][key].slice(0, 7))
}
layui.use('laydate', function () { layui.use('laydate', function () {
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ laydate.render({
@ -1082,12 +1091,9 @@ function updataCostPlanMonth(data,key){
}, },
}); });
appendMultiplePlan();
$("#planEndDate").val(dataMonth[0][key].slice(0, 7)); $("#planEndDate").val(dataMonth[0][key].slice(0, 7));
}); });
}
if (nowMinMonth > dataMin) {
layui.use('laydate', function () { layui.use('laydate', function () {
var laydate = layui.laydate; var laydate = layui.laydate;
laydate.render({ laydate.render({
@ -1107,10 +1113,62 @@ function updataCostPlanMonth(data,key){
} }
}); });
appendMultiplePlan();
$("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7)); $("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7));
}); })
setTimeout(()=>{
appendMultiplePlan();
},600)
} 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;
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));
});
}
} }
} }