mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

第一期调整完成

dev_1.0.0
‘wangjiuyun 2024-10-29 17:07:51 +08:00
parent d34ae39d8d
commit e45cbd63c1
5 changed files with 118 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/resources/static/assets/js/project_budget.js
View File

@ -152,6 +152,7 @@ $(function () {
var projectGrossProfitA=$('[name="projectGrossProfitA"]').val() var projectGrossProfitA=$('[name="projectGrossProfitA"]').val()
if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){ if(Number(totalTotal)> (Number(projectGrossProfitA)*0.1) ){
layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`); layuiAlert(`总金额合计不能超过毛利A(${projectGrossProfitA})的10%`);
$("#saveDraft").attr('disabled', false)
return return
} }
if(dataManage){ if(dataManage){
@ -194,11 +195,18 @@ $(function () {
// } // }
// console.log(message); // console.log(message);
// 保存付款计划表 // 保存付款计划表
var flagPay= verifyBudgetPay()
if(!flagPay) {
$("#saveDraft").attr('disabled', false)
return;
}
var dataPay = collectData("am-modal-prompt-input-pay"); var dataPay = collectData("am-modal-prompt-input-pay");
dataPay = prepareAjaxDataVerify(dataPay, pay_DETAIL2, $("#id").val()); dataPay = prepareAjaxDataVerify(dataPay, pay_DETAIL2, $("#id").val());
if(dataPay){ if(dataPay){
postAjax(base+"/project/budgetEditSaveBudgetPayPlan", dataPay); postAjax(base+"/project/budgetEditSaveBudgetPayPlan", dataPay);
} }
var startTime = $("#startDate").val(); var startTime = $("#startDate").val();
var endTime = $("#endDate").val(); var endTime = $("#endDate").val();
if (startTime > endTime) { if (startTime > endTime) {
@ -324,6 +332,17 @@ $(function () {
// layuiAlert(message); // layuiAlert(message);
// return; // 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 startTime = $("#startDate").val();
var endTime = $("#endDate").val(); var endTime = $("#endDate").val();

19
src/main/resources/static/assets/js/project_budget_pay.js
View File

@ -119,11 +119,12 @@ $(function () {
var data = collectData("am-modal-prompt-input-pay"); var data = collectData("am-modal-prompt-input-pay");
//data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false); //data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
data = prepareAjaxDataVerify(data, pay_DETAIL2, $("#id").val()); data = prepareAjaxDataVerify(data, pay_DETAIL2, $("#id").val());
var flag=verifyBudgetPay()
if(!flag) return
if (data) { if (data) {
postAjax(base + "/project/budgetEditSaveBudgetPayPlan", data, updateCostData); postAjax(base + "/project/budgetEditSaveBudgetPayPlan", data, updateCostData);
} }
}); });
$("#payAddBtn").click(function () { $("#payAddBtn").click(function () {
appendTrPay(); appendTrPay();
$("#payAddBtn").blur(); $("#payAddBtn").blur();
@ -338,3 +339,19 @@ function initTypeCategory(params, data) {
// console.log(SELECT_TYPE_CATEGORY_DATA); // console.log(SELECT_TYPE_CATEGORY_DATA);
// console.log(SELECT_CATEGORY_TYPE_MAP_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
}

6
src/main/resources/static/assets/js/project_budget_plan.js
View File

@ -1051,9 +1051,3 @@ function updateCashFlow() {
$("input[name='financingCapitalCashflow']").val(f2Fixed(m)); $("input[name='financingCapitalCashflow']").val(f2Fixed(m));
$("input[name='netIncreaseMonetaryFunds']").val(f2Fixed(n)); $("input[name='netIncreaseMonetaryFunds']").val(f2Fixed(n));
} }
//校验付款明细表
function verifyBudgetPay(){
var timeValue = classVal("input-changeable-pay-time");
}

158
src/main/resources/templates/admin/project_approve.ftl
View File

@ -954,7 +954,7 @@
<#list incomeDetails as incomeDetail> <#list incomeDetails as incomeDetail>
<tr> <tr>
<td>${(incomeDetail_index+1)!}</td> <td>${(incomeDetail_index+1)!}</td>
<td> <td width="100px">
<#if incomeDetail.type ==1 > <#if incomeDetail.type ==1 >
设备类 设备类
<#elseif incomeDetail.type ==2> <#elseif incomeDetail.type ==2>
@ -992,7 +992,7 @@
</#if> </#if>
<tr class="total-new" id="incomeTotal"> <tr class="total-new" id="incomeTotal">
<td>总计</td> <td>总计</td>
<td></td> <td width="100px"></td>
<td></td> <td></td>
<td></td> <td></td>
<td><input type="text" <td><input type="text"
@ -1094,7 +1094,6 @@
value="${Utils.format(budgetPayPlanTotal,'0')}" value="${Utils.format(budgetPayPlanTotal,'0')}"
readonly></td> readonly></td>
<td width="100px"></td> <td width="100px"></td>
<td width="60px"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -1193,22 +1192,13 @@
<thead> <thead>
<tr> <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>
<th>预估垫资金额(元)</th>
<th>支出时间</th>
<th>支出金额(元)</th>
<th>付款方式</th>
<th>备注</th> <th>备注</th>
</tr> </tr>
</thead> </thead>
@ -1218,17 +1208,6 @@
<tr> <tr>
<td>${(costDetail_index+1)!}</td> <td>${(costDetail_index+1)!}</td>
<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 > <#if costDetail.type ==1 >
设备 设备
<#elseif costDetail.type ==2> <#elseif costDetail.type ==2>
@ -1244,20 +1223,7 @@
<#if costDetail.category == procurementType.id>${procurementType.name}</#if> <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
</#list> </#list>
</td> </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" <td><input type="text" min="0.00" max="99.99" step="0.01"
readonly readonly
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate"
@ -1282,41 +1248,6 @@
class="am-modal-prompt-input am-modal-prompt-input-cost" class="am-modal-prompt-input am-modal-prompt-input-cost"
value="${costDetail.contractParty!}" readonly> value="${costDetail.contractParty!}" readonly>
</td> </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" <td><input type="text"
class="am-modal-prompt-input am-modal-prompt-input-cost" class="am-modal-prompt-input am-modal-prompt-input-cost"
value="${costDetail.remark!}" readonly></td> value="${costDetail.remark!}" readonly></td>
@ -1333,13 +1264,6 @@
<td></td> <td></td>
<td></td> <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" <td><input type="text"
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-include-cost"
value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}" value="${Utils.format(budgetBean.costPurchaseTotalTaxInclude,'0.00')}"
@ -1352,17 +1276,7 @@
class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-cost" class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-total-total-tax-cost"
value="${Utils.format(budgetBean.costPurchaseTotalTax,'0.00')}" value="${Utils.format(budgetBean.costPurchaseTotalTax,'0.00')}"
readonly></td> 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>
<td></td> <td></td>
</tr> </tr>
@ -1394,7 +1308,7 @@
id="costProjectManageTable"> id="costProjectManageTable">
<thead> <thead>
<tr> <tr>
<th>序号</th> <th width="60px">序号</th>
<th>费用类别</th> <th>费用类别</th>
<th>业务项目</th> <th>业务项目</th>
<th>项目明细</th> <th>项目明细</th>
@ -1413,7 +1327,7 @@
<#list costProjectManageDetails as costProjectManageDetail> <#list costProjectManageDetails as costProjectManageDetail>
<tr> <tr>
<td width="60px">${(costProjectManageDetail_index+1)!}</td> <td width="60px">${(costProjectManageDetail_index+1)!}</td>
<td width="120px"> <td>
<#if costProjectManageDetail.type ==1 > <#if costProjectManageDetail.type ==1 >
人工成本 人工成本
<#elseif costProjectManageDetail.type ==2> <#elseif costProjectManageDetail.type ==2>
@ -1460,29 +1374,16 @@
</#list> </#list>
</#if> </#if>
<tr class="total-new" id="manageTotal"> <tr class="total-new" id="manageTotal">
<td width="60px">总计</td> <td width="60px"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-cost-project-manage" value="总计" readonly></td>
<td width="120px"></td>
<td></td> <td></td>
<td></td> <td></td>
<td></td> <td></td>
<td><input type="text" <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>
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></td>
<td><input type="text" <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>
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>
<td></td> <td></td>
<#--<td></td>-->
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -1528,27 +1429,27 @@
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="月份" value="月份"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input " class="am-modal-prompt-input "
value="设备付款" value="设备付款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="工程付款" value="工程付款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="服务付款" value="服务付款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="其他付款" value="其他付款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="项目管理费用付款" value="项目管理费用付款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="保证金付款" value="保证金付款"
readonly></td> readonly></td>
@ -1556,11 +1457,11 @@
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="付款合计" value="付款合计"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="销售收款" value="销售收款"
readonly></td> readonly></td>
<td style="display: block;border-top: 1px solid #ddd;"><input type="text" <td style="display: block;border-top: 1px solid #ddd;" class="am-modal-prompt-input-budget-plan-cost"><input type="text"
class="am-modal-prompt-input" class="am-modal-prompt-input"
value="保证金收款" value="保证金收款"
readonly></td> readonly></td>
@ -1974,6 +1875,13 @@
<td>费用项目</td> <td>费用项目</td>
<td>不含税金额（元）</td> <td>不含税金额（元）</td>
</tr> </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> <tr>
<td>财务费用</td> <td>财务费用</td>
<td>资金占用成本</td> <td>资金占用成本</td>
@ -1981,12 +1889,11 @@
value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}" value="${Utils.format(budgetBean.costExpropriationTaxExclude,'0.00')}"
required readonly title="资金占用成本不含税总额"></td> required readonly title="资金占用成本不含税总额"></td>
</tr> </tr>
<tr> <tr>
<td>成本</td> <td>合计</td>
<td>项目管理费用</td> <td></td>
<td><input type="text" class="number" name="costProjectManageTaxExclude" <td><input type="text" class="number" name="incomeTotalTax" value="${(Utils.format(budgetBean.costExpropriationTaxExclude+budgetBean.costProjectManageTaxExclude,'0'))}" readonly title="此列累计"></td>
value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
readonly title="项目管理成本总额不含税"></td>
</tr> </tr>
<#-- <tr>--> <#-- <tr>-->
<#-- <td>公司管理费用</td>--> <#-- <td>公司管理费用</td>-->
@ -2017,7 +1924,7 @@
<td><input type="text" class="number" name="projectGrossProfitA" <td><input type="text" class="number" name="projectGrossProfitA"
value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly
title="收入总计（不含税）-成本总计（不含税）"></td> title="收入总计（不含税）-成本总计（不含税）"></td>
<td>毛利A=收入明细表金额总计(不含税)-采购成本明细表金额总计(不含税)</td> <td>项目毛利A=收入合计（不含税）-采购成本合计（不含税）</td>
</tr> </tr>
<tr> <tr>
<td>项目毛利B（元）</td> <td>项目毛利B（元）</td>
@ -4172,6 +4079,7 @@
$('.am-modal-prompt-input-budget-plan-income').css('display', 'none'); $('.am-modal-prompt-input-budget-plan-income').css('display', 'none');
$('.am-modal-prompt-input-budget-plan-cost').css('display', 'none'); $('.am-modal-prompt-input-budget-plan-cost').css('display', 'none');
}; };
closeDetail()
var openDetail = function () { var openDetail = function () {
$('.am-modal-prompt-input-budget-plan-income').css('display', 'block'); $('.am-modal-prompt-input-budget-plan-income').css('display', 'block');

3
src/main/resources/templates/admin/project_budget_edit.ftl
View File

@ -1054,9 +1054,6 @@
<td></td> <td></td>
<td></td> <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 &lt;#&ndash;onkeyup="integerNumber(this)"&ndash;&gt;></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-total-project-manage" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly></td>
<td></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-pay-amount-project-manage" value="${Utils.format(managePayAmountTotal,'0.00')}" readonly></td>