From bd13acd3806404b8e561e2571ae5fe0aa56f53a5 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 27 Jan 2022 11:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=A8=AA=E7=AB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index d712626..f3ba838 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -689,135 +689,135 @@
                                 </div>
                                 <div class="am-tab-panel am-fade am-in" id="tab34">
                                     <#--<span class="am-text-lg">资金计划表</span>-->
-                                    <table class="am-table am-table-bordered am-table-radius table-main"
-                                           style="padding:0;"
+                                    <table class="am-table table-main" style="display: block;border-collapse: collapse;width: 1700px;overflow-x: scroll;padding:0;"
                                            id="budgetPlanDetailTable">
-                                        <tbody>
-                                        <tr>
-                                            <td>月份</td>
-                                            <td>设备支出</td>
-                                            <td>工程支出（含服务+施工+其他）</td>
-                                            <td>经营性开支</td>
-                                            <td>保证金支出</td>
-                                            <td>支出合计</td>
-                                            <td>销售收款</td>
-                                            <td>保证金收款</td>
-                                            <td>收款合计</td>
-                                            <td>资金余额</td>
-                                            <td>资金利息</td>
-                                            <td>垫资计划</td>
-                                            <td>还款计划</td>
-                                            <#-- <td>操作</td>-->
+                                        <thead style="display: inline-block;overflow-x: scroll;width: 200px;">
+                                        <tr style="display: inline-block;">
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="月份" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="设备支出" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="工程支出（含服务+施工+其他）" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="经营性开支" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="保证金支出" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="支出合计" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="销售收款" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="保证金收款" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="收款合计" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="资金余额" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="资金利息" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="垫资计划" readonly></td>
+                                            <td style="display: block;border-top: 1px solid #ddd;"><input type="text" class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail" value="还款计划" readonly></td>
+                                            <#-- <td style="display: block;">操作</td>-->
                                         </tr>
-                                        <tr>
-                                            <td><#--<input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
-                                               value="${projectBudgetPlanDetailTotal.month}" readonly/>-->${projectBudgetPlanDetailTotal.month}</td>
-                                            <td><input type="text"
+                                        </thead>
+                                        <tbody style="display: inline-block;overflow-x: scroll;width: 1300px;white-space: nowrap;">
+                                        <tr style="display: inline-block;">
+                                            <td style="display: block;"><input type="text" class="am-modal-prompt-input input-total-month-budget-plan"
+                                               value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-device-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-engineer-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-project-manage-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.projectManageCost)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-earnest-money-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyCost)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-total-cost-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.totalCost)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-sale-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.saleIncome)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-earnest-money-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.earnestMoneyIncome)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-total-income-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.totalIncome)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-fund-balance-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.fundBalance)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-capital-interest-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.capitalInterest)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-underwritten-plan-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.underwrittenPlan)}"
                                                        readonly/></td>
-                                            <td><input type="text"
+                                            <td style="display: block;"><input type="text"
                                                        class="am-modal-prompt-input input-total-repayment-plan-budget-plan"
                                                        value="${Utils.format(projectBudgetPlanDetailTotal.repaymentPlan)}"
                                                        readonly/></td>
-                                            <td></td>
                                         </tr>
 
                                         <#if projectBudgetPlanDetails??>
                                             <#list projectBudgetPlanDetails as projectBudgetPlanDetail>
-                                                <tr>
-                                                    <td><#--<input type="text" readonly
+                                                <tr style="display: inline-block;">
+                                                    <td style="display: block;"><input type="text" readonly
                                                        class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-month-budget-plan"
-                                                       value="${projectBudgetPlanDetail.month!}">-->${projectBudgetPlanDetail.month!}</td>
-                                                    <td><input type="text" readonly
+                                                       value="${projectBudgetPlanDetail.month!}"></td>
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-device-cost-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.deviceCost)}">
                                                     </td>
-                                                    <td><input type="text" readonly
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-engineer-cost-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.engineerCost)}">
                                                     </td>
-                                                    <td><input type="text" readonly
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-project-manage-cost-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.projectManageCost)}">
                                                     </td>
-                                                    <td><input type="text" readonly
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-cost-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.earnestMoneyCost)}">
                                                     </td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-cost-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.totalCost)}"
                                                                readonly></td>
-                                                    <td><input type="text" readonly
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-sale-income-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.saleIncome)}">
                                                     </td>
-                                                    <td><input type="text" readonly
+                                                    <td style="display: block;"><input type="text" readonly
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-earnest-money-income-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.earnestMoneyIncome)}">
                                                     </td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-total-income-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.totalIncome)}"
                                                                readonly></td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-fund-balance-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.fundBalance)}"
                                                                readonly></td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-capital-interest-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.capitalInterest)}"
                                                                readonly></td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-underwritten-plan-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.underwrittenPlan)}"
                                                                readonly></td>
-                                                    <td><input type="text"
+                                                    <td style="display: block;"><input type="text"
                                                                class="am-modal-prompt-input am-modal-prompt-input-budget-plan-detail input-changeable-repayment-plan-budget-plan"
                                                                value="${Utils.format(projectBudgetPlanDetail.repaymentPlan)}"
                                                                readonly></td>
-                                                    <#--<td>
+                                                    <#--<td style="display: block;">
                                                         <button type="button"
                                                                 class="am-btn am-btn-warning am-btn-xs am-round am-modal-line-delete-budget-plan">
                                                             <span class="am-icon-minus"></span></button>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 912810a..7e1cfd9 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -579,7 +579,7 @@
                         </tr>
                         </thead>
                         <tbody style="display: inline-block;overflow-x: scroll;width: 1300px;white-space: nowrap;">
-                        <tr style="display: inline-block;">
+                        <tr class="am-hide" style="display: inline-block;">
                             <td style="display: block;"><input type="text" class="am-modal-prompt-input input-total-title-month-budget-plan" value="${projectBudgetPlanDetailTotalTitle.month}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.deviceCost)}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.engineerCost)}" readonly/></td>
@@ -595,7 +595,7 @@
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-title-repayment-plan-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotalTitle.repaymentPlan)}" readonly/></td>
                             <td style="display: block;border-top: 1px solid #ddd;"><button type="button" class="am-btn am-btn-xs am-round am-modal-line-delete-budget-plan" disabled="disabled"><span class="am-icon-minus"></span></button></td>
                         </tr>
-                        <tr class="am-hide" style="display: inline-block;">
+                        <tr style="display: inline-block;">
                             <td style="display: block;"><input type="text" class="am-modal-prompt-input input-total-month-budget-plan" value="${projectBudgetPlanDetailTotal.month}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-device-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.deviceCost)}" readonly/></td>
                             <td style="display: block;"><input type="text" class="number am-modal-prompt-input input-total-engineer-cost-budget-plan" value="${Utils.format(projectBudgetPlanDetailTotal.engineerCost)}" readonly/></td>