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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/cn/palmte/work/bean/FormerBean.java
master
pengqiang 2021-11-30 14:17:14 +08:00
parent a7d840f840 0956883c35
commit 811f56b841
6 changed files with 126 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,11 +43,11 @@ public class FormerBean extends IncomeCostBean{
private BigDecimal netProfitMargin;
/**
* a销售商品、提供劳务收到的现金
* */
*/
private BigDecimal saleIncomeCash;
/**
* b收到的税费返还
* */
*/
private BigDecimal taxReturn;
/**
* c其他与经营活动有关的现金【保证金收入】
@ -115,7 +115,6 @@ public class FormerBean extends IncomeCostBean{
if (null == grossProfit || null == incomeTotalTaxExclude) {
return handleSpecial(null);
}
if (incomeTotalTaxExclude.compareTo(BigDecimal.ZERO) == 0) {
return BigDecimal.ZERO;
}
@ -143,7 +142,6 @@ public class FormerBean extends IncomeCostBean{
return BigDecimal.ZERO;
}
return contributionProfit.divide(incomeTotalTaxExclude,4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
}
public void setContributionProfitProfitMargin(BigDecimal contributionProfitProfitMargin) {

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

@ -40,32 +40,35 @@ function bindNumberInput() {
//键盘键弹起的时候
$inputs.keyup(function () {
var value = $(this).val();
value = value.replace(/[^\d.]/g, ""); //清除“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
value = value.replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
if (value.indexOf(".") < 0 && value != "") {
//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
value = parseFloat(value);
}
$(this).val(value);
keepDigital($(this));
});
//失去焦点时再校验一遍
$inputs.blur(function() {
var value = $(this).val();
var reg = new RegExp("^[0-9]+(.[0-9]{1,2})?$");
/*var reg = new RegExp("^(\-)?[0-9]+(.[0-9]{1,2})?$");
if (reg.test(value)) {
//是数字就是数字，可以两位或者不带小数
$(this).val(value);
} else {
$(this).val("");
}
}*/
keepDigital($(this));
});
}
function keepDigital($input) {
var value = $input.val();
value = value.replace(/[^\-\d.]/g, ""); //清除“-”、“数字”和“.”以外的字符
value = value.replace(/\.{2,}/g, "."); //只保留第一个. 清除多余的
value = value.replace(".", "$#$").replace(/\./g, "").replace("$#$", ".");
value = value.replace(/^(\-)?(\d+)\.(\d\d).*$/, '$1$2.$3'); //只能输入两个小数
if (value.indexOf(".") < 0 && value != "") {
//以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
value = parseFloat(value);
}
$input.val(value);
}
/**
* 保留整数
*/

24
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();
});
@ -302,7 +320,7 @@ function calGrossProfitProfitMargin() {
var grossProfitProfitMargin = $("input[name='grossProfitProfitMargin']");
if (grossProfitFinalTotal && incomeFinalTotal) {
grossProfitProfitMargin.val(f2(grossProfitFinalTotal) / f2(incomeFinalTotal));
grossProfitProfitMargin.val(100 * grossProfitFinalTotal / incomeFinalTotal);
} else {
grossProfitProfitMargin.val("");
}
@ -334,7 +352,7 @@ function calContributionMarginProfitMargin() {
var contributionMarginProfitMargin = $("input[name='contributionMarginProfitMargin']");
if (contributionMarginFinalTotal && incomeFinalTotal) {
contributionMarginProfitMargin.val(f2(contributionMarginFinalTotal) / f2(incomeFinalTotal));
contributionMarginProfitMargin.val(100 * contributionMarginFinalTotal / incomeFinalTotal);
} else {
contributionMarginProfitMargin.val("");
}
@ -366,7 +384,7 @@ function calNetMarginProfitMargin() {
var netMarginProfitMargin = $("input[name='netMarginProfitMargin']");
if (netMarginFinalTotal && incomeFinalTotal) {
netMarginProfitMargin.val(f2(netMarginFinalTotal) / f2(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>