Compare commits

...

3 Commits

Author SHA1 Message Date
‘wangjiuyun bdec78bf63 。。。改bug 2024-11-29 16:12:52 +08:00
‘wangjiuyun a884037ae5 Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1 2024-11-29 16:03:05 +08:00
‘wangjiuyun c2599b40bf 。。。。 2024-11-29 16:02:58 +08:00
1 changed files with 105 additions and 51 deletions

View File

@ -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();
@ -1055,14 +1055,66 @@ function checkprojectPlan() {
//根据收款计划表和付款计划表更新资金计划表日期范围 //根据收款计划表和付款计划表更新资金计划表日期范围
function updataCostPlanMonth(data, key) { function updataCostPlanMonth(data, key) {
let nowMaxMonth = new Date($('.input-changeable-month-budget-plan:last-child').val()).getTime() if(!data.details.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()
console.log(dataMonth)
if (!nowMaxMonth || !nowMinMonth) {
if(!nowMinMonth){
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);
}
});
$("#planStartDate").val(dataMonth[dataMonth.length - 1][key].slice(0, 7));
})
}
if(!nowMaxMonth){
$('#planEndStr').val(dataMonth[0][key].slice(0, 7))
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));
});
}
} else {
if (dataMax > nowMaxMonth) { if (dataMax > nowMaxMonth) {
layui.use('laydate', function () { layui.use('laydate', function () {
var laydate = layui.laydate; var laydate = layui.laydate;
@ -1114,3 +1166,5 @@ function updataCostPlanMonth(data,key){
} }
} }
}