From beeb889780b4b23f66f1ac2d1e4787b27de3b22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98wangjiuyun?= <‘1595161655@qq.com>
Date: Thu, 31 Oct 2024 15:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 19 +++++++++++--------
 .../templates/admin/project_budget_edit.ftl   |  8 ++++----
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 8e9c4d5..780714f 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -568,23 +568,27 @@
                                     <tr class="am-text-nowrap">
                                         <th class="table-title" colspan="1"><span
                                                     style="font-size: 15px">项目名称:</span></th>
-                                        <td class="table-title" colspan="5">
+                                        <td class="table-title" colspan="2">
                                             <input readonly value="${projectBudget.nameBudget!}"/>
                                         </td>
+                                        <td class="table-title" colspan="3">
+
                                     </tr>
                                     <#if projectBudget.contractBudget??>
                                         <tr class="am-text-nowrap">
                                             <th class="table-title" colspan="1"><span
                                                         style="font-size: 15px">合同名称:</span></th>
-                                            <td class="table-title" colspan="5">
+                                            <td class="table-title" colspan="2">
                                                 <input readonly value="${projectBudget.contractBudget!}"/>
                                             </td>
+                                            <td class="table-title" colspan="3">
+
                                         </tr>
                                     </#if>
                                     <tr class="am-text-nowrap">
                                         <th class="table-title" colspan="1"><span
                                                     style="font-size: 15px">项目类型:</span></th>
-                                        <td class="table-title" colspan="1">
+                                        <td class="table-title" colspan="2">
                                             <#if projectBudget.typeBudget??>
                                                 <#if (projectBudget.typeBudget) =1>
                                                     <input readonly value="工程集成类"/>
@@ -597,6 +601,7 @@
                                                 <input readonly value=""/>
                                             </#if>
                                         </td>
+                                        <td class="table-title" colspan="3">
 
                                     </tr>
                                     <tr class="am-text-nowrap">
@@ -1159,9 +1164,7 @@
                                                                 </#if>
                                                             </td>
                                                             <td>
-                                                                <#list procurementTypes as procurementType>
-                                                                    <#if costDetail.category == procurementType.id>${procurementType.name}</#if>
-                                                                </#list>
+                                                                ${costDetail.category}
                                                             </td>
 
                                                             <td><input type="text" min="0.00" max="99.99" step="0.01"
@@ -1806,8 +1809,8 @@
                                     <#--                                    </tr>-->
                                     <tr>
                                         <td>合计</td>
-                                        <td></td>
-                                        <td></td>
+<#--                                        <td></td>-->
+<#--                                        <td></td>-->
                                         <td><input type="text" class="number" name="costTotalTaxInclude"
                                                    value="${Utils.format(budgetBean.costTotalTaxInclude, '0.00')}"
                                                    readonly required title="此列累计"></td>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 2cf6f8a..45b2d82 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -1182,10 +1182,10 @@
                                                             </option>
                                                             <option value="自定义">自定义</option>
                                                         </select>
-                                                        <input <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'&&costDetail.category>type="text"
-                                                               <#else>type="hidden"</#if>
-                                                               class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
-                                                               value="${costDetail.category!}">
+                                                        <input  class="am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate-cost-name"
+                                                                <#if costDetail.category!='华智产品'&&costDetail.category!='华三产品'&&costDetail.category!='汇智产品'>type="text"</#if>
+                                                               <#if costDetail.category=='华智产品'||costDetail.category=='华三产品'||costDetail.category=='汇智产品'>type="hidden"</#if>
+                                                               value="${costDetail.category!}" />
                                                     </td>
                                                     <td width="100px"><input type="text" maxlength="5"
                                                                              class="number am-modal-prompt-input am-modal-prompt-input-cost input-changeable-tax-rate input-changeable-tax-rate-cost"