diff --git a/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp b/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp index fb28a3d0986386c319228bef3c23631ae4755010..af5f7670d086dd813ee4aaefb974f92b60612659 100644 --- a/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp +++ b/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp @@ -1457,9 +1457,9 @@ String path=request.getContextPath(); align: "center", formatter : function(value, row, index) { - var c = (row.outtax-row.intax)*0.12 + var c = (row.outtax-row.intax)*0.12 + return ( parseInt( c * 100 ) / 100 ).toFixed(2); - return ( parseInt( c * 100 ) / 100 ).toFixed(2); } }, /* { @@ -2431,12 +2431,12 @@ String path=request.getContextPath(); var intax = projectCheck.intax; var outtax = projectCheck.outtax; - + var fjs=(outtax-intax)*0.12; //管理费 var mcost = salestotal/1.05*0.05; //毛利润 //var profit = salestotal-outbudget+intax-outtax-mcost; - var profit = salestotal-outbudget+intax-outtax; + var profit = salestotal-outbudget+intax-outtax-fjs; //销售费用营销费用 var ecost = profit/1.05*0.1; /* $('#cname').val(projectCheck.cname); @@ -2447,10 +2447,9 @@ String path=request.getContextPath(); $('#intax').val(intax.toFixed(2)); $('#outtax').val(outtax.toFixed(2)); - var fj=($('#outtax').val()-$('#intax').val())*0.12; - $('#fjs').val(fj); - /* $('#mcost').val(mcost.toFixed(2)); - $('#ecost').val(ecost.toFixed(2)); */ + + $('#fjs').val(fjs); + $('#profit').val(profit.toFixed(2)); } }); diff --git a/WebContent/WEB-INF/pages/hpf/projectReport/projectReportList.jsp b/WebContent/WEB-INF/pages/hpf/projectReport/projectReportList.jsp index 110c6a0daaf87a2ed34572b1221a6a7852edc5cf..19f4082142d7fa3d0708891510c6511c0da19d8c 100644 --- a/WebContent/WEB-INF/pages/hpf/projectReport/projectReportList.jsp +++ b/WebContent/WEB-INF/pages/hpf/projectReport/projectReportList.jsp @@ -149,7 +149,7 @@ String path=request.getContextPath(); field: 'grossProfit', title: '毛利润', formatter: function (value, row, index) { - return (row.salesTotal-row.budgetAmount-row.salesTax+row.inputTax-row.salesTotal/1.05*0.05).toFixed(2); + return ((row.salesTotal-row.budgetAmount-row.salesTax+row.inputTax)-(row.salesTax-row.inputTax)*0.12).toFixed(2); } }, { field: 'netProfit', diff --git a/build/classes/com/sdry/web/controller/hpf/ProjectReportController.class b/build/classes/com/sdry/web/controller/hpf/ProjectReportController.class index 75afa601e47758f136844c649545d7444d8f0fd0..6ef829f587972407fdce6bfe7f2a9e7f82660b82 100644 Binary files a/build/classes/com/sdry/web/controller/hpf/ProjectReportController.class and b/build/classes/com/sdry/web/controller/hpf/ProjectReportController.class differ diff --git a/src/com/sdry/web/controller/hpf/ProjectReportController.java b/src/com/sdry/web/controller/hpf/ProjectReportController.java index d64ae3e586587ca329ab6b3972814a442aa89ca8..8964a87fb25292e6cd13b143bae8ea82ecd25891 100644 --- a/src/com/sdry/web/controller/hpf/ProjectReportController.java +++ b/src/com/sdry/web/controller/hpf/ProjectReportController.java @@ -109,7 +109,7 @@ public class ProjectReportController{ list.add("项目状态"); return list; } - /** + /**(销项税金-进项税金)*12% * 根据导出数据表头把List转List> * @param staffs * @return @@ -214,8 +214,9 @@ public class ProjectReportController{ list.add(String.valueOf((salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)/1.05*0.05+ (salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)/1.05*0.05)); /*float f3=(float)(Math.round((salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)*100))/100; - list.add(String.valueOf(f3));*/ - list.add(String.valueOf(salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)); + list.add(String.valueOf(f3));毛利润*/ + + list.add(String.valueOf((salesTotal-budgetAmount-salesTax+inputTax-salesTotal)-(salesTax-inputTax)*0.12)); /*float f4=(float)(Math.round((salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05- (salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)/1.05*0.05- (salesTotal-budgetAmount-salesTax+inputTax-salesTotal/1.05*0.05)/1.05*0.05)*100))/100;