From e15e0775d4473295339b99ff542c291c4c17da9f Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Fri, 31 Dec 2021 17:30:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_budget_edit.ftl   | 56 +++++++++----------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 4c1fcfd..a3af1da 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -228,26 +228,26 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxInclude1" value="${Utils.format(estimateBean.incomeDeviceTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeDeviceTaxExclude1" value="${Utils.format(estimateBean.incomeDeviceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxInclude1" value="${Utils.format(estimateBean.incomeEngineerTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeEngineerTaxExclude1" value="${Utils.format(estimateBean.incomeEngineerTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxInclude1" value="${Utils.format(estimateBean.incomeServiceTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeServiceTaxExclude1" value="${Utils.format(estimateBean.incomeServiceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxInclude1" value="${Utils.format(estimateBean.incomeTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="incomeTotalTaxExclude1" value="${Utils.format(estimateBean.incomeTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -265,50 +265,50 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseDeviceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseDeviceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxInclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseBuildTaxExclude1" value="${Utils.format(estimateBean.costPurchaseBuildTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxInclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseServiceTaxExclude1" value="${Utils.format(estimateBean.costPurchaseServiceTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxInclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costPurchaseOtherTaxExclude1" value="${Utils.format(estimateBean.costPurchaseOtherTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxInclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costProjectManageTaxExclude1" value="${Utils.format(estimateBean.costProjectManageTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td>${project.otherName!}</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude1" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude1" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input type="number" name="costTotalTaxInclude" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
-                        <td><input type="number" name="costTotalTaxExclude" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="number" name="costTotalTaxInclude1" value="${Utils.format(estimateBean.costTotalTaxInclude)}" readonly readonly title="此列累计"></td>
+                        <td><input type="number" name="costTotalTaxExclude1" value="${Utils.format(estimateBean.costTotalTaxExclude)}" readonly readonly title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -323,12 +323,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costExpropriationTaxExclude1" value="${Utils.format(estimateBean.costExpropriationTaxExclude)}" required readonly></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
+                        <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costCompanyManageTaxExclude1" value="${Utils.format(estimateBean.costCompanyManageTaxExclude)}" required readonly></td>
                     </tr>
                     </tbody>
                 </table>
@@ -342,19 +342,19 @@
                     </tr>
                     <tr>
                         <td>项目毛利（元）</td>
-                        <td><input type="number" name="projectGrossProfit" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input type="number" name="projectGrossProfit1" value="${Utils.format(estimateBean.projectGrossProfit)}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目毛利率（%）</td>
-                        <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
+                        <td><input type="number" name="projectGrossProfitRate1" value="${Utils.format(estimateBean.projectGrossProfitRate)}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润（元）</td>
-                        <td><input type="number" name="projectContributionProfit" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input type="number" name="projectContributionProfit1" value="${Utils.format(estimateBean.projectContributionProfit)}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率（%）</td>
-                        <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
+                        <td><input type="number" name="projectContributionProfitRate1" value="${Utils.format(estimateBean.projectContributionProfitRate)}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>