From bc158606220172e950ef676fe012cabb42fd8c6b Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Thu, 5 May 2022 18:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=93=E7=94=A8=E6=80=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl       | 46 +++++++++++--------
 .../templates/admin/project_budget_edit.ftl   |  4 +-
 .../templates/admin/project_final_add.ftl     |  4 +-
 .../templates/admin/project_final_edit.ftl    |  4 +-
 .../templates/admin/project_list.ftl          | 10 +++-
 .../templates/admin/project_settle_add.ftl    |  4 +-
 .../templates/admin/project_settle_edit.ftl   |  4 +-
 7 files changed, 46 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 075281a..e5d8807 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -90,12 +90,17 @@
             border:0 none;
             outline:none;
         }
+        textarea {
+            overflow-x: hidden;
+            overflow-y:hidden;
+        }
+
     </style>
 
     <div class="admin-content">
         <div class="admin-content-body">
             <div class="am-cf am-padding">
-                <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目审核</strong> /
+                <div style="word-wrap:break-word; word-break:break-all; " class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目审核</strong> /
                     <small>${project.name}</small></div>
             </div>
 
@@ -127,7 +132,7 @@
                             <!--验证表单元素（validate) begin-->
 
                             <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 style="text-align: right;width: 69px" value="部门名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red">*</span><input style="text-align: right;width: 69px; margin-bottom: 6px;" value="部门名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input value="${project.deptName}"></input>
                                 </div>
@@ -135,14 +140,14 @@
                             </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 style="text-align: right;width: 134px" value="项目计划开始时间"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划开始时间"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input value="${project.startDate?string("yyyy-MM-dd")}"></input>
                                 </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 style="text-align: right;width: 134px" value="项目计划结束时间"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划结束时间"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input value="${project.endDate?string("yyyy-MM-dd")}"></input>
                                 </div>
@@ -150,15 +155,16 @@
                             </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 style="text-align: right;width: 69px" value="项目名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 69px;margin-top: 8px;" value="项目名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input value="${project.name}"></input>
+                                    <textarea style="overflow:auto; background-attachment: fixed;
+                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>
                                 </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 style="text-align: right;width: 69px" value="项目类型"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 69px ;margin-bottom: 6px;" value="项目类型"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.type) =1>
@@ -173,7 +179,7 @@
                                 <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 style="text-align: right;width: 69px" value="垫资模式"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 69px ;margin-bottom: 6px;" value="垫资模式"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                         <span>
                         <#if (project.underwrittenMode) =1>
@@ -191,17 +197,19 @@
                             </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 style="text-align: right;width: 69px" value="客户名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 69px ;margin-top: 8px;" value="客户名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input value="${project.customer}"></input>
+                                    <textarea style="overflow:auto; background-attachment: fixed;
+                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>
                                 </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 style="text-align: right;width: 100px" value="终端客户名称"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 100px ;margin-top: 8px;" value="终端客户名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input value="${project.terminalCustomer}"></input>
+                                    <textarea style="overflow:auto; background-attachment: fixed;
+                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -220,14 +228,14 @@
                             <#--                                <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 style="text-align: right;width: 69px" value="合同金额"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 69px;margin-bottom: 6px;" value="合同金额"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input value="${Utils.format(project.contractAmount)}元"></input>
                                 </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 style="text-align: right;width: 100px" value="行业场景应用"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 100px;margin-bottom: 6px;" value="行业场景应用"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <input value="${project.industryScenario}"></input>
                                 </div>
@@ -248,16 +256,18 @@
                                 <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 style="text-align: right;width: 100px" value="主合同收款条款"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 116px;margin-top: 8px;" value="主合同收款条款"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <div style="width:600px; height:auto; word-wrap:break-word;"><input value="${project.mainContractCollectionTerms!}"></div>
+                                    <textarea style="overflow:auto; background-attachment: fixed;
+                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.mainContractCollectionTerms!}</textarea>
                                 </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 style="text-align: right;width: 90px" value="价值及风险"></div>
+                                <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input style="text-align: right;width: 90px;margin-top: 8px;" value="价值及风险"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <div style="width:600px; height:auto; word-wrap:break-word;"><input value="${project.valueRisk!}"></div>
+                                    <textarea style="overflow:auto; background-attachment: fixed;
+                                    background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.valueRisk!}</textarea>
                                 </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 60c210a..2a2a485 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -809,8 +809,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
                         <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" title="其他含税总额（填入）"></td>
                         <td><input type="text" class="number" maxlength="16" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" title="其他不含税总额（填入）"></td>
                     </tr>
diff --git a/src/main/resources/templates/admin/project_final_add.ftl b/src/main/resources/templates/admin/project_final_add.ftl
index d8436b0..40f97d8 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -139,8 +139,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
                         <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly  title="其他成本结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_final_edit.ftl b/src/main/resources/templates/admin/project_final_edit.ftl
index 3853257..1341c9d 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -139,8 +139,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
                         <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0.00')}" type="text" class="number" readonly title="其他成本结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index be56f68..4519f7e 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -3,7 +3,13 @@
 
 <@defaultLayout.layout>
     <link rel="stylesheet" href="../assets/css/amazeui.switch.css"/>
-
+<style type="text/css">
+    .huanhang{
+    // 表格自动换行
+    table-layout:fixed;
+        word-break:break-all
+    }
+</style>
     <div class="admin-content">
         <div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
             <!--  padding:1px 2px 3px 4px;上、右、下,和左   -->
@@ -187,7 +193,7 @@
                         <#list pager.list as list>
                             <tr>
                                 <td>${list.id!}</td>
-                                <td><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
+                                <td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
                                 <td>${list.typeDesc!}</td>
                                 <td>${list.statusDesc!}</td>
                                 <td>${list.approveStatusDesc!}</td>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index 321259b..9b7ebcb 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -163,8 +163,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
                         <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
                         <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
                         <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_settle_edit.ftl b/src/main/resources/templates/admin/project_settle_edit.ftl
index e5970ff..01104bd 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -161,8 +161,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td><input type="text" id="otherName" maxlength="10" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
-                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）"/> </td>
+                        <td><input type="text" id="otherName" maxlength="50" data-validate-async data-validation-message="请输入其他中的小类名称（50字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（50字符以内）"/> </td>
                         <td><input name="costOtherEstimateTotal" type="text" class="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本概算总额"></td>
                         <td><input name="costOtherBudgetTotal" type="text" class="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本预算总额"></td>
                         <td><input name="costOtherFormerSettleTotal" type="text" class="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0.00')}" readonly title="其他成本上月结算总额"></td>