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

些许注释

master
xxssyyyyssxx 2021-11-03 17:03:10 +08:00
parent 7ddb2aaf85
commit f208fc08f4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/cn/palmte/work/bean/IncomeCostBean.java
View File

@ -149,7 +149,7 @@ public class IncomeCostBean {
|| null == costPurchaseBuildTaxInclude || null == costPurchaseBuildTaxInclude
|| null == costPurchaseServiceTaxInclude || null == costPurchaseServiceTaxInclude
|| null == costPurchaseOtherTaxInclude || null == costPurchaseOtherTaxInclude
|| null == costProjectManageTaxInclude /*|| null == costProjectManageTaxInclude*/
|| null == costOtherOtherTaxInclude){ || null == costOtherOtherTaxInclude){
return null; return null;
} }
@ -157,7 +157,7 @@ public class IncomeCostBean {
.add(costPurchaseBuildTaxInclude) .add(costPurchaseBuildTaxInclude)
.add(costPurchaseServiceTaxInclude) .add(costPurchaseServiceTaxInclude)
.add(costPurchaseOtherTaxInclude) .add(costPurchaseOtherTaxInclude)
.add(costProjectManageTaxInclude) .add(null == costProjectManageTaxInclude ? new BigDecimal(0) : costProjectManageTaxInclude)
.add(costOtherOtherTaxInclude); .add(costOtherOtherTaxInclude);
} }

9
src/main/resources/static/assets/js/project_budget.js
View File

@ -111,6 +111,7 @@ function saveDetail(url, data, callback) {
/** /**
* 更新页面收入的数据【累加】 * 更新页面收入的数据【累加】
* 明细修改保存后修改收入含税和不含税金额
*/ */
function updateIncomeData(incomeDetails) { function updateIncomeData(incomeDetails) {
var deviceTaxInclude = 0; var deviceTaxInclude = 0;
@ -252,6 +253,7 @@ function appendTrCost() {
} }
/** /**
* 更新页面收入的数据【累加】 * 更新页面收入的数据【累加】
* 明细保存后回来更新总含税金额和不含税金额
*/ */
function updateCostData(details) { function updateCostData(details) {
var deviceTaxInclude = 0; var deviceTaxInclude = 0;
@ -300,6 +302,9 @@ function updateCostData(details) {
} }
function bindOtherOtherChangeable() { function bindOtherOtherChangeable() {
/**
* 其他其他含税金额改变的时候，修改总含税金额
*/
$("input[name='costOtherOtherTaxInclude']").change(function () { $("input[name='costOtherOtherTaxInclude']").change(function () {
var costPurchaseDeviceTaxInclude = parseFloat($("input[name='costPurchaseDeviceTaxInclude']").val()); var costPurchaseDeviceTaxInclude = parseFloat($("input[name='costPurchaseDeviceTaxInclude']").val());
var costPurchaseBuildTaxInclude = parseFloat($("input[name='costPurchaseBuildTaxInclude']").val()); var costPurchaseBuildTaxInclude = parseFloat($("input[name='costPurchaseBuildTaxInclude']").val());
@ -310,7 +315,9 @@ function bindOtherOtherChangeable() {
$("input[name='costTotalTaxInclude']").val(costPurchaseDeviceTaxInclude+costPurchaseBuildTaxInclude+costPurchaseServiceTaxInclude+costPurchaseOtherTaxInclude+costOtherOther); $("input[name='costTotalTaxInclude']").val(costPurchaseDeviceTaxInclude+costPurchaseBuildTaxInclude+costPurchaseServiceTaxInclude+costPurchaseOtherTaxInclude+costOtherOther);
}); });
/**
* 其他其他不含税金额改变的时候，修改总不含税金额
*/
$("input[name='costOtherOtherTaxExclude']").change(function () { $("input[name='costOtherOtherTaxExclude']").change(function () {
var costPurchaseDeviceTaxExclude = parseFloat($("input[name='costPurchaseDeviceTaxExclude']").val()); var costPurchaseDeviceTaxExclude = parseFloat($("input[name='costPurchaseDeviceTaxExclude']").val());
var costPurchaseBuildTaxExclude = parseFloat($("input[name='costPurchaseBuildTaxExclude']").val()); var costPurchaseBuildTaxExclude = parseFloat($("input[name='costPurchaseBuildTaxExclude']").val());