Merge remote-tracking branch 'origin/master'

src/main/java/cn/palmte/work/bean/IncomeCostBean.java

@@ -160,11 +160,14 @@ public abstract class IncomeCostBean {
     }
 
 
-    /*public BigDecimal getCostProjectManageTaxInclude() {
+    /**
-        return costProjectManageTaxInclude;
+     * 项目管理成本含税=项目管理成本不含税
+     */
+    public BigDecimal getCostProjectManageTaxInclude() {
+        return getCostProjectManageTaxExclude();
     }
 
-    public void setCostProjectManageTaxInclude(BigDecimal costProjectManageTaxInclude) {
+    /*public void setCostProjectManageTaxInclude(BigDecimal costProjectManageTaxInclude) {
         this.costProjectManageTaxInclude = costProjectManageTaxInclude;
     }*/
 
@@ -285,12 +288,13 @@ public abstract class IncomeCostBean {
         BigDecimal costPurchaseBuildTaxInclude = getCostPurchaseBuildTaxInclude();
         BigDecimal costPurchaseServiceTaxInclude = getCostPurchaseServiceTaxInclude();
         BigDecimal costPurchaseOtherTaxInclude = getCostPurchaseOtherTaxInclude();
+        BigDecimal costProjectManageTaxInclude = getCostProjectManageTaxInclude();
         BigDecimal costOtherOtherTaxInclude = getCostOtherOtherTaxInclude();
         if(null == costPurchaseDeviceTaxInclude
                 || null == costPurchaseBuildTaxInclude
                 || null == costPurchaseServiceTaxInclude
                 || null == costPurchaseOtherTaxInclude
-                /*|| null == costProjectManageTaxInclude*/
+                || null == costProjectManageTaxInclude
                 || null == costOtherOtherTaxInclude){
             return handleSpecial(null);
         }
@@ -298,7 +302,7 @@ public abstract class IncomeCostBean {
                 .add(costPurchaseBuildTaxInclude)
                 .add(costPurchaseServiceTaxInclude)
                 .add(costPurchaseOtherTaxInclude)
-                /*.add(null == costProjectManageTaxInclude ? new BigDecimal(0) : costProjectManageTaxInclude)*/
+                .add(costProjectManageTaxInclude)
                 .add(costOtherOtherTaxInclude);
     }
 
@@ -320,7 +324,8 @@ public abstract class IncomeCostBean {
                 || null == costOtherOtherTaxExclude){
             return handleSpecial(null);
         }
-        return costPurchaseDeviceTaxExclude.add(costPurchaseBuildTaxExclude)
+        return costPurchaseDeviceTaxExclude
+                .add(costPurchaseBuildTaxExclude)
                 .add(costPurchaseServiceTaxExclude)
                 .add(costPurchaseOtherTaxExclude)
                 .add(costProjectManageTaxExclude)

src/main/resources/static/assets/js/project_budget_cost.js

@@ -106,12 +106,13 @@ function updateCostData(data, returnData) {
     $("input[name='costPurchaseOtherTaxInclude']").val(f2(otherTaxInclude));
     $("input[name='costPurchaseOtherTaxExclude']").val(f2(otherTaxExclude));
 
-    var costOtherOtherTaxInclude = parseFloat($("input[name='costOtherOtherTaxInclude']").val());
+    var costOtherOtherTaxInclude = f2($("input[name='costOtherOtherTaxInclude']").val());
-    var costOtherOtherTaxExclude = parseFloat($("input[name='costOtherOtherTaxExclude']").val());
+    var costOtherOtherTaxExclude = f2($("input[name='costOtherOtherTaxExclude']").val());
 
-    var costProjectManageTaxExclude = parseFloat($("input[name='costProjectManageTaxExclude']").val());
+    var costProjectManageTaxInclude = f2($("input[name='costProjectManageTaxInclude']").val());
+    var costProjectManageTaxExclude = f2($("input[name='costProjectManageTaxExclude']").val());
 
-    $("input[name='costTotalTaxInclude']").val(f2(deviceTaxInclude+buildTaxInclude+serviceTaxInclude+otherTaxInclude+costOtherOtherTaxInclude));
+    $("input[name='costTotalTaxInclude']").val(f2(deviceTaxInclude+buildTaxInclude+serviceTaxInclude+otherTaxInclude+costOtherOtherTaxInclude+costProjectManageTaxInclude));
     $("input[name='costTotalTaxExclude']").val(f2(deviceTaxExclude+buildTaxExclude+serviceTaxExclude+otherTaxExclude+costOtherOtherTaxExclude+costProjectManageTaxExclude));
 
     updateProjectContributionProfitRate();
@@ -124,9 +125,10 @@ function bindOtherOtherChangeable() {
         var costPurchaseServiceTaxInclude = f2($("input[name='costPurchaseServiceTaxInclude']").val());
         var costPurchaseOtherTaxInclude = f2($("input[name='costPurchaseOtherTaxInclude']").val());
 
+        var costProjectManageTaxInclude = f2($("input[name='costProjectManageTaxInclude']").val());
         var costOtherOther = f2($(this).val());
 
-        $("input[name='costTotalTaxInclude']").val(f2(costPurchaseDeviceTaxInclude+costPurchaseBuildTaxInclude+costPurchaseServiceTaxInclude+costPurchaseOtherTaxInclude+costOtherOther));
+        $("input[name='costTotalTaxInclude']").val(f2(costPurchaseDeviceTaxInclude+costPurchaseBuildTaxInclude+costPurchaseServiceTaxInclude+costPurchaseOtherTaxInclude+costProjectManageTaxInclude+costOtherOther));
 
         updateProjectContributionProfitRate();
 

src/main/resources/static/assets/js/project_budget_cost_project_manage.js

@@ -82,6 +82,20 @@ function updateCostProjectManageData(data,returnData) {
     });
 
     $("input[name='costProjectManageTaxExclude']").val(total);
+    $("input[name='costProjectManageTaxInclude']").val(total);
+
+    var costPurchaseDeviceTaxInclude = f2($("input[name='costPurchaseDeviceTaxInclude']").val());
+    var costPurchaseBuildTaxInclude = f2($("input[name='costPurchaseBuildTaxInclude']").val());
+    var costPurchaseServiceTaxInclude = f2($("input[name='costPurchaseServiceTaxInclude']").val());
+    var costPurchaseOtherTaxInclude = f2($("input[name='costPurchaseOtherTaxInclude']").val());
+
+    var costOtherOtherTaxInclude = f2($("input[name='costOtherOtherTaxInclude']").val());
+
+    $("input[name='costTotalTaxInclude']").val(f2(costPurchaseDeviceTaxInclude+costPurchaseBuildTaxInclude+costPurchaseServiceTaxInclude+costPurchaseOtherTaxInclude+total+costOtherOtherTaxInclude));
+
+
+
+
 
     var costPurchaseDeviceTaxExclude = f2($("input[name='costPurchaseDeviceTaxExclude']").val());
     var costPurchaseBuildTaxExclude = f2($("input[name='costPurchaseBuildTaxExclude']").val());
@@ -92,5 +106,6 @@ function updateCostProjectManageData(data,returnData) {
 
     $("input[name='costTotalTaxExclude']").val(f2(costPurchaseDeviceTaxExclude+costPurchaseBuildTaxExclude+costPurchaseServiceTaxExclude+costPurchaseOtherTaxExclude+total+costOtherOtherTaxExclude));
 
+
     updateProjectContributionProfitRate();
 }

src/main/resources/static/assets/js/project_estimate.js

@@ -70,6 +70,12 @@ function calIncomeAndCost() {
     });
     $("input[name='costProjectManageTaxExclude']").change(function () {
         calCostExclude();
+
+        //不含税的=含税的
+        //含税的总额更新
+        $("input[name='costProjectManageTaxInclude']").val($("input[name='costProjectManageTaxExclude']").val());
+        calCostInclude();
+
         calIncomeCost();
     });
     $("input[name='costOtherOtherTaxExclude']").change(function () {
@@ -127,14 +133,14 @@ function calCostInclude() {
     var costPurchaseBuildTaxInclude = $("input[name='costPurchaseBuildTaxInclude']").val();
     var costPurchaseServiceTaxInclude = $("input[name='costPurchaseServiceTaxInclude']").val();
     var costPurchaseOtherTaxInclude = $("input[name='costPurchaseOtherTaxInclude']").val();
-    //var costProjectManageTaxInclude = $("input[name='costProjectManageTaxInclude']").val();
+    var costProjectManageTaxInclude = $("input[name='costProjectManageTaxInclude']").val();
     var costOtherOtherTaxInclude = $("input[name='costOtherOtherTaxInclude']").val();
 
 
     var costTotalTaxInclude = $("input[name='costTotalTaxInclude']");
 
-    if(costPurchaseDeviceTaxInclude && costPurchaseBuildTaxInclude && costPurchaseServiceTaxInclude && costPurchaseOtherTaxInclude /*&& costProjectManageTaxInclude*/ && costOtherOtherTaxInclude){
+    if(costPurchaseDeviceTaxInclude && costPurchaseBuildTaxInclude && costPurchaseServiceTaxInclude && costPurchaseOtherTaxInclude && costProjectManageTaxInclude && costOtherOtherTaxInclude){
-        costTotalTaxInclude.val(parseFloat(costPurchaseDeviceTaxInclude)+parseFloat(costPurchaseBuildTaxInclude)+parseFloat(costPurchaseServiceTaxInclude)+parseFloat(costPurchaseOtherTaxInclude)/*+parseFloat(costProjectManageTaxInclude)*/+parseFloat(costOtherOtherTaxInclude));
+        costTotalTaxInclude.val(parseFloat(costPurchaseDeviceTaxInclude)+parseFloat(costPurchaseBuildTaxInclude)+parseFloat(costPurchaseServiceTaxInclude)+parseFloat(costPurchaseOtherTaxInclude)+parseFloat(costProjectManageTaxInclude)+parseFloat(costOtherOtherTaxInclude));
     }else {
         costTotalTaxInclude.val("");
     }

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -276,8 +276,8 @@
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><#--<input name="costProjectManageTaxInclude" value="${budgetBean.costProjectManageTaxInclude!}" readonly required>-->/</td>
+                        <td><input type="number" name="costProjectManageTaxInclude" value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly required title="项目管理成本总额含税"></td>
-                        <td><input type="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额"></td>
+                        <td><input type="number" name="costProjectManageTaxExclude" value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly required title="项目管理成本总额不含税"></td>
                     </tr>
                     <tr>
                         <td>成本</td>

src/main/resources/templates/admin/project_estimate_add.ftl

@@ -255,7 +255,7 @@
                             <td>成本</td>
                             <td>项目管理成本</td>
                             <td>项目管理成本</td>
-                            <td><#--<input name="costProjectManageTaxInclude" required>-->/</td>
+                            <td><input type="number" name="costProjectManageTaxInclude" required readonly></td>
                             <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" required></td>
                         </tr>
                         <tr>

src/main/resources/templates/admin/project_estimate_edit.ftl

@@ -255,7 +255,7 @@
                             <td>成本</td>
                             <td>项目管理成本</td>
                             <td>项目管理成本</td>
-                            <td><#--<input name="costProjectManageTaxInclude" value="${estimateBean.costProjectManageTaxInclude}" required>-->/</td>
+                            <td><input type="number" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxInclude)}" required readonly></td>
                             <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required></td>
                         </tr>
                         <tr>