From 725cf6e1b653057d026958faa1770feaf3004cdd Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Wed, 3 Nov 2021 19:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A9=E7=94=A8title=E8=A7=A3=E9=87=8A?=
 =?UTF-8?q?=E5=8F=A3=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_budget_edit.ftl   | 54 +++++++++----------
 .../templates/admin/project_estimate_add.ftl  | 16 +++---
 .../templates/admin/project_estimate_edit.ftl | 16 +++---
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 3f98da2..d5b23fc 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -204,26 +204,26 @@
                     <tr>
                         <td>收入</td>
                         <td>设备类</td>
-                        <td><input name="incomeDeviceTaxInclude" value="${budgetBean.incomeDeviceTaxInclude!0}" required readonly></td>
-                        <td><input name="incomeDeviceTaxExclude" value="${budgetBean.incomeDeviceTaxExclude!0}" required readonly></td>
+                        <td><input name="incomeDeviceTaxInclude" value="${budgetBean.incomeDeviceTaxInclude!0}" required readonly title="设备类含税总额"></td>
+                        <td><input name="incomeDeviceTaxExclude" value="${budgetBean.incomeDeviceTaxExclude!0}" required readonly title="设备类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>工程类</td>
-                        <td><input name="incomeEngineerTaxInclude" value="${budgetBean.incomeEngineerTaxInclude!0}" required readonly></td>
-                        <td><input name="incomeEngineerTaxExclude" value="${budgetBean.incomeEngineerTaxExclude!0}" required readonly></td>
+                        <td><input name="incomeEngineerTaxInclude" value="${budgetBean.incomeEngineerTaxInclude!0}" required readonly title="工程类含税总额"></td>
+                        <td><input name="incomeEngineerTaxExclude" value="${budgetBean.incomeEngineerTaxExclude!0}" required readonly title="工程类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>收入</td>
                         <td>服务类</td>
-                        <td><input name="incomeServiceTaxInclude" value="${budgetBean.incomeServiceTaxInclude!0}" required readonly></td>
-                        <td><input name="incomeServiceTaxExclude" value="${budgetBean.incomeServiceTaxExclude!0}" required readonly></td>
+                        <td><input name="incomeServiceTaxInclude" value="${budgetBean.incomeServiceTaxInclude!0}" required readonly title="服务类含税总额"></td>
+                        <td><input name="incomeServiceTaxExclude" value="${budgetBean.incomeServiceTaxExclude!0}" required readonly title="服务类不含税总额"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td><input name="incomeTotalTaxInclude" value="${budgetBean.incomeTotalTaxInclude!0}" readonly required></td>
-                        <td><input name="incomeTotalTaxExclude" value="${budgetBean.incomeTotalTaxExclude!0}" readonly required></td>
+                        <td><input name="incomeTotalTaxInclude" value="${budgetBean.incomeTotalTaxInclude!0}" readonly required title="此列累计"></td>
+                        <td><input name="incomeTotalTaxExclude" value="${budgetBean.incomeTotalTaxExclude!0}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -243,50 +243,50 @@
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>设备</td>
-                        <td><input name="costPurchaseDeviceTaxInclude" value="${budgetBean.costPurchaseDeviceTaxInclude!0}" readonly required></td>
-                        <td><input name="costPurchaseDeviceTaxExclude" value="${budgetBean.costPurchaseDeviceTaxExclude!0}" readonly required></td>
+                        <td><input name="costPurchaseDeviceTaxInclude" value="${budgetBean.costPurchaseDeviceTaxInclude!0}" readonly required title="购买设备含税总额"></td>
+                        <td><input name="costPurchaseDeviceTaxExclude" value="${budgetBean.costPurchaseDeviceTaxExclude!0}" readonly required title="购买设备不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>施工</td>
-                        <td><input name="costPurchaseBuildTaxInclude" value="${budgetBean.costPurchaseBuildTaxInclude!0}" readonly required></td>
-                        <td><input name="costPurchaseBuildTaxExclude" value="${budgetBean.costPurchaseBuildTaxExclude!0}" readonly required></td>
+                        <td><input name="costPurchaseBuildTaxInclude" value="${budgetBean.costPurchaseBuildTaxInclude!0}" readonly required title="购买施工含税总额"></td>
+                        <td><input name="costPurchaseBuildTaxExclude" value="${budgetBean.costPurchaseBuildTaxExclude!0}" readonly required title="购买施工不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>服务</td>
-                        <td><input name="costPurchaseServiceTaxInclude" value="${budgetBean.costPurchaseServiceTaxInclude!0}" readonly required></td>
-                        <td><input name="costPurchaseServiceTaxExclude" value="${budgetBean.costPurchaseServiceTaxExclude!0}" readonly required></td>
+                        <td><input name="costPurchaseServiceTaxInclude" value="${budgetBean.costPurchaseServiceTaxInclude!0}" readonly required title="购买服务含税总额"></td>
+                        <td><input name="costPurchaseServiceTaxExclude" value="${budgetBean.costPurchaseServiceTaxExclude!0}" readonly required title="购买服务不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>采购成本</td>
                         <td>其他</td>
-                        <td><input name="costPurchaseOtherTaxInclude" value="${budgetBean.costPurchaseOtherTaxInclude!0}" readonly required></td>
-                        <td><input name="costPurchaseOtherTaxExclude" value="${budgetBean.costPurchaseOtherTaxExclude!0}" readonly required></td>
+                        <td><input name="costPurchaseOtherTaxInclude" value="${budgetBean.costPurchaseOtherTaxInclude!0}" readonly required title="购买其他含税总额"></td>
+                        <td><input name="costPurchaseOtherTaxExclude" value="${budgetBean.costPurchaseOtherTaxExclude!0}" readonly required title="购买其他不含税总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>项目管理成本</td>
                         <td>项目管理成本</td>
                         <td><#--<input name="costProjectManageTaxInclude" value="${budgetBean.costProjectManageTaxInclude!}" readonly required>-->/</td>
-                        <td><input name="costProjectManageTaxExclude" value="${budgetBean.costProjectManageTaxExclude!0}" readonly required></td>
+                        <td><input name="costProjectManageTaxExclude" value="${budgetBean.costProjectManageTaxExclude!0}" readonly required title="项目管理成本总额"></td>
                     </tr>
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
                         <td>其他</td>
-                        <td><input name="costOtherOtherTaxInclude" value="${budgetBean.costOtherOtherTaxInclude!0}" required></td>
-                        <td><input name="costOtherOtherTaxExclude" value="${budgetBean.costOtherOtherTaxExclude!0}" required></td>
+                        <td><input name="costOtherOtherTaxInclude" value="${budgetBean.costOtherOtherTaxInclude!0}" required title="其他含税总额（填入）"></td>
+                        <td><input name="costOtherOtherTaxExclude" value="${budgetBean.costOtherOtherTaxExclude!0}" required title="其他不含税总额（填入）"></td>
                     </tr>
                     <tr>
                         <td>合计</td>
                         <td></td>
                         <td></td>
-                        <td><input name="costTotalTaxInclude" value="${budgetBean.costTotalTaxInclude!0}" readonly required></td>
-                        <td><input name="costTotalTaxExclude" value="${budgetBean.costTotalTaxExclude!0}" readonly required></td>
+                        <td><input name="costTotalTaxInclude" value="${budgetBean.costTotalTaxInclude!0}" readonly required title="此列累计"></td>
+                        <td><input name="costTotalTaxExclude" value="${budgetBean.costTotalTaxExclude!0}" readonly required title="此列累计"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -302,12 +302,12 @@
                     <tr>
                         <td>财务费用</td>
                         <td>资金占用成本</td>
-                        <td><input name="costExpropriationTaxExclude" value="${budgetBean.costExpropriationTaxExclude!20}" required readonly></td>
+                        <td><input name="costExpropriationTaxExclude" value="${budgetBean.costExpropriationTaxExclude!20}" required readonly title="资金占用成本不含税总额"></td>
                     </tr>
                     <tr>
                         <td>公司管理费用</td>
                         <td></td>
-                        <td><input name="costCompanyManageTaxExclude" value="${budgetBean.costCompanyManageTaxExclude!}" required></td>
+                        <td><input name="costCompanyManageTaxExclude" value="${budgetBean.costCompanyManageTaxExclude!}" required title="公司管理费用不含税总额"></td>
                     </tr>
                     </tbody>
                 </table>
@@ -322,13 +322,13 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" value="${budgetBean.projectGrossProfit!21}" readonly required></td>
-                        <td><input name="projectGrossProfitRate" value="${budgetBean.projectGrossProfitRate!22}" readonly required></td>
+                        <td><input name="projectGrossProfit" value="${budgetBean.projectGrossProfit!21}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input name="projectGrossProfitRate" value="${budgetBean.projectGrossProfitRate!22}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率</td>
-                        <td><input name="projectContributionProfit" value="${budgetBean.projectContributionProfit!23}" readonly required></td>
-                        <td><input name="projectContributionProfitRate" value="${budgetBean.projectContributionProfitRate!24}" readonly required></td>
+                        <td><input name="projectContributionProfit" value="${budgetBean.projectContributionProfit!23}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input name="projectContributionProfitRate" value="${budgetBean.projectContributionProfitRate!24}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 07824ed..4754eca 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -208,8 +208,8 @@
                         <tr>
                             <td>合计</td>
                             <td></td>
-                            <td><input name="incomeTotalTaxInclude" readonly></td>
-                            <td><input name="incomeTotalTaxExclude" readonly></td>
+                            <td><input name="incomeTotalTaxInclude" readonly title="此列累计"></td>
+                            <td><input name="incomeTotalTaxExclude" readonly title="此列累计"></td>
                         </tr>
                     </tbody>
                 </table>
@@ -269,8 +269,8 @@
                             <td>合计</td>
                             <td></td>
                             <td></td>
-                            <td><input name="costTotalTaxInclude" readonly></td>
-                            <td><input name="costTotalTaxExclude" readonly></td>
+                            <td><input name="costTotalTaxInclude" readonly title="此列累计"></td>
+                            <td><input name="costTotalTaxExclude" readonly title="此列累计"></td>
                         </tr>
                     </tbody>
                 </table>
@@ -305,13 +305,13 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" readonly></td>
-                        <td><input name="projectGrossProfitRate" readonly></td>
+                        <td><input name="projectGrossProfit" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input name="projectGrossProfitRate" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率</td>
-                        <td><input name="projectContributionProfit" readonly></td>
-                        <td><input name="projectContributionProfitRate" readonly></td>
+                        <td><input name="projectContributionProfit" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input name="projectContributionProfitRate" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 1b9e865..43be62f 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -208,8 +208,8 @@
                         <tr>
                             <td>合计</td>
                             <td></td>
-                            <td><input name="incomeTotalTaxInclude" value="${estimateBean.incomeTotalTaxInclude}" readonly></td>
-                            <td><input name="incomeTotalTaxExclude" value="${estimateBean.incomeTotalTaxExclude}" readonly></td>
+                            <td><input name="incomeTotalTaxInclude" value="${estimateBean.incomeTotalTaxInclude}" readonly title="此列累计"></td>
+                            <td><input name="incomeTotalTaxExclude" value="${estimateBean.incomeTotalTaxExclude}" readonly title="此列累计"></td>
                         </tr>
                     </tbody>
                 </table>
@@ -269,8 +269,8 @@
                             <td>合计</td>
                             <td></td>
                             <td></td>
-                            <td><input name="costTotalTaxInclude" value="${estimateBean.costTotalTaxInclude}" readonly></td>
-                            <td><input name="costTotalTaxExclude" value="${estimateBean.costTotalTaxExclude}" readonly></td>
+                            <td><input name="costTotalTaxInclude" value="${estimateBean.costTotalTaxInclude}" readonly title="此列累计"></td>
+                            <td><input name="costTotalTaxExclude" value="${estimateBean.costTotalTaxExclude}" readonly title="此列累计"></td>
                         </tr>
                     </tbody>
                 </table>
@@ -305,13 +305,13 @@
                     </tr>
                     <tr>
                         <td>项目毛利</td>
-                        <td><input name="projectGrossProfit" value="${estimateBean.projectGrossProfit}" readonly></td>
-                        <td><input name="projectGrossProfitRate" value="${estimateBean.projectGrossProfitRate}" readonly></td>
+                        <td><input name="projectGrossProfit" value="${estimateBean.projectGrossProfit}" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                        <td><input name="projectGrossProfitRate" value="${estimateBean.projectGrossProfitRate}" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
                         <td>项目贡献利润率</td>
-                        <td><input name="projectContributionProfit" value="${estimateBean.projectContributionProfit}" readonly></td>
-                        <td><input name="projectContributionProfitRate" value="${estimateBean.projectContributionProfitRate}" readonly></td>
+                        <td><input name="projectContributionProfit" value="${estimateBean.projectContributionProfit}" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                        <td><input name="projectContributionProfitRate" value="${estimateBean.projectContributionProfitRate}" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
                 </table>