最终完成
‘wangjiuyun
parent
beeb889780
commit
a91eb5f0cf
|
|
@ -188,11 +188,6 @@ $(function () {
|
|||
// }
|
||||
// console.log(message);
|
||||
// 保存付款计划表
|
||||
var flagPay = verifyBudgetPay()
|
||||
if (!flagPay) {
|
||||
$("#saveDraft").attr('disabled', false)
|
||||
return;
|
||||
}
|
||||
var dataPay = collectData("am-modal-prompt-input-pay");
|
||||
dataPay = prepareAjaxDataVerify(dataPay, pay_DETAIL2, $("#id").val());
|
||||
if (dataPay) {
|
||||
|
|
@ -282,12 +277,15 @@ $(function () {
|
|||
return now.total + total
|
||||
}, 0)
|
||||
var limitTotal = dataManage.details.reduce((total, now) => {
|
||||
if (now.type == 2 && (now.name == 5 || now.name == 4))
|
||||
return now.total + total
|
||||
if (now.type == 2 && (now.name == '5' || now.name == '4'))
|
||||
return + total
|
||||
else return total
|
||||
}, 0)
|
||||
var projectGrossProfitA = $('[name="projectGrossProfitA"]').val()
|
||||
if (limitTotal > ((Number(projectGrossProfitA)-(totalTotal-limitTotal)) * 0.1)) {
|
||||
console.log(limitTotal , projectGrossProfitA.replace(/,/g, ''),totalTotal,limitTotal)
|
||||
|
||||
if (limitTotal > ((parseFloat(projectGrossProfitA.replace(/,/g, ''))-(totalTotal-limitTotal)) * 0.1)) {
|
||||
$("#saveApprove").attr('disabled', false);
|
||||
layuiAlert(`差旅费+业务费总金额不超过【毛利A(${projectGrossProfitA})-（项目管理费用-差旅费-业务费）】*10%`);
|
||||
return
|
||||
}
|
||||
|
|
@ -331,9 +329,9 @@ $(function () {
|
|||
// return;
|
||||
// }
|
||||
// 保存付款计划表
|
||||
var flagPay = verifyBudgetPay()
|
||||
var flagPay = verifyBudgetPay(1)
|
||||
if (!flagPay) {
|
||||
$("#saveDraft").attr('disabled', false)
|
||||
$("#saveApprove").attr('disabled', false)
|
||||
return;
|
||||
}
|
||||
var dataPay = collectData("am-modal-prompt-input-pay");
|
||||
|
|
|
|||
|
|
@ -43,14 +43,6 @@ $(function () {
|
|||
var data = collectData("am-modal-prompt-input-cost-project-manage");
|
||||
//data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true);
|
||||
data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
|
||||
var totalTotal=data.details.reduce((total,now)=>{
|
||||
return now.total+total
|
||||
},0)
|
||||
var projectGrossProfitA=$('[name="projectGrossProfitA"]').val()
|
||||
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
|
||||
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
|
||||
return
|
||||
}
|
||||
if(data){
|
||||
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
|
||||
}
|
||||
|
|
@ -69,15 +61,6 @@ $(function () {
|
|||
var data = collectData("am-modal-prompt-input-cost-project-manage");
|
||||
//data = prepareAjaxData(data, COST_PROJECT_MANAGE_DETAIL_ARR, $("#id").val(),true);
|
||||
data = prepareAjaxDataVerify(data, COST_PROJECT_MANAGE_DETAIL2, $("#id").val());
|
||||
var totalTotal=data.details.reduce((total,now)=>{
|
||||
return now.total+total
|
||||
},0)
|
||||
var projectGrossProfitA=$('[name="projectGrossProfitA"]').val()
|
||||
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
|
||||
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
|
||||
return
|
||||
}
|
||||
// if(data.managePayAmountTotal)
|
||||
if(data){
|
||||
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -370,20 +370,18 @@ function verifyBudgetPay(isApprove) {
|
|||
var costTotal_server = calculateTotal(costData, 3,'type','totalTaxExclude');
|
||||
var costTotal_other = calculateTotal(costData, 4,'type','totalTaxExclude');
|
||||
|
||||
console.log(2333,payTotal_equipment,payTotal_project,payTotal_server,payTotal_other)
|
||||
console.log(3333,costTotal_equipment,costTotal_project,costTotal_server,costTotal_other)
|
||||
|
||||
|
||||
if (payTotal_equipment != costTotal_equipment) {
|
||||
console.log(payTotal_equipment,payTotal_project,payTotal_server,payTotal_other,costTotal_equipment,costTotal_project,costTotal_server,costTotal_other)
|
||||
if (f2Fixed(payTotal_equipment) != f2Fixed(costTotal_equipment)) {
|
||||
flag = false
|
||||
layuiAlert('[付款计划表中"设备"成本总金]额需要与[采购成本明细表中"设备"成本总金额]一致')
|
||||
} else if (payTotal_project != costTotal_project) {
|
||||
} else if (f2Fixed(payTotal_project) != f2Fixed(costTotal_project)) {
|
||||
flag = false
|
||||
layuiAlert('[付款计划表中"工程"成本总金]额需要与[采购成本明细表中"工程"成本总金额]一致')
|
||||
} else if (payTotal_server != costTotal_server) {
|
||||
} else if (f2Fixed(payTotal_server) != f2Fixed(costTotal_server)) {
|
||||
flag = false
|
||||
layuiAlert('[付款计划表中"服务"成本总金]额需要与[采购成本明细表中"服务"成本总金额]一致')
|
||||
} else if (payTotal_other != costTotal_other) {
|
||||
} else if (f2Fixed(payTotal_other) != f2Fixed(costTotal_other)) {
|
||||
flag = false
|
||||
layuiAlert('[付款计划表中"其他"成本总金]额需要与[采购成本明细表中"其他"成本总金额]一致')
|
||||
}
|
||||
|
|
@ -394,6 +392,6 @@ function verifyBudgetPay(isApprove) {
|
|||
|
||||
function calculateTotal(payData, type,key,value) {
|
||||
return payData.details.reduce((total, now) => {
|
||||
return now[key] == type ? now[value] + total : total;
|
||||
return now[key] == type ? parseFloat(now[value]) + total : total;
|
||||
}, 0);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1282,11 +1282,24 @@
|
|||
</#if>
|
||||
</td>
|
||||
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
value="${costProjectManageDetail.name!}" readonly
|
||||
<#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->>
|
||||
</td>
|
||||
<td class="22222">
|
||||
<#if costProjectManageDetail.name =='1' >
|
||||
人工费
|
||||
<#elseif costProjectManageDetail.name =='2'>
|
||||
总部支撑人力费用
|
||||
<#elseif costProjectManageDetail.name =='4'>
|
||||
人员差旅费
|
||||
<#elseif costProjectManageDetail.name =='5'>
|
||||
业务费用
|
||||
<#elseif costProjectManageDetail.name =='6'>
|
||||
商务及专项验收费用
|
||||
<#elseif costProjectManageDetail.name =='7'>
|
||||
办公费用
|
||||
<#elseif costProjectManageDetail.name =='9'>
|
||||
保证金
|
||||
<#else>
|
||||
${costProjectManageDetail.name}
|
||||
</#if> </td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
value="${costProjectManageDetail.detail!}"></td>
|
||||
|
|
@ -1809,8 +1822,8 @@
|
|||
<#-- </tr>-->
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
<#-- <td></td>-->
|
||||
<#-- <td></td>-->
|
||||
<#-- <td></td>-->
|
||||
<#-- <td></td>-->
|
||||
<td><input type="text" class="number" name="costTotalTaxInclude"
|
||||
value="${Utils.format(budgetBean.costTotalTaxInclude, '0.00')}"
|
||||
readonly required title="此列累计"></td>
|
||||
|
|
@ -3455,23 +3468,27 @@
|
|||
其他费用
|
||||
</#if>
|
||||
</td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
value="${costProjectManageDetail.name!}" readonly
|
||||
<#--<#if costProjectManageDetail.deletable==0>readonly</#if>-->>
|
||||
<td class="111233">
|
||||
<#if costProjectManageDetail.name ==1 >
|
||||
人工费
|
||||
<#elseif costProjectManageDetail.type ==2>
|
||||
总部支撑人力费用
|
||||
<#elseif costProjectManageDetail.type ==4>
|
||||
人员差旅费
|
||||
<#elseif costProjectManageDetail.type ==5>
|
||||
业务费用
|
||||
<#elseif costProjectManageDetail.type ==6>
|
||||
商务及专项验收费用
|
||||
<#elseif costProjectManageDetail.type ==7>
|
||||
办公费用
|
||||
<#elseif costProjectManageDetail.type ==9>
|
||||
保证金
|
||||
</#if>
|
||||
|
||||
</td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
value="${costProjectManageDetail.detail!}"></td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage"
|
||||
value="${costProjectManageDetail.unit!}"></td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-amount-project-manage"
|
||||
value="${costProjectManageDetail.amount!0}"></td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-price-project-manage"
|
||||
value="${Utils.format2(costProjectManageDetail.price,'0.00')}"></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-project-manage"
|
||||
value="${Utils.format(costProjectManageDetail.total,'0.00')}"
|
||||
|
|
@ -4046,11 +4063,13 @@
|
|||
$('.am-modal-prompt-input-budget-plan-income').css('display', 'block');
|
||||
$('.am-modal-prompt-input-budget-plan-cost').css('display', 'block');
|
||||
};
|
||||
|
||||
function downFile() {
|
||||
var url = $('#collaboratorUrl_check').attr('fileUrl')
|
||||
if (url)
|
||||
location.href = url
|
||||
}
|
||||
|
||||
function downFile2() {
|
||||
var url = $('#collaboratorUrl_check2').attr('fileUrl')
|
||||
if (url)
|
||||
|
|
|
|||
Loading…
Reference in New Issue