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

Merge remote-tracking branch 'origin/master'

master
OathK1per 2021-12-31 17:33:59 +08:00
parent a60b1d854c e15e0775d4
commit 6ce90e0168
6 changed files with 126 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/resources/static/assets/js/project_budget_cost.js
View File

@ -106,6 +106,26 @@ SELECT_CATEGORY_TYPE_MAP_DATA={};
getAjax(base+"/procurement/type/map", null, initTypeCategory);
});*/
$(function () {
$("#cost-detail").click(function () {
$('#my-prompt-cost-detail').modal({
relatedTarget: this,
closeOnConfirm:false,
onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-cost");
//data = prepareAjaxData(data, COST_DETAIL_ARR, $("#id").val(),false);
data = prepareAjaxDataVerify(data, COST_DETAIL, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostDetail", data, updateCostData);
}
},
onCancel: function(e) {
}
});
});
});
//保存采购成本明细表
$(function () {
$("#costTableSave").click(function () {

20
src/main/resources/static/assets/js/project_budget_cost_project_manage.js
View File

@ -49,6 +49,26 @@ SELECT_CATEGORY_TYPE_MAP_DATA_MANAGER={};
initTypeCategoryManage();
});*/
$(function () {
$("#cost-project-manage-detail").click(function () {
$('#my-prompt-cost-project-manage-detail').modal({
relatedTarget: this,
closeOnConfirm:false,
onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的
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_DETAIL, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveCostProjectManageDetail", data, updateCostProjectManageData);
}
},
onCancel: function(e) {
}
});
});
});
//保存项目管理成本表
$(function () {

20
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -36,6 +36,26 @@ INCOME_DETAIL={
});
});*/
$(function () {
$("#income-detail").click(function () {
$('#my-prompt-income-detail').modal({
relatedTarget: this,
closeOnConfirm:false,
onConfirm: function(e) {
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-income");
//data = prepareAjaxData(data, INCOME_DETAIL_ARR, $("#id").val(),false);
data = prepareAjaxDataVerify(data, INCOME_DETAIL, $("#id").val());
if(data.details){
postAjax(base+"/project/budgetEditSaveIncomeDetail", data, updateIncomeData);
}
},
onCancel: function(e) {
}
});
});
});
//保存收入明细表
$(function () {
$("#incomeTableSave").click(function () {

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

@ -63,6 +63,33 @@ BUDGET_PLAN_DETAIL={
});*/
$(function () {
$(".budget-plan-detail").click(function () {
$('#my-prompt-budget-plan-detail').modal({
relatedTarget: this,
closeOnConfirm:false,
onConfirm: function(e) {
//校验数据正确性
var message = verifyBudgetPlan();
if (message) {
layuiAlert(message);
return;
}
//不能使用e.data，因为无法获取动态添加的
var data = collectData("am-modal-prompt-input-budget-plan-detail");
//data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false);
data = prepareAjaxDataVerify(data, BUDGET_PLAN_DETAIL, $("#id").val());
if(data){
postAjax(base+"/project/budgetEditSaveBudgetPlanDetail", data, updateBudgetPlanDetailData);
}
},
onCancel: function(e) {
}
});
});
});
//保存资金计划表
$(function () {
$("#budgetPlanDetailTableSave").click(function () {

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

@ -430,6 +430,9 @@
</#if>
<span class="am-text-lg">收入</span>
<span class="am-text-primary"><a style="cursor: pointer" id="income-detail">收入明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr class="am-text-lg">
@ -465,8 +468,8 @@
</tbody>
</table>
<span class="am-text-lg">成本</span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>
<#-- <span class="am-text-primary"><a style="cursor: pointer" id="cost-detail">采购成本明细表</a></span>
<span class="am-text-primary"><a style="cursor: pointer" id="cost-project-manage-detail">项目管理成本表</a></span>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr class="am-text-lg">
@ -528,7 +531,7 @@
</tbody>
</table>
<span class="am-text-lg">管理</span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>
<#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr class="am-text-lg">
@ -576,7 +579,7 @@
</table>
<span class="am-text-lg">现金流量表</span>
<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>
<#--<span class="am-text-primary budget-plan-detail"><a style="cursor: pointer">资金计划表</a></span>-->
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
<tbody>
<tr class="am-text-lg">
@ -1377,7 +1380,7 @@
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-income-detail">
<div class="am-modal-dialog">
<div class="am-modal-hd">新增销售收入明细表——${project.name}</div>
<div class="am-modal-hd">销售收入明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="incomeTable">
@ -1462,7 +1465,7 @@
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-cost-detail">
<div class="am-modal-dialog">
<div class="am-modal-hd">新增采购成本明细表——${project.name}</div>
<div class="am-modal-hd">采购成本明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="costTable">
@ -1557,7 +1560,7 @@
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-cost-project-manage-detail">
<div class="am-modal-dialog">
<div class="am-modal-hd">新增项目管理成本明细表——${project.name}</div>
<div class="am-modal-hd">项目管理成本明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="costProjectManageTable">
@ -1658,7 +1661,7 @@
<div class="am-modal am-modal-prompt" style="width: 1200px;max-height:600px;overflow-y:auto;"
tabindex="-1" id="my-prompt-budget-plan-detail">
<div class="am-modal-dialog">
<div class="am-modal-hd">新增资金计划明细表——${project.name}</div>
<div class="am-modal-hd">资金计划明细表——${project.name}</div>
<div class="am-modal-bd">
<table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;"
id="budgetPlanDetailTable">

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

@ -228,26 +228,26 @@
<tr>
<td>收入</td>
<td>设备类</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>收入</td>
<td>工程类</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>收入</td>
<td>服务类</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>合计</td>
<td></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude1" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude1" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
</tr>
</tbody>
</table>
@ -265,50 +265,50 @@
<td>成本</td>
<td>采购成本</td>
<td>设备</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>施工</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>服务</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>成本</td>
<td>采购成本</td>
<td>其他</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>成本</td>
<td>项目管理成本</td>
<td>项目管理成本</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>成本</td>
<td>其他</td>
<td>${project.otherName!}</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>合计</td>
<td></td>
<td></td>
<td><input type="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" name="costTotalTaxInclude1" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
<td><input type="number" name="costTotalTaxExclude1" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
</tr>
</tbody>
</table>
@ -323,12 +323,12 @@
<tr>
<td>财务费用</td>
<td>资金占用成本</td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
</tr>
<tr>
<td>公司管理费用</td>
<td></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
<td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
</tr>
</tbody>
</table>
@ -342,19 +342,19 @@
</tr>
<tr>
<td>项目毛利（元）</td>
<td><input type="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
<td><input type="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
</tr>
<tr>
<td>项目毛利率（%）</td>
<td><input type="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
<td><input type="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
</tr>
<tr>
<td>项目贡献利润（元）</td>
<td><input type="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
<td><input type="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
</tr>
<tr>
<td>项目贡献利润率（%）</td>
<td><input type="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
<td><input type="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
</tr>
</tbody>
</table>