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

决算表项目毛利数据问题、决算表利润率被除数为0的问题

master
hanbo 2022-01-14 10:41:14 +08:00
parent 291212727f
commit 05145701a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -378,7 +378,7 @@ function calGrossProfitProfitMargin() {
var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
if (grossProfitFinalTotal && incomeFinalTotal) {
grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2(incomeFinalTotal)));
grossProfitProfitMargin.val(f2Fixed(100 * f2(grossProfitFinalTotal) / f2min(incomeFinalTotal)));
} else {
grossProfitProfitMargin.val("");
}
@ -410,7 +410,7 @@ function calContributionMarginProfitMargin() {
var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
if (contributionMarginFinalTotal && incomeFinalTotal) {
contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2(incomeFinalTotal)));
contributionMarginProfitMargin.val(f2Fixed(100 * f2(contributionMarginFinalTotal) / f2min(incomeFinalTotal)));
} else {
contributionMarginProfitMargin.val("");
}
@ -442,7 +442,7 @@ function calNetMarginProfitMargin() {
var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
if (netMarginFinalTotal && incomeFinalTotal) {
netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2(incomeFinalTotal)));
netMarginProfitMargin.val(f2Fixed(100 * f2(netMarginFinalTotal) / f2min(incomeFinalTotal)));
} else {
netMarginProfitMargin.val("");
}

2
src/main/resources/templates/admin/project_final_edit.ftl
View File

@ -218,7 +218,7 @@
<td>项目毛利</td>
<td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(estimateBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利概算总额"></td>
<td><input name="projectGrossProfit" type="text" class="number" value="${Utils.format(budgetBean.getProjectGrossProfit(),'0')}" readonly required title="项目毛利预算总额"></td>
<td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitSettleTotal,'0')}" readonly required title="项目毛利结算总额"></td>
<td><input name="grossProfitSettleTotal" type="text" class="number" value="${Utils.format(settleBean.grossProfit,'0')}" readonly required title="项目毛利结算总额"></td>
<td><input name="grossProfitFinalTotal" type="text" class="number" value="${Utils.format(finalBean.grossProfitFinalTotal,'0')}" readonly required title="项目毛利决算总额"></td>
<td><input name="grossProfitProfitMargin" type="text" class="number" value="${Utils.format(finalBean.grossProfitProfitMargin,'0')}" required readonly title="项目毛利利润率"></td>
</tr>