From 01d660452f5965246574b33947522d87cd6db087 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 29 Dec 2021 14:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A6=82=E7=AE=97=E9=A2=84?=
 =?UTF-8?q?=E7=AE=97=E5=88=A9=E6=B6=A6=E7=8E=87=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 26 +++++++++++++------
 .../templates/admin/project_budget_edit.ftl   | 13 +++++++---
 .../templates/admin/project_estimate_add.ftl  | 13 +++++++---
 .../templates/admin/project_estimate_edit.ftl | 13 +++++++---
 4 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index a0222a1..50f59fd 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -387,17 +387,22 @@
                                 <tbody>
                                 <tr class="am-text-lg">
                                     <td>类别</td>
-                                    <td>不含税金额（元）</td>
-                                    <td>利润率（%）</td>
+                                    <td></td>
                                 </tr>
                                 <tr>
-                                    <td>项目毛利</td>
+                                    <td>项目毛利（元）</td>
                                     <td><input type="number" name="projectGrossProfit" 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>
                                 </tr>
                                 <tr>
-                                    <td>项目贡献利润率</td>
+                                    <td>项目贡献利润（元）</td>
                                     <td><input type="number" name="projectContributionProfit" 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>
                                 </tr>
                                 </tbody>
@@ -543,17 +548,22 @@
                                 <tbody>
                                 <tr class="am-text-lg">
                                     <td>类别</td>
-                                    <td>不含税金额（元）</td>
-                                    <td>利润率（%）</td>
+                                    <td></td>
                                 </tr>
                                 <tr>
-                                    <td>项目毛利</td>
+                                    <td>项目毛利（元）</td>
                                     <td><input type="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                </tr>
+                                <tr>
+                                    <td>项目毛利率（%）</td>
                                     <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 <tr>
-                                    <td>项目贡献利润率</td>
+                                    <td>项目贡献利润（元）</td>
                                     <td><input type="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                                </tr>
+                                <tr>
+                                    <td>项目贡献利润率（%）</td>
                                     <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
                                 </tr>
                                 </tbody>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index ecea88d..fd50df6 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -329,17 +329,22 @@
                     <tbody>
                     <tr class="am-text-lg">
                         <td>类别</td>
-                        <td>不含税金额（元）</td>
-                        <td>利润率（%）</td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>项目毛利</td>
+                        <td>项目毛利（元）</td>
                         <td><input type="number" name="projectGrossProfit" value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly required title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                    </tr>
+                    <tr>
+                        <td>项目毛利率（%）</td>
                         <td><input type="number" name="projectGrossProfitRate" value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly required title="毛利（不含税）/收入总计（不含税）"></td>
                     </tr>
                     <tr>
-                        <td>项目贡献利润率</td>
+                        <td>项目贡献利润（元）</td>
                         <td><input type="number" name="projectContributionProfit" value="${Utils.format(budgetBean.projectContributionProfit,'0')}" readonly required title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                    </tr>
+                    <tr>
+                        <td>项目贡献利润率（%）</td>
                         <td><input type="number" name="projectContributionProfitRate" value="${Utils.format(budgetBean.projectContributionProfitRate,'0')}" readonly required title="贡献利润（不含税）/收入总计（不含税）"></td>
                     </tr>
                     </tbody>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index fc285fc..73f4327 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -298,17 +298,22 @@
                             <tbody>
                             <tr class="am-text-lg">
                                 <td>类别</td>
-                                <td>不含税金额（元）</td>
-                                <td>利润率（%）</td>
+                                <td></td>
                             </tr>
                             <tr>
-                                <td>项目毛利</td>
+                                <td>项目毛利（元）</td>
                                 <td><input type="number" name="projectGrossProfit" readonly title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                            </tr>
+                            <tr>
+                                <td>项目毛利率（%）</td>
                                 <td><input type="number" name="projectGrossProfitRate" readonly title="毛利（不含税）/收入总计（不含税）"></td>
                             </tr>
                             <tr>
-                                <td>项目贡献利润率</td>
+                                <td>项目贡献利润（元）</td>
                                 <td><input type="number" name="projectContributionProfit" readonly title="项目毛利（不含税）-公司管理费用总计（不含税）"></td>
+                            </tr>
+                            <tr>
+                                <td>项目贡献利润率（%）</td>
                                 <td><input type="number" name="projectContributionProfitRate" readonly title="贡献利润（不含税）/收入总计（不含税）"></td>
                             </tr>
                             </tbody>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index f80fc6d..18fe219 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -305,17 +305,22 @@
                     <tbody>
                     <tr class="am-text-lg">
                         <td>类别</td>
-                        <td>不含税金额（元）</td>
-                        <td>利润率（%）</td>
+                        <td></td>
                     </tr>
                     <tr>
-                        <td>项目毛利</td>
+                        <td>项目毛利（元）</td>
                         <td><input type="number" name="projectGrossProfit" 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>
                     </tr>
                     <tr>
-                        <td>项目贡献利润率</td>
+                        <td>项目贡献利润（元）</td>
                         <td><input type="number" name="projectContributionProfit" 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>
                     </tr>
                     </tbody>