diff --git a/src/main/java/cn/palmte/work/bean/BudgetBean.java b/src/main/java/cn/palmte/work/bean/BudgetBean.java index 40270d1..22c0b93 100644 --- a/src/main/java/cn/palmte/work/bean/BudgetBean.java +++ b/src/main/java/cn/palmte/work/bean/BudgetBean.java @@ -80,7 +80,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getIncomeDeviceTax() { - return incomeDeviceTax; + return handleSpecial(incomeDeviceTax); } public void setIncomeDeviceTax(BigDecimal incomeDeviceTax) { @@ -88,7 +88,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getIncomeEngineerTax() { - return incomeEngineerTax; + return handleSpecial(incomeEngineerTax); } public void setIncomeEngineerTax(BigDecimal incomeEngineerTax) { @@ -96,7 +96,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getIncomeServiceTax() { - return incomeServiceTax; + return handleSpecial(incomeServiceTax); } public void setIncomeServiceTax(BigDecimal incomeServiceTax) { @@ -104,7 +104,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getCostPurchaseDeviceTax() { - return costPurchaseDeviceTax; + return handleSpecial(costPurchaseDeviceTax); } public void setCostPurchaseDeviceTax(BigDecimal costPurchaseDeviceTax) { @@ -112,7 +112,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getCostPurchaseBuildTax() { - return costPurchaseBuildTax; + return handleSpecial(costPurchaseBuildTax); } public void setCostPurchaseBuildTax(BigDecimal costPurchaseBuildTax) { @@ -120,7 +120,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getCostPurchaseServiceTax() { - return costPurchaseServiceTax; + return handleSpecial(costPurchaseServiceTax); } public void setCostPurchaseServiceTax(BigDecimal costPurchaseServiceTax) { @@ -128,7 +128,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getCostPurchaseOtherTax() { - return costPurchaseOtherTax; + return handleSpecial(costPurchaseOtherTax); } public void setCostPurchaseOtherTax(BigDecimal costPurchaseOtherTax) { @@ -136,7 +136,7 @@ public class BudgetBean extends IncomeCostBean{ } public BigDecimal getCostOtherOtherTax() { - return costOtherOtherTax; + return handleSpecial(costOtherOtherTax); } public void setCostOtherOtherTax(BigDecimal costOtherOtherTax) { diff --git a/src/main/resources/static/assets/js/project_budget_cost.js b/src/main/resources/static/assets/js/project_budget_cost.js index f9ccd88..6715e40 100644 --- a/src/main/resources/static/assets/js/project_budget_cost.js +++ b/src/main/resources/static/assets/js/project_budget_cost.js @@ -301,13 +301,13 @@ function updateCostData(data, returnData) { $("input[name='costPurchaseDeviceTax']").val(f2Fixed(deviceTax)); $("input[name='costPurchaseBuildTaxInclude']").val(f2Fixed(buildTaxInclude)); $("input[name='costPurchaseBuildTaxExclude']").val(f2Fixed(buildTaxExclude)); - $("input[name='costPurchaseBuildTax']").val(f2Fixed(deviceTax)); + $("input[name='costPurchaseBuildTax']").val(f2Fixed(buildTax)); $("input[name='costPurchaseServiceTaxInclude']").val(f2Fixed(serviceTaxInclude)); $("input[name='costPurchaseServiceTaxExclude']").val(f2Fixed(serviceTaxExclude)); - $("input[name='costPurchaseServiceTax']").val(f2Fixed(deviceTax)); + $("input[name='costPurchaseServiceTax']").val(f2Fixed(serviceTax)); $("input[name='costPurchaseOtherTaxInclude']").val(f2Fixed(otherTaxInclude)); $("input[name='costPurchaseOtherTaxExclude']").val(f2Fixed(otherTaxExclude)); - $("input[name='costPurchaseOtherTax']").val(f2Fixed(deviceTax)); + $("input[name='costPurchaseOtherTax']").val(f2Fixed(otherTax)); //资金计划表中的