Compare commits
No commits in common. "6a4e423276f443a56fe38c976dff8ee8e74a5de6" and "3cbe4d951fe8f52150fe9bcfc314276fd4e5ece3" have entirely different histories.
6a4e423276
...
3cbe4d951f
|
|
@ -152,7 +152,6 @@ $(function () {
|
|||
var projectGrossProfitA=$('[name="projectGrossProfitA"]').val()
|
||||
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
|
||||
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
|
||||
$("#saveDraft").attr('disabled', false)
|
||||
return
|
||||
}
|
||||
if(dataManage){
|
||||
|
|
@ -195,18 +194,11 @@ $(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){
|
||||
postAjax(base+"/project/budgetEditSaveBudgetPayPlan", dataPay);
|
||||
}
|
||||
|
||||
|
||||
var startTime = $("#startDate").val();
|
||||
var endTime = $("#endDate").val();
|
||||
if (startTime > endTime) {
|
||||
|
|
@ -332,17 +324,6 @@ $(function () {
|
|||
// layuiAlert(message);
|
||||
// return;
|
||||
// }
|
||||
// 保存付款计划表
|
||||
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){
|
||||
postAjax(base+"/project/budgetEditSaveBudgetPayPlan", dataPay);
|
||||
}
|
||||
|
||||
var startTime = $("#startDate").val();
|
||||
var endTime = $("#endDate").val();
|
||||
|
|
|
|||
|
|
@ -119,12 +119,11 @@ $(function () {
|
|||
var data = collectData("am-modal-prompt-input-pay");
|
||||
//data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
|
||||
data = prepareAjaxDataVerify(data, pay_DETAIL2, $("#id").val());
|
||||
var flag=verifyBudgetPay()
|
||||
if(!flag) return
|
||||
if(data){
|
||||
postAjax(base+"/project/budgetEditSaveBudgetPayPlan", data, updateCostData);
|
||||
}
|
||||
});
|
||||
|
||||
$("#payAddBtn").click(function () {
|
||||
appendTrPay();
|
||||
$("#payAddBtn").blur();
|
||||
|
|
@ -339,19 +338,3 @@ function initTypeCategory(params, data) {
|
|||
// console.log(SELECT_TYPE_CATEGORY_DATA);
|
||||
// console.log(SELECT_CATEGORY_TYPE_MAP_DATA);
|
||||
}
|
||||
|
||||
//校验付款明细表
|
||||
function verifyBudgetPay() {
|
||||
var timeValue = $(".input-changeable-pay-time");
|
||||
var flag=true
|
||||
var timeFlag = true
|
||||
timeValue.each((index, element) => {
|
||||
if ($(element).val().length != 10)
|
||||
timeFlag = false
|
||||
})
|
||||
if (timeFlag == false) {
|
||||
flag=false
|
||||
layuiAlert('付款计划表中付款时间为必填')
|
||||
}
|
||||
return flag
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1051,3 +1051,9 @@ function updateCashFlow() {
|
|||
$("input[name='financingCapitalCashflow']").val(f2Fixed(m));
|
||||
$("input[name='netIncreaseMonetaryFunds']").val(f2Fixed(n));
|
||||
}
|
||||
//校验付款明细表
|
||||
function verifyBudgetPay(){
|
||||
var timeValue = classVal("input-changeable-pay-time");
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -954,7 +954,7 @@
|
|||
<#list incomeDetails as incomeDetail>
|
||||
<tr>
|
||||
<td>${(incomeDetail_index+1)!}</td>
|
||||
<td width="100px">
|
||||
<td>
|
||||
<#if incomeDetail.type ==1 >
|
||||
设备类
|
||||
<#elseif incomeDetail.type ==2>
|
||||
|
|
@ -992,7 +992,7 @@
|
|||
</#if>
|
||||
<tr class="total-new" id="incomeTotal">
|
||||
<td>总计</td>
|
||||
<td width="100px"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
|
|
@ -1094,6 +1094,7 @@
|
|||
value="${Utils.format(budgetPayPlanTotal,'0')}"
|
||||
readonly></td>
|
||||
<td width="100px"></td>
|
||||
<td width="60px"></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -1192,13 +1193,22 @@
|
|||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>采购成本项目</th>
|
||||
<th>产品大类</th>
|
||||
<th>费用项目</th>
|
||||
<th>采购类别</th>
|
||||
<th>名称</th>
|
||||
<th>单位</th>
|
||||
<th>数量</th>
|
||||
<th>单价</th>
|
||||
<th>税率（%）</th>
|
||||
<th>含税总金额（元）</th>
|
||||
<th>不含税金额（元）</th>
|
||||
<th>税金（元）</th>
|
||||
<th>供应商</th>
|
||||
<th>签约方</th>
|
||||
<th>是否垫资</th>
|
||||
<th>预估垫资金额(元)</th>
|
||||
<th>支出时间</th>
|
||||
<th>支出金额(元)</th>
|
||||
<th>付款方式</th>
|
||||
<th>备注</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -1208,6 +1218,17 @@
|
|||
<tr>
|
||||
<td>${(costDetail_index+1)!}</td>
|
||||
<td>
|
||||
<#--<select style="width: auto" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
|
||||
<option value="1" <#if costDetail.type == 1>selected</#if>>设备
|
||||
</option>
|
||||
<option value="2" <#if costDetail.type == 2>selected</#if>>施工
|
||||
</option>
|
||||
<option value="3" <#if costDetail.type == 3>selected</#if>>服务
|
||||
</option>
|
||||
<option value="4" <#if costDetail.type == 4>selected</#if>>其他
|
||||
</option>
|
||||
</select>-->
|
||||
<#if costDetail.type ==1 >
|
||||
设备
|
||||
<#elseif costDetail.type ==2>
|
||||
|
|
@ -1223,7 +1244,20 @@
|
|||
<#if costDetail.category == procurementType.id>${procurementType.name}</#if>
|
||||
</#list>
|
||||
</td>
|
||||
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${costDetail.name!}"></td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${costDetail.unit!}"></td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-amount"
|
||||
value="${Utils.format(costDetail.amount,'0.00')}">
|
||||
</td>
|
||||
<td><input type="text" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-price"
|
||||
value="${Utils.format2(costDetail.price,'0.00')}">
|
||||
</td>
|
||||
<td><input type="text" min="0.00" max="99.99" step="0.01"
|
||||
readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
|
||||
|
|
@ -1248,6 +1282,41 @@
|
|||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${costDetail.contractParty!}" readonly>
|
||||
</td>
|
||||
<td>
|
||||
<#--<select style="width: auto" readonly
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost am-modal-prompt-input-cost-type">
|
||||
<option value="1" <#if costDetail.type == 1>selected</#if>>设备
|
||||
</option>
|
||||
<option value="2" <#if costDetail.type == 2>selected</#if>>施工
|
||||
</option>
|
||||
<option value="3" <#if costDetail.type == 3>selected</#if>>服务
|
||||
</option>
|
||||
<option value="4" <#if costDetail.type == 4>selected</#if>>其他
|
||||
</option>
|
||||
</select>-->
|
||||
<#if costDetail.isUnderwritten ==0 >
|
||||
|
||||
<#elseif costDetail.isUnderwritten ==1>
|
||||
是
|
||||
<#elseif costDetail.isUnderwritten ==2>
|
||||
否
|
||||
</#if>
|
||||
</td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-underwritten-amount-cost"
|
||||
value="${Utils.format(costDetail.underwrittenAmount,'0')}"
|
||||
readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${(costDetail.payTime?string("yyyy-MM-dd"))!}"
|
||||
readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-pay-amount-cost"
|
||||
value="${Utils.format(costDetail.payAmount,'0')}"
|
||||
readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${costDetail.payWay!}" readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost"
|
||||
value="${costDetail.remark!}" readonly></td>
|
||||
|
|
@ -1264,6 +1333,13 @@
|
|||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-amount-cost"
|
||||
value="${Utils.format(costTotalAmount,'0.00')}"
|
||||
readonly <#--onkeyup="integerNumber(this)"-->></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost"
|
||||
value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}"
|
||||
|
|
@ -1276,7 +1352,17 @@
|
|||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-cost"
|
||||
value="${Utils.format(budgetBean.costPurchaseTotalTax,'0.00')}"
|
||||
readonly></td>
|
||||
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-underwritten-amount-cost"
|
||||
value="${Utils.format(costUnderwrittenAmountTotal,'0.00')}"
|
||||
readonly></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-pay-amount-cost"
|
||||
value="${Utils.format(costPayAmountTotal,'0.00')}"
|
||||
readonly></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
|
|
@ -1308,7 +1394,7 @@
|
|||
id="costProjectManageTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th width="60px">序号</th>
|
||||
<th>序号</th>
|
||||
<th>费用类别</th>
|
||||
<th>业务项目</th>
|
||||
<th>项目明细</th>
|
||||
|
|
@ -1327,7 +1413,7 @@
|
|||
<#list costProjectManageDetails as costProjectManageDetail>
|
||||
<tr>
|
||||
<td width="60px">${(costProjectManageDetail_index+1)!}</td>
|
||||
<td>
|
||||
<td width="120px">
|
||||
<#if costProjectManageDetail.type ==1 >
|
||||
人工成本
|
||||
<#elseif costProjectManageDetail.type ==2>
|
||||
|
|
@ -1374,16 +1460,29 @@
|
|||
</#list>
|
||||
</#if>
|
||||
<tr class="total-new" id="manageTotal">
|
||||
<td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="总计" readonly></td>
|
||||
<td width="60px">总计</td>
|
||||
<td width="120px"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage"
|
||||
value="${Utils.format(costProjectManageTotalAmount,'0.00')}"
|
||||
readonly <#--onkeyup="integerNumber(this)"-->></td>
|
||||
<td></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-pay-amount-project-manage" value="${Utils.format(managePayAmountTotal,'0.00')}" readonly></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage"
|
||||
value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0.00')}"
|
||||
readonly></td>
|
||||
<td></td>
|
||||
<td><input type="text"
|
||||
class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-pay-amount-project-manage"
|
||||
value="${Utils.format(managePayAmountTotal,'0.00')}"
|
||||
readonly></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<#--<td></td>-->
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -1429,27 +1528,27 @@
|
|||
class="am-modal-prompt-input"
|
||||
value="月份"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="设备付款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="工程付款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="服务付款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="其他付款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="项目管理费用付款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="保证金付款"
|
||||
readonly></td>
|
||||
|
|
@ -1457,11 +1556,11 @@
|
|||
class="am-modal-prompt-input"
|
||||
value="付款合计"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="销售收款"
|
||||
readonly></td>
|
||||
<td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
|
||||
<td style="display: block;border-top: 1px solid #ddd;"><input type="text"
|
||||
class="am-modal-prompt-input"
|
||||
value="保证金收款"
|
||||
readonly></td>
|
||||
|
|
@ -1875,13 +1974,6 @@
|
|||
<td>费用项目</td>
|
||||
<td>不含税金额（元）</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>成本</td>
|
||||
<td>项目管理费用</td>
|
||||
<td><input type="text" class="number" name="costProjectManageTaxExclude"
|
||||
value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
|
||||
readonly title="项目管理成本总额不含税"></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>财务费用</td>
|
||||
<td>资金占用成本</td>
|
||||
|
|
@ -1889,11 +1981,12 @@
|
|||
value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}"
|
||||
required readonly title="资金占用成本不含税总额"></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>合计</td>
|
||||
<td></td>
|
||||
<td><input type="text" class="number" name="incomeTotalTax" value="${(Utils.format(budgetBean.costExpropriationTaxExclude+budgetBean.costProjectManageTaxExclude,'0'))}" readonly title="此列累计"></td>
|
||||
<td>成本</td>
|
||||
<td>项目管理费用</td>
|
||||
<td><input type="text" class="number" name="costProjectManageTaxExclude"
|
||||
value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
|
||||
readonly title="项目管理成本总额不含税"></td>
|
||||
</tr>
|
||||
<#-- <tr>-->
|
||||
<#-- <td>公司管理费用</td>-->
|
||||
|
|
@ -1924,7 +2017,7 @@
|
|||
<td><input type="text" class="number" name="projectGrossProfitA"
|
||||
value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly
|
||||
title="收入总计（不含税）-成本总计（不含税）"></td>
|
||||
<td>项目毛利A=收入合计（不含税）-采购成本合计（不含税）</td>
|
||||
<td>毛利A=收入明细表金额总计(不含税)-采购成本明细表金额总计(不含税)</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>项目毛利B（元）</td>
|
||||
|
|
@ -4079,7 +4172,6 @@
|
|||
$('.am-modal-prompt-input-budget-plan-income').css('display', 'none');
|
||||
$('.am-modal-prompt-input-budget-plan-cost').css('display', 'none');
|
||||
};
|
||||
closeDetail()
|
||||
|
||||
var openDetail = function () {
|
||||
$('.am-modal-prompt-input-budget-plan-income').css('display', 'block');
|
||||
|
|
|
|||
|
|
@ -1054,6 +1054,9 @@
|
|||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<#-- <td></td>-->
|
||||
<#-- <td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-amount-project-manage" value="${Utils.format(costProjectManageTotalAmount,'0')}" readonly <#–onkeyup="integerNumber(this)"–>></td>-->
|
||||
<#-- <td></td>-->
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly></td>
|
||||
<td></td>
|
||||
<td><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage input-changeable-total-pay-amount-project-manage" value="${Utils.format(managePayAmountTotal,'0.00')}" readonly></td>
|
||||
|
|
|
|||
Loading…
Reference in New Issue