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

修复页面显示问题

master
hanbo 2021-11-30 11:58:33 +08:00
parent 8da7c908e0
commit ec4501e656
5 changed files with 110 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/cn/palmte/work/bean/FormerBean.java
View File

@ -1,12 +1,13 @@
package cn.palmte.work.bean;
import java.math.BigDecimal;
import java.math.RoundingMode;
/**
* @author Yuanping Zhang
* @date 2021/11/15
*/
public class FormerBean extends IncomeCostBean{
public class FormerBean extends IncomeCostBean {
/**
* 所得税
@ -42,11 +43,11 @@ public class FormerBean extends IncomeCostBean{
private BigDecimal netProfitMargin;
/**
* a销售商品、提供劳务收到的现金
* */
*/
private BigDecimal saleIncomeCash;
/**
* b收到的税费返还
* */
*/
private BigDecimal taxReturn;
/**
* c其他与经营活动有关的现金【保证金收入】
@ -61,7 +62,7 @@ public class FormerBean extends IncomeCostBean{
*/
private BigDecimal taxCost;
/**
*f支付其他与经营活动有关的现金
* f支付其他与经营活动有关的现金
*/
private BigDecimal earnestMoneyCost;
/**
@ -89,7 +90,7 @@ public class FormerBean extends IncomeCostBean{
*/
private BigDecimal financingCapitalOutflow;
/**
*m筹资活动产生的现金流量净额
* m筹资活动产生的现金流量净额
*/
private BigDecimal financingCapitalCashflow;
/**
@ -114,11 +115,10 @@ public class FormerBean extends IncomeCostBean{
if (null == grossProfit || null == incomeTotalTaxExclude) {
return handleSpecial(null);
}
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO;
}
return grossProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100));
return grossProfit.divide(incomeTotalTaxExclude,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
}
public void setGrossProfitProfitMargin(BigDecimal grossProfitProfitMargin) {
@ -126,7 +126,7 @@ public class FormerBean extends IncomeCostBean{
}
/**
*项目贡献利润利润率
* 项目贡献利润利润率
*/
private BigDecimal contributionProfitProfitMargin;
@ -141,8 +141,7 @@ public class FormerBean extends IncomeCostBean{
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO;
}
return contributionProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100));
return contributionProfit.divide(incomeTotalTaxExclude,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
}
public void setContributionProfitProfitMargin(BigDecimal contributionProfitProfitMargin) {
@ -165,7 +164,7 @@ public class FormerBean extends IncomeCostBean{
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO;
}
return netProfit.divide(incomeTotalTaxExclude, 4).multiply(new BigDecimal(100));
return netProfit.divide(incomeTotalTaxExclude,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
}
public void setNetProfitProfitMargin(BigDecimal netProfitProfitMargin) {

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

@ -2,32 +2,50 @@ function calculateFinal() {
$("input[name='incomeDeviceFinalTotal']").change(function () {
calIncomeFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='incomeEngineerFinalTotal']").change(function () {
calIncomeFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='incomeServiceFinalTotal']").change(function () {
calIncomeFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costPurchaseDeviceFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costPurchaseBuildFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costPurchaseServiceFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costPurchaseOtherFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costProjectManageFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
$("input[name='costOtherFinalTotal']").change(function () {
calCostFinalTotal();
calNetMarginFinalTotal();
calNetMarginProfitMargin();
});
@ -69,7 +87,7 @@ function calculateFinal() {
calNetIncreaseMonetaryFunds();
});
$("input[name='taxCost']").change(function () {
// calCashFluxFinalTotal();
// calCashFluxFinalTotal();
calNetCashFlow();
calNetIncreaseMonetaryFunds();
});
@ -79,10 +97,10 @@ function calculateFinal() {
calNetIncreaseMonetaryFunds();
});
$("input[name='netCashFlow']").change(function () {
// calCashFluxFinalTotal();
// calCashFluxFinalTotal();
});
$("input[name='cashInflowFromInvestingActivities']").change(function () {
// calCashFluxFinalTotal();
// calCashFluxFinalTotal();
calNetCashFromInvestingActivities();
calNetIncreaseMonetaryFunds();
})
@ -92,7 +110,7 @@ function calculateFinal() {
calNetIncreaseMonetaryFunds();
});
$("input[name='netCashFromInvestingActivities']").change(function () {
// calCashFluxFinalTotal();
// calCashFluxFinalTotal();
});
$("input[name='financingCapitalInflow']").change(function () {
//calCashFluxFinalTotal();
@ -128,11 +146,11 @@ function calNetCashFlow() {
var netCashFlow = $("input[name='netCashFlow']");
if(saleIncomeCash && taxReturn && earnestMoneyIncome
&& purchaseCost && taxCost && earnestMoneyCost){
netCashFlow.val(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)
-parseFloat(purchaseCost)-parseFloat(taxCost)-parseFloat(earnestMoneyCost));
}else {
if (saleIncomeCash && taxReturn && earnestMoneyIncome
&& purchaseCost && taxCost && earnestMoneyCost) {
netCashFlow.val(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome)
- parseFloat(purchaseCost) - parseFloat(taxCost) - parseFloat(earnestMoneyCost));
} else {
netCashFlow.val("");
}
}
@ -146,9 +164,9 @@ function calNetCashFromInvestingActivities() {
var netCashFromInvestingActivities = $("input[name='netCashFromInvestingActivities']");
if(cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities ){
netCashFromInvestingActivities.val(parseFloat(cashInflowFromInvestingActivities)-parseFloat(cashOutflowFromInvestingActivities));
}else {
if (cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities) {
netCashFromInvestingActivities.val(parseFloat(cashInflowFromInvestingActivities) - parseFloat(cashOutflowFromInvestingActivities));
} else {
netCashFromInvestingActivities.val("");
}
}
@ -162,9 +180,9 @@ function calFinancingCapitalCashflow() {
var financingCapitalCashflow = $("input[name='financingCapitalCashflow']");
if(financingCapitalInflow && financingCapitalOutflow ){
financingCapitalCashflow.val(parseFloat(financingCapitalInflow)-parseFloat(financingCapitalOutflow));
}else {
if (financingCapitalInflow && financingCapitalOutflow) {
financingCapitalCashflow.val(parseFloat(financingCapitalInflow) - parseFloat(financingCapitalOutflow));
} else {
financingCapitalCashflow.val("");
}
}
@ -176,9 +194,9 @@ function calNetIncreaseMonetaryFunds() {
var netIncreaseMonetaryFunds = $("input[name='netIncreaseMonetaryFunds']");
if(netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow){
netIncreaseMonetaryFunds.val(parseFloat(netCashFlow)+parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalCashflow));
}else {
if (netCashFlow && netCashFromInvestingActivities && financingCapitalCashflow) {
netIncreaseMonetaryFunds.val(parseFloat(netCashFlow) + parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalCashflow));
} else {
netIncreaseMonetaryFunds.val("");
}
}
@ -193,9 +211,9 @@ function calIncomeFinalTotal() {
var incomeFinalTotal = $("input[name='incomeFinalTotal']");
if(incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal){
incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal)+parseFloat(incomeEngineerFinalTotal)+parseFloat(incomeServiceFinalTotal));
}else {
if (incomeDeviceFinalTotal && incomeEngineerFinalTotal && incomeServiceFinalTotal) {
incomeFinalTotal.val(parseFloat(incomeDeviceFinalTotal) + parseFloat(incomeEngineerFinalTotal) + parseFloat(incomeServiceFinalTotal));
} else {
incomeFinalTotal.val("");
}
}
@ -213,11 +231,11 @@ function calCostFinalTotal() {
var costFinalTotal = $("input[name='costFinalTotal']");
if(costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal){
costFinalTotal.val(parseFloat(costPurchaseDeviceFinalTotal)+parseFloat(costPurchaseBuildFinalTotal)+parseFloat(costPurchaseServiceFinalTotal)+
parseFloat(costPurchaseOtherFinalTotal)+parseFloat(costProjectManageFinalTotal)+parseFloat(costOtherFinalTotal));
}else {
if (costPurchaseDeviceFinalTotal && costPurchaseBuildFinalTotal && costPurchaseServiceFinalTotal &&
costPurchaseOtherFinalTotal && costProjectManageFinalTotal && costOtherFinalTotal) {
costFinalTotal.val(parseFloat(costPurchaseDeviceFinalTotal) + parseFloat(costPurchaseBuildFinalTotal) + parseFloat(costPurchaseServiceFinalTotal) +
parseFloat(costPurchaseOtherFinalTotal) + parseFloat(costProjectManageFinalTotal) + parseFloat(costOtherFinalTotal));
} else {
costFinalTotal.val("");
}
}
@ -233,9 +251,9 @@ function calManageFinalTotal() {
var manageFinalTotal = $("input[name='manageFinalTotal']");
if(costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal){
manageFinalTotal.val(parseFloat(costExpropriationFinalTotal)+parseFloat(costCompanyManageFinalTotal)+parseFloat(costIncomeTaxFinalTotal));
}else {
if (costExpropriationFinalTotal && costCompanyManageFinalTotal && costIncomeTaxFinalTotal) {
manageFinalTotal.val(parseFloat(costExpropriationFinalTotal) + parseFloat(costCompanyManageFinalTotal) + parseFloat(costIncomeTaxFinalTotal));
} else {
manageFinalTotal.val("");
}
}
@ -261,17 +279,17 @@ function calCashFluxFinalTotal() {
var cashFluxFinalTotal = $("input[name='cashFluxFinalTotal']");
if(saleIncomeCash && taxReturn && earnestMoneyIncome &&
purchaseCost && taxCost && earnestMoneyCost&&
if (saleIncomeCash && taxReturn && earnestMoneyIncome &&
purchaseCost && taxCost && earnestMoneyCost &&
netCashFlow && cashInflowFromInvestingActivities && cashOutflowFromInvestingActivities &&
netCashFromInvestingActivities && financingCapitalInflow && financingCapitalOutflow
&& financingCapitalCashflow && netIncreaseMonetaryFunds){
cashFluxFinalTotal.val(parseFloat(saleIncomeCash)+parseFloat(taxReturn)+parseFloat(earnestMoneyIncome)+
parseFloat(purchaseCost)+parseFloat(taxCost)+parseFloat(earnestMoneyCost)+
parseFloat(netCashFlow)+parseFloat(cashInflowFromInvestingActivities)+parseFloat(cashOutflowFromInvestingActivities)+
parseFloat(netCashFromInvestingActivities)+parseFloat(financingCapitalInflow)+parseFloat(financingCapitalOutflow)+
parseFloat(financingCapitalCashflow)+parseFloat(netIncreaseMonetaryFunds));
}else {
&& financingCapitalCashflow && netIncreaseMonetaryFunds) {
cashFluxFinalTotal.val(parseFloat(saleIncomeCash) + parseFloat(taxReturn) + parseFloat(earnestMoneyIncome) +
parseFloat(purchaseCost) + parseFloat(taxCost) + parseFloat(earnestMoneyCost) +
parseFloat(netCashFlow) + parseFloat(cashInflowFromInvestingActivities) + parseFloat(cashOutflowFromInvestingActivities) +
parseFloat(netCashFromInvestingActivities) + parseFloat(financingCapitalInflow) + parseFloat(financingCapitalOutflow) +
parseFloat(financingCapitalCashflow) + parseFloat(netIncreaseMonetaryFunds));
} else {
cashFluxFinalTotal.val("");
}
}
@ -286,9 +304,9 @@ function calGrossProfitFinalTotal() {
var grossProfitFinalTotal = $("input[name='grossProfitFinalTotal']");
if(incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal){
grossProfitFinalTotal.val(parseFloat(incomeFinalTotal)-parseFloat(costFinalTotal)-parseFloat(costExpropriationFinalTotal));
}else {
if (incomeFinalTotal && costFinalTotal && costExpropriationFinalTotal) {
grossProfitFinalTotal.val(parseFloat(incomeFinalTotal) - parseFloat(costFinalTotal) - parseFloat(costExpropriationFinalTotal));
} else {
grossProfitFinalTotal.val("");
}
}
@ -301,9 +319,9 @@ function calGrossProfitProfitMargin() {
var incomeFinalTotal = $("input[name='incomeFinalTotal']").val();
var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
if(grossProfitFinalTotal && incomeFinalTotal){
grossProfitProfitMargin.val(f2(grossProfitFinalTotal) / f2(incomeFinalTotal));
}else {
if (grossProfitFinalTotal && incomeFinalTotal) {
grossProfitProfitMargin.val(100 * grossProfitFinalTotal / incomeFinalTotal);
} else {
grossProfitProfitMargin.val("");
}
}
@ -318,9 +336,9 @@ function calContributionMarginFinalTotal() {
var contributionMarginFinalTotal = $("input[name='contributionMarginFinalTotal']");
if(grossProfitFinalTotal && costCompanyManageFinalTotal ){
contributionMarginFinalTotal.val(parseFloat(grossProfitFinalTotal)-parseFloat(costCompanyManageFinalTotal));
}else {
if (grossProfitFinalTotal && costCompanyManageFinalTotal) {
contributionMarginFinalTotal.val(parseFloat(grossProfitFinalTotal) - parseFloat(costCompanyManageFinalTotal));
} else {
contributionMarginFinalTotal.val("");
}
}
@ -333,9 +351,9 @@ function calContributionMarginProfitMargin() {
var incomeFinalTotal = $("input[name='incomeFinalTotal']").val();
var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
if(contributionMarginFinalTotal && incomeFinalTotal){
contributionMarginProfitMargin.val(f2(contributionMarginFinalTotal) / f2(incomeFinalTotal));
}else {
if (contributionMarginFinalTotal && incomeFinalTotal) {
contributionMarginProfitMargin.val(100 * contributionMarginFinalTotal / incomeFinalTotal);
} else {
contributionMarginProfitMargin.val("");
}
}
@ -350,9 +368,9 @@ function calNetMarginFinalTotal() {
var netMarginFinalTotal = $("input[name='netMarginFinalTotal']");
if(contributionMarginFinalTotal && costIncomeTaxFinalTotal ){
netMarginFinalTotal.val(parseFloat(contributionMarginFinalTotal)-parseFloat(costIncomeTaxFinalTotal));
}else {
if (contributionMarginFinalTotal && costIncomeTaxFinalTotal) {
netMarginFinalTotal.val(parseFloat(contributionMarginFinalTotal) - parseFloat(costIncomeTaxFinalTotal));
} else {
netMarginFinalTotal.val("");
}
}
@ -365,9 +383,9 @@ function calNetMarginProfitMargin() {
var incomeFinalTotal = $("input[name='incomeFinalTotal']").val();
var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
if(netMarginFinalTotal && incomeFinalTotal){
netMarginProfitMargin.val(f2(netMarginFinalTotal) / f2(incomeFinalTotal));
}else {
if (netMarginFinalTotal && incomeFinalTotal) {
netMarginProfitMargin.val(100 * netMarginFinalTotal / incomeFinalTotal);
} else {
netMarginProfitMargin.val("");
}
}

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

@ -201,21 +201,21 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资利息</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.advanceInterestAmount}</span>元
<span>${Utils.format(project.advanceInterestAmount)}</span>元
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>垫资峰值</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.advancePeakAmount}</span>元
<span>${Utils.format(project.advancePeakAmount)}</span>元
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>合同金额</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.contractAmount}</span>元
<span>${Utils.format(project.contractAmount)}</span>元
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -229,14 +229,14 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>华智产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.huazhiProductAmount!}</span>元
<span>${Utils.format(project.huazhiProductAmount)}</span>元
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span>紫光其他产品金额</div>
<div class="am-u-sm-6 am-u-md-6">
<span>${project.ziguangOtherAmount!}</span>元
<span>${Utils.format(project.ziguangOtherAmount)}</span>元
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div>
@ -643,7 +643,7 @@
<div class="am-u-sm-10">
<div class="am-form am-form-inline">
<div class="am-form-group am-form-icon">
<input type="text" id="time" name="time" autocomplete="off" readonly value="${time!}">
<input type="text" id="time" name="time" autocomplete="off" data-am-datepicker readonly value="${time!}">
</div>
</div>
</div>
@ -1883,12 +1883,12 @@
<script>
var base = "${base}";
</script>
<#-- <script src="${base}/assets/js/project_common.js"></script>
<script src="${base}/assets/js/project_common.js"></script>
<script src="${base}/assets/js/project_budget.js"></script>
<script src="${base}/assets/js/project_budget_income.js"></script>
<script src="${base}/assets/js/project_budget_cost.js"></script>
<script src="${base}/assets/js/project_budget_cost_project_manage.js"></script>
<script src="${base}/assets/js/project_budget_plan.js"></script>-->
<script src="${base}/assets/js/project_budget_plan.js"></script>
</@defaultLayout.layout>
<script>
@ -1911,7 +1911,6 @@
});
});
var completeTask = function (projectId) {
var message = $("#doc-vld-ta-2").val();
var type = $("input[name='docVlGender']:checked").val();

14
src/main/resources/templates/admin/role_input.ftl
View File

@ -36,14 +36,16 @@
<div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-2 am-text-right">
<span style="color: red;">*</span>角色等级</div>
<span style="color: red;">*</span>角色类型</div>
<div class="am-u-sm-6 am-u-md-6">
<select data-am-selected="{btnWidth: '40%', btnSize: 'sm'" id="level" name="level">
<option value="1" <#if role.level! ==1>selected</#if> >一级</option>
<option value="2" <#if role.level! ==2>selected</#if> >二级</option>
<option value="3" <#if role.level! ==3>selected</#if> >三级</option>
<option value="4" <#if role.level! ==4>selected</#if> >四级</option>
<option value="5" <#if role.level! ==5>selected</#if> >五级</option>
<option value="1" <#if role.level! ==1>selected</#if> >执行董事</option>
<option value="2" <#if role.level! ==2>selected</#if> >财务总监</option>
<option value="3" <#if role.level! ==3>selected</#if> >总经理</option>
<option value="4" <#if role.level! ==4>selected</#if> >工程部主管</option>
<option value="5" <#if role.level! ==5>selected</#if> >集成部主管(管理员)</option>
<option value="6" <#if role.level! ==6>selected</#if> >财务人员</option>
<option value="7" <#if role.level! ==7>selected</#if> >普通员工</option>
</select>
</div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>

16
src/main/resources/templates/admin/role_list.ftl
View File

@ -51,7 +51,7 @@
<th class="table-check">
<input type="checkbox" id="allCheck"></th>
<th class="table-title">角色名称</th>
<th class="table-title">角色等级</th>
<th class="table-title">角色类型</th>
<th class="table-title">是否启用</th>
<th class="table-date">创建日期</th>
<th class="table-date">最后更新日期</th>
@ -68,15 +68,19 @@
<td>${list.name!}</td>
<td>
<#if list.level ==1 >
一级
执行董事
<#elseif list.level ==2>
二级
财务总监
<#elseif list.level ==3>
三级
总经理
<#elseif list.level ==4>
四级
工程部主管
<#elseif list.level ==5>
五级
集成部主管(管理员)
<#elseif list.level ==6>
财务人员
<#elseif list.level ==7>
普通员工
</#if>
</td>
<td>