From 9b022a2a82eddbdcf518a6a530fbae3d6f4105a6 Mon Sep 17 00:00:00 2001 From: Erica <2798233721@qq.com> Date: Fri, 28 Jun 2019 16:32:10 +0800 Subject: [PATCH] 2 --- .../pages/hpf/projectBudget/budgetList.jsp | 15 +++++++-------- .../hpf/projectReport/projectReportList.jsp | 2 +- .../hpf/ProjectReportController.class | Bin 7048 -> 7059 bytes .../hpf/ProjectReportController.java | 7 ++++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp b/WebContent/WEB-INF/pages/hpf/projectBudget/budgetList.jsp index fb28a3d..af5f767 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 110c6a0..19f4082 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 GIT binary patch delta 878 zcmZvaOH5Ni6o&sZ1MO{lDYUedmlTwTf}l_VWg{y$1Op2ZLJX-%K?#zW)({t_Y)CXf zK>eH{pKVDRFe9H#Dw(m1V6O88D*b`I-XlH@t13lcT*qbgzQAD}N2(O1 zVH2M&`$z36MQb%ys6XHhaEbTiR4E2s1cUGBF>ixkp;*?_*IW0@Tpm;?oN=Z2wh7Bp%bwS!8gK#2~mo-q7jp#gY`vBi-(vIbC?xB z@lg`yq>6dz!Y7%6&oUKXWDdT{d@RUfe3K>kF85(kR^o>|h+nc1OY%5=%TrjEXYof~ zA;=yQ@;-&hF*3-fWR%a*Bqzv($RPinaX7UpBMLU&X{r@{-q^wu(HpBghc#BR#!$~$lKIJcpoV{e+BuLOV+7%$ h`S@yT3Y8=zxp(k+LHQg5u(K-Q)xo!%)gV6={sojQ!IJ<0 delta 884 zcmZvaO-NKx7>3{P9A~_9=j!M<<2Y)Le`)Dh>7>>`;a0*h0!t*!#bC*_2uIvCZKOaY zbNV571tAnhAt;j-84}ed0{dN*5n6^>(w~@V-}O4WX>mC3ecp4vbKj3IQhB;keX?}> z9snOz+){fI!z#)tULyrN32Jj7bg(tFx9M0w$ErqFj2pPNB@jAl-~^2lb!_3&wQDp< zqh!6t3T+KFg}B5NrD)_pAHf_r-qsXsRVbD9$LpQbm!k@$5olMbLg~yV@0^@Gb5@~D zW@QRx>F7q+dN8O;W0;XUf@8<5Lq6gUJSd^#mSN38_Ucs^)Ad+`U z%1309&&Vvt(JtTetk}XlLE~`hO-B-v`Ab)wXa+%%uh7LxAWIHWAsQi3C)}!m6<}}B5`e1`WbFxXrU@` zZdKJXD`loqoj74A?uGHNl{;cQtZ^S=tUAWf!dbHUmyJNdwLsk*$cXU(rpQ8i1GPo! bGO|2nd|r@`V*qwm+j)2JEoTF$mCFACBbmY0 diff --git a/src/com/sdry/web/controller/hpf/ProjectReportController.java b/src/com/sdry/web/controller/hpf/ProjectReportController.java index d64ae3e..8964a87 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; -- Gitee