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

修改结算利润率

master
OathK1per 2022-01-12 10:45:34 +08:00
parent 16dac35feb
commit 8030783b7e
3 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/resources/static/assets/js/project_common.js
View File

@ -78,6 +78,30 @@ function digitalSelf(name, action) {
$action.val(f2Fixed(f2(self)));
}
/**
* parse float保留两位小数，四舍五入
* 空格或者非数字认为是0
* @param x
* @returns {*}
*/
function f2min(x) {
if(!x){
return 1;
}
if(typeof x === 'string'){
//这一步因为数字格式化为了包含分隔符，获取的时候就去掉这个分隔符
x = x.replaceAll(",","");
}
var f = parseFloat(x);
if (isNaN(f)) {
return 1;
}
if (f < 0.01 && f > -0.01) {
return 1;
}
return Math.round(f*100)/100;
}
/**
* 计算利润率
* @param r1

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

@ -579,7 +579,7 @@ function calGrossProfitProfitMargin() {
var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
if(grossProfitSettleTotal && incomeSettleTotal){
grossProfitProfitMargin.val(f2Fixed(100*(f2(grossProfitSettleTotal)/f2(incomeSettleTotal))));
grossProfitProfitMargin.val(f2Fixed(100*(f2(grossProfitSettleTotal)/f2min(incomeSettleTotal))));
}else {
grossProfitProfitMargin.val("");
}
@ -627,7 +627,7 @@ function calContributionProfitProfitMargin() {
var contributionProfitProfitMargin = $("input[name='contributionProfitProfitMargin']");
if(contributionProfitSettleTotal && incomeSettleTotal){
contributionProfitProfitMargin.val(f2Fixed(100*(f2(contributionProfitSettleTotal)/f2(incomeSettleTotal))));
contributionProfitProfitMargin.val(f2Fixed(100*(f2(contributionProfitSettleTotal)/f2min(incomeSettleTotal))));
}else {
contributionProfitProfitMargin.val("");
}
@ -675,7 +675,7 @@ function calNetProfitProfitMargin() {
var netProfitProfitMargin = $("input[name='netProfitProfitMargin']");
if(netProfitSettleTotal && incomeSettleTotal){
netProfitProfitMargin.val(f2Fixed(100*(f2(netProfitSettleTotal)/f2(incomeSettleTotal))));
netProfitProfitMargin.val(f2Fixed(100*(f2(netProfitSettleTotal)/f2min(incomeSettleTotal))));
}else {
netProfitProfitMargin.val("");
}

4
src/main/resources/templates/admin/project_settle_edit.ftl
View File

@ -260,7 +260,7 @@
<td><input name="contributionProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.contributionProfit,'0')}" required readonly title="项目贡献利润上月结算总额"></td>
<td><input type="text" class="number" maxlength="16" name="contributionProfit" value="${Utils.format(monthBean.contributionProfit,'0')}" readonly required title="项目贡献利润本月结算金额"></td>
<td><input type="text" class="number" name="contributionProfitSettleTotal" value="${Utils.format(currentBean.contributionProfit,'0')}" readonly title="项目贡献利润结算总额"></td>
<td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
<td><input name="contributionProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.contributionProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.contributionProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目贡献利润利润率"></td>
</tr>
<tr>
<td>项目净利润</td>
@ -269,7 +269,7 @@
<td><input name="netProfitFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.netProfit,'0')}" required readonly title="项目净利润上月结算总额"></td>
<td><input type="text" class="number" maxlength="16" name="netProfit" value="${Utils.format(monthBean.netProfit,'0')}" readonly required title="项目净利润本月结算金额"></td>
<td><input type="text" class="number" name="netProfitSettleTotal" value="${Utils.format(currentBean.netProfit,'0')}" readonly title="项目净利润结算总额"></td>
<td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.grossProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.grossProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
<td><input name="netProfitProfitMargin" type="text" class="number" <#if currentBean.getIncomeTotalTaxExclude() lt 0.01 && currentBean.getIncomeTotalTaxExclude() gt -0.01>value="${Utils.format(100 * currentBean.netProfit,'0')}"<#else>value="${Utils.format(100 * currentBean.netProfit / currentBean.getIncomeTotalTaxExclude(),'0')}"</#if> readonly title="项目净利润利润率"></td>
</tr>
</tbody>
</table>