From 9330c2c84cb10114a568a9fbccb7bb3063d52ad3 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 29 Dec 2021 17:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=9C=AC=E4=B8=AD=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=B0=8F=E7=B1=BB=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/model/Project.java    | 13 +++++++++
 .../palmte/work/service/ProjectService.java   |  1 +
 .../templates/admin/project_approve.ftl       | 10 +++----
 .../templates/admin/project_budget_edit.ftl   | 29 +++++++++----------
 .../templates/admin/project_estimate_add.ftl  |  3 +-
 .../templates/admin/project_estimate_edit.ftl |  5 ++--
 .../templates/admin/project_final_add.ftl     |  3 +-
 .../templates/admin/project_final_edit.ftl    |  3 +-
 .../templates/admin/project_settle_add.ftl    |  3 +-
 .../templates/admin/project_settle_edit.ftl   |  3 +-
 10 files changed, 45 insertions(+), 28 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/Project.java b/src/main/java/cn/palmte/work/model/Project.java
index 7de65ee..3702164 100644
--- a/src/main/java/cn/palmte/work/model/Project.java
+++ b/src/main/java/cn/palmte/work/model/Project.java
@@ -139,6 +139,11 @@ public class Project {
      */
     @Column(name = "value_risk")
     private String valueRisk;
+    /**
+     * 其他中的小类名称
+     */
+    @Column(name = "other_name")
+    private String otherName;
     /**
      * 项目创建时的配置的阀值
      */
@@ -379,6 +384,14 @@ public class Project {
         this.valueRisk = valueRisk;
     }
 
+    public String getOtherName() {
+        return otherName;
+    }
+
+    public void setOtherName(String otherName) {
+        this.otherName = otherName;
+    }
+
     public BigDecimal getProjectContributionProfitRateThreshold() {
         return projectContributionProfitRateThreshold;
     }
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 7b09e07..b10e395 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -190,6 +190,7 @@ public class ProjectService {
         projectInDb.setZiguangOtherAmount(project.getZiguangOtherAmount());
         projectInDb.setMainContractCollectionTerms(project.getMainContractCollectionTerms());
         projectInDb.setValueRisk(project.getValueRisk());
+        projectInDb.setOtherName(project.getOtherName());
 
         /// projectInDb.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());
 
diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 4e24fc4..151041b 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -244,7 +244,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>主合同收款条款</div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <span>${project.mainContractCollectionTerms}</span>
+                                    <div style="width:600px; height:auto; word-wrap:break-word;">${project.mainContractCollectionTerms!}</div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -354,7 +354,7 @@
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
-                                    <td>其他</td>
+                                    <td>${project.otherName!}</td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required readonly></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required readonly></td>
                                 </tr>
@@ -514,7 +514,7 @@
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
-                                    <td>其他</td>
+                                    <td>${project.otherName!}</td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required readonly title="其他含税总额（填入）"></td>
                                     <td><input type="number" min="0.00" max="99999999.99" step="0.01" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他不含税总额（填入）"></td>
                                 </tr>
@@ -782,7 +782,7 @@
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
-                                    <td>其他</td>
+                                    <td>${project.otherName!}</td>
                                     <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(monthBean.estimateCostOther,'0')}" readonly required title="其他成本概算总额"></td>
                                     <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(monthBean.budgetCostOther,'0')}" readonly required title="其他成本预算总额"></td>
                                     <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>
@@ -1134,7 +1134,7 @@
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
-                                    <td>其他</td>
+                                    <td>${project.otherName!}</td>
                                     <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                                     <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                                     <td><input name="costOtherSettleTotal" value="${Utils.format(currentBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"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 e4944ce..2eaf40e 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -95,23 +95,19 @@
                 <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>项目类型</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <select data-am-selected id="type" name="type" readonly disabled>
-                            <option value="1" <#if project.type=1>selected</#if>>工程集成类</option>
-                            <option value="2" <#if project.type=2>selected</#if>>设备集成类</option>
-                            <option value="3" <#if project.type=3>selected</#if>>战略合作类</option>
-                        </select>
+                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目项目类型"
+                               name="type" <#if project.type=1>value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类"</#if>
+                               required readonly/>
                     </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>垫资模式</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                        <select data-am-selected id="underwrittenMode" name="underwrittenMode" readonly disabled>
-                            <option value="1" <#if project.underwrittenMode=1>selected</#if>>A类-不垫资（战略合作）</option>
-                            <option value="2" <#if project.underwrittenMode=2>selected</#if>>B类-不垫资（背靠背）</option>
-                            <option value="3" <#if project.underwrittenMode=3>selected</#if>>C类-垫资（账期覆盖）</option>
-                            <option value="4" <#if project.underwrittenMode=4>selected</#if>>D类-垫资（账期不覆盖）</option>
-                        </select>
+                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入垫资模式"
+                               name="underwrittenMode" required readonly
+                               <#if project.underwrittenMode=1>value="A类-不垫资（战略合作）"<#elseif project.underwrittenMode=2>value="B类-不垫资（背靠背）"
+                               <#elseif project.underwrittenMode=3>value="C类-垫资（账期覆盖）"<#else>value="D类-垫资（账期不覆盖）"</#if> />
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -191,10 +187,10 @@
                 <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>主合同收款条款</div>
                     <div class="am-u-sm-6 am-u-md-6">
-                                <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
-                                          class="am-input" data-validate-async data-validation-message="请输入收款条款"
-                                          placeholder="请输入收款条款" required
-                                ></textarea>
+                            <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
+                                      class="am-input" data-validate-async data-validation-message="请输入收款条款"
+                                      placeholder="请输入收款条款" required
+                            >${project.mainContractCollectionTerms!}</textarea>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -300,7 +296,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td>其他</td>
+                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
                         <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" value="${Utils.format(budgetBean.costOtherOtherTaxInclude,'0')}" required title="其他含税总额（填入）"></td>
                         <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" required title="其他不含税总额（填入）"></td>
                     </tr>
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 83dbc13..0e28f44 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -269,7 +269,8 @@
                                 <tr>
                                     <td>成本</td>
                                     <td>其他</td>
-                                    <td>其他</td>
+                                    <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
+                                               value="" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
                                     <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" required></td>
                                     <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" required></td>
                                 </tr>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 93e9a2e..4d6c866 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -174,7 +174,7 @@
                                 <textarea rows="3" cols="20" id="mainContractCollectionTerms" name="mainContractCollectionTerms" maxlength="100"
                                           class="am-input" data-validate-async data-validation-message="请输入收款条款"
                                           placeholder="请输入收款条款" required
-                                ></textarea>
+                                >${project.mainContractCollectionTerms!}</textarea>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -276,7 +276,8 @@
                         <tr>
                             <td>成本</td>
                             <td>其他</td>
-                            <td>其他</td>
+                            <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他类的名称（10字符以内）"
+                                       value="${project.otherName!}" name="otherName" placeholder="请输入其他类的名称（10字符以内）" required/> </td>
                             <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxInclude" value="${Utils.format(estimateBean.costOtherOtherTaxInclude)}" required></td>
                             <td><input type="number" min="0.00" max="9999999999.99" step="0.01" maxlength="13" name="costOtherOtherTaxExclude" value="${Utils.format(estimateBean.costOtherOtherTaxExclude)}" required></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 9e919b2..1e058c9 100644
--- a/src/main/resources/templates/admin/project_final_add.ftl
+++ b/src/main/resources/templates/admin/project_final_add.ftl
@@ -139,7 +139,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td>其他</td>
+                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required 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 d760d91..c75dcd4 100644
--- a/src/main/resources/templates/admin/project_final_edit.ftl
+++ b/src/main/resources/templates/admin/project_final_edit.ftl
@@ -139,7 +139,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td>其他</td>
+                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherOtherTaxExclude" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherSettleTotal" value="${Utils.format(settleBean.costOtherOtherTaxExclude,'0')}" type="number" type="number"readonly required title="其他成本结算总额"></td>
diff --git a/src/main/resources/templates/admin/project_settle_add.ftl b/src/main/resources/templates/admin/project_settle_add.ftl
index df8b916..a5a05de 100644
--- a/src/main/resources/templates/admin/project_settle_add.ftl
+++ b/src/main/resources/templates/admin/project_settle_add.ftl
@@ -163,7 +163,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td>其他</td>
+                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
                         <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required 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 3edd9f6..180da1e 100644
--- a/src/main/resources/templates/admin/project_settle_edit.ftl
+++ b/src/main/resources/templates/admin/project_settle_edit.ftl
@@ -161,7 +161,8 @@
                     <tr>
                         <td>成本</td>
                         <td>其他</td>
-                        <td>其他</td>
+                        <td><input type="text" id="otherName" maxlength="6" data-validate-async data-validation-message="请输入其他中的小类名称（10字符以内）"
+                                   value="${project.otherName!}" name="otherName" placeholder="请输入其他中的小类名称（10字符以内）" readonly required/> </td>
                         <td><input name="costOtherEstimateTotal" type="number" value="${Utils.format(estimateBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本概算总额"></td>
                         <td><input name="costOtherBudgetTotal" type="number" value="${Utils.format(budgetBean.costOtherOtherTaxExclude,'0')}" readonly required title="其他成本预算总额"></td>
                         <td><input name="costOtherFormerSettleTotal" type="number" value="${Utils.format(formerBean.costOtherOtherTaxExclude,'0')}" required readonly title="其他成本上月结算总额"></td>