From 4ef0a3abbf99ffc7514b363fde751825d3635669 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 16 Aug 2022 16:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 2117f5a..2f92598 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -149,7 +149,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" readonly value="${project.projectNo!}">
+                                    <input readonly readonly value="${project.projectNo!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -159,7 +159,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.name!}">
+                                    <input readonly value="${project.name!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -258,7 +258,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                    <#-- <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.customer!}">
+                                    <input readonly value="${project.customer!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -268,7 +268,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.terminalCustomer!}">
+                                    <input readonly value="${project.terminalCustomer!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -297,7 +297,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目毛利"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.grossProfit)}" />
+                                    <input readonly value="${Utils.format(project.grossProfit)}元" />
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -305,7 +305,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="项目毛利率"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.grossProfitMargin)}" />
+                                    <input readonly value="${Utils.format(project.grossProfitMargin)}%" />
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -345,8 +345,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同收款条款"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <textarea style="overflow:auto; background-attachment: fixed;
-                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.mainContractCollectionTerms!}</textarea>
+                                    <input readonly value="${project.mainContractCollectionTerms!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -354,8 +353,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 90px;margin-top: -6px;" value="价值及风险"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <textarea style="overflow:auto; background-attachment: fixed;
-                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.valueRisk!}</textarea>
+                                    <input readonly value="${project.valueRisk!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -440,14 +438,14 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资利息"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.advanceInterestAmount)}" />
+                                    <input readonly value="${Utils.format(project.advanceInterestAmount)}元" />
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 69px ;margin-bottom: 12px;" value="垫资峰值"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${Utils.format(project.advancePeakAmount)}" />
+                                    <input readonly value="${Utils.format(project.advancePeakAmount)}元" />
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -455,8 +453,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同收款条款"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <textarea style="overflow:auto; background-attachment: fixed;
-                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.mainContractCollectionTerms!}</textarea>
+                                    <input readonly value="${project.mainContractCollectionTerms!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -464,8 +461,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="主合同具体解决方案"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <textarea style="overflow:auto; background-attachment: fixed;
-                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.mainContractResolvePlan!}</textarea>
+                                    <input readonly value="${project.mainContractResolvePlan!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -473,8 +469,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 116px;margin-top: -6px;" value="计收计划"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <textarea style="overflow:auto; background-attachment: fixed;
-                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.CalculationCollection!}</textarea>
+                                    <input readonly value="${project.calculationCollection!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 3833408..98ab20d 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -1083,7 +1083,7 @@
                         <td><input type="text" class="number" maxlength="16" name="costCompanyManageTaxExclude" value="${Utils.format(budgetBean.costCompanyManageTaxExclude,'0')}" readonly required title="公司管理费用不含税总额"></td>
                     </tr>
                     </tbody>
-                    备注：财务记取以不含税方式核算
+                    (备注：财务记取以不含税方式核算)
                 </table>
 
                 <span>利润率计算</span>