From 11ca310ec65a1d16e5d5b9fcb40acdd8d4db98b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Fri, 1 Nov 2024 17:05:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=8F=90=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl          | 16 ++++++++--------
 .../templates/admin/project_budget_edit.ftl      | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index f7e5e9d..c4b461f 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -607,7 +607,7 @@
                                     <tr class="am-text-nowrap">
                                         <th class="table-title" colspan="1"><span
                                                     style="font-size: 15px">垫资模式:</span></th>
-                                        <td class="table-title" colspan="2">
+                                        <td class="table-title" <#if project.underwrittenMode! <= 2> colspan="5" <#else> colspan="1" </#if>>
                                             <#if projectBudget.underwrittenModeBudget??>
                                                 <#if (projectBudget.underwrittenModeBudget) =1>
                                                     <input readonly value="不垫资"/>
@@ -1779,13 +1779,13 @@
                                         <td>工程</td>
                                         <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
                                                    value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0.00')}"
-                                                   readonly required title="购买施工含税总额"></td>
+                                                   readonly required title="购买工程含税总额"></td>
                                         <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
                                                    value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0.00')}"
-                                                   readonly required title="购买施工不含税总额"></td>
+                                                   readonly required title="购买工程不含税总额"></td>
                                         <td width="210px"><input type="text" class="number" name="costPurchaseBuildTax"
                                                                  value="${Utils.format(budgetBean.costPurchaseBuildTax,'0.00')}"
-                                                                 readonly required title="购买施工税金"></td>
+                                                                 readonly required title="购买工程税金"></td>
                                     </tr>
                                     <tr>
                                         <#--                                        <td>成本</td>-->
@@ -1876,7 +1876,7 @@
                                         <td>项目管理费用</td>
                                         <td><input type="text" class="number" name="costProjectManageTaxExclude"
                                                    value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}"
-                                                   readonly title="项目管理成本总额不含税"></td>
+                                                   readonly title="项目管理费用总额不含税"></td>
                                     </tr>
                                     <tr>
                                         <td>财务费用</td>
@@ -1921,18 +1921,18 @@
                                                    readonly title="毛利A（不含税）/收入总计（不含税）"></td>
                                         <td><input type="text" class="number" name="projectGrossProfitA"
                                                    value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly
-                                                   title="收入总计（不含税）-成本总计（不含税）"></td>
+                                                   title="收入合计（不含税）-采购成本合计（不含税"></td>
                                         <td>项目毛利A=收入合计（不含税）-采购成本合计（不含税）</td>
                                     </tr>
                                     <tr>
                                         <td>项目毛利B（元）</td>
                                         <td><input type="text" class="number" name="projectGrossProfitRate"
                                                    value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}"
-                                                   readonly required title="毛利（不含税）/收入总计（不含税）"></td>
+                                                   readonly required title="毛利B（不含税）/收入总计（不含税）"></td>
                                         <td><input type="text" class="number" name="projectGrossProfit"
                                                    value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly
                                                    required
-                                                   title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                                   title="项目毛利A-财务费用-项目管理费用"></td>
                                         <td>项目毛利B=项目毛利A-财务费用-项目管理费用</td>
                                     </tr>
                                     <#--                                    <tr>-->
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 45b2d82..a8bc1e8 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -1911,13 +1911,13 @@
                                 <td>工程</td>
                                 <td><input type="text" class="number" name="costPurchaseBuildTaxInclude"
                                            value="${Utils.format(budgetBean.costPurchaseBuildTaxInclude,'0')}" readonly
-                                           title="购买施工含税总额"></td>
+                                           title="购买工程含税总额"></td>
                                 <td><input type="text" class="number" name="costPurchaseBuildTaxExclude"
                                            value="${Utils.format(budgetBean.costPurchaseBuildTaxExclude,'0')}" readonly
-                                           title="购买施工不含税总额"></td>
+                                           title="购买工程不含税总额"></td>
                                 <td><input type="text" class="number" name="costPurchaseBuildTax"
                                            value="${Utils.format(budgetBean.costPurchaseBuildTax,'0')}" readonly
-                                           title="购买施工税金"></td>
+                                           title="购买工程税金"></td>
                             </tr>
                             <tr>
                                 <#--                            <td>成本</td>-->
@@ -1989,11 +1989,11 @@
                                 <td>
                                     <input type="text" class="number" name="costProjectManageTaxExclude"
                                            value="${Utils.format(budgetBean.costProjectManageTaxExclude,'0')}" readonly
-                                           title="项目管理成本总额不含税">
+                                           title="项目管理费用总额不含税">
                                     <input style="display: none" type="text" class="number"
                                            name="costProjectManageTaxInclude"
                                            value="${Utils.format(budgetBean.costProjectManageTaxInclude,'0')}" readonly
-                                           title="项目管理成本总额不含税">
+                                           title="项目管理费用总额不含税">
 
                                 </td>
                             </tr>
@@ -2036,17 +2036,17 @@
                                            title="毛利A（不含税）/收入总计（不含税）"></td>
                                 <td><input type="text" class="number" name="projectGrossProfitA"
                                            value="${Utils.format(budgetBean.projectGrossProfitA,'0')}" readonly
-                                           title="收入总计（不含税）-成本总计（不含税）"></td>
+                                           title="收入合计（不含税）-采购成本合计（不含税）"></td>
                                 <td>项目毛利A=收入合计（不含税）-采购成本合计（不含税）</td>
                             </tr>
                             <tr>
                                 <td>项目毛利B（元）</td>
                                 <td><input type="text" class="number" name="projectGrossProfitRate"
                                            value="${Utils.format(budgetBean.projectGrossProfitRate,'0')}" readonly
-                                           title="毛利（不含税）/收入总计（不含税）"></td>
+                                           title="毛利B（不含税）/收入总计（不含税）"></td>
                                 <td><input type="text" class="number" name="projectGrossProfit"
                                            value="${Utils.format(budgetBean.projectGrossProfit,'0')}" readonly
-                                           title="收入总计（不含税）-成本总计（不含税）-财务费用总计（不含税）"></td>
+                                           title="项目毛利A-财务费用-项目管理费用"></td>
                                 <td>项目毛利B=项目毛利A-财务费用-项目管理费用</td>
                             </tr>
                             <#--                        <tr>-->