From 8b30e87efdd2d84b4f645e4e668397fd9ee4b327 Mon Sep 17 00:00:00 2001
From: hanbo <2608504783@qq.com>
Date: Thu, 10 Mar 2022 14:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=8F=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/service/ProjectService.java   |  8 +++++-
 .../templates/admin/project_budget_edit.ftl   | 26 +++++++++++--------
 .../templates/admin/project_estimate_edit.ftl | 16 ++++++------
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 0fe2f64..96767c2 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -179,8 +179,14 @@ public class ProjectService {
 
     public Project editProject(Project project, Project projectInDb) {
 
-
         //只有如下可以修改
+        projectInDb.setName(project.getName());
+        projectInDb.setCustomer(project.getCustomer());
+        projectInDb.setTerminalCustomer(project.getTerminalCustomer());
+        projectInDb.setIndustryScenario(project.getIndustryScenario());
+        projectInDb.setType(project.getType());
+        projectInDb.setUnderwrittenMode(project.getUnderwrittenMode());
+
         projectInDb.setStartDate(project.getStartDate());
         projectInDb.setEndDate(project.getEndDate());
         projectInDb.setContractAmount(project.getContractAmount());
diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 1173e40..db0d773 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -92,7 +92,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
                                name="name" placeholder="请输入项目名称（20字符以内）" maxlength="20"
-                               value="${project.name}" required readonly/>
+                               value="${project.name}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -100,19 +100,23 @@
                 <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">
-                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目项目类型"
-                               name="typeName" <#if project.type=1>value="工程集成类"<#elseif project.type=2>value="设备集成类"<#else>value="战略合作类"</#if>
-                               required readonly/>
+                        <select data-am-selected id="type" name="type">
+                            <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>
                     </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">
-                        <input type="text" class="am-input" data-validate-async data-validation-message="请输入垫资模式"
-                               name="underwrittenModeName" required readonly
-                               <#if project.underwrittenMode=1>value="A类-不垫资（战略合作）"<#elseif project.underwrittenMode=2>value="B类-不垫资（背靠背）"
-                               <#elseif project.underwrittenMode=3>value="C类-垫资（账期覆盖）"<#else>value="D类-垫资（账期不覆盖）"</#if> />
+                        <select data-am-selected id="underwrittenMode" name="underwrittenMode">
+                            <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>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -122,7 +126,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（20字符以内）"
                                name="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
-                               value="${project.customer}" required readonly/>
+                               value="${project.customer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -131,7 +135,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入终端客户名称（20字符以内）"
                                name="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
-                               value="${project.terminalCustomer}" required readonly/>
+                               value="${project.terminalCustomer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -167,7 +171,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
                                name="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
-                               value="${project.industryScenario}" required readonly/>
+                               value="${project.industryScenario}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index 1c3e0cf..8166a48 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -69,15 +69,15 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入项目名称（20字符以内）"
                                name="name" placeholder="请输入项目名称（20字符以内）" maxlength="20"
-                               value="${project.name}" required readonly/>
+                               value="${project.name}" required/>
                     </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-hide">
-                        <select data-am-selected id="type" name="type" readonly>
+                    <div class="am-u-sm-6 am-u-md-6">
+                        <select data-am-selected id="type" name="type">
                             <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>
@@ -87,8 +87,8 @@
                 </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-hide">
-                        <select data-am-selected id="underwrittenMode" name="underwrittenMode" readonly>
+                    <div class="am-u-sm-6 am-u-md-6">
+                        <select data-am-selected id="underwrittenMode" name="underwrittenMode">
                             <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>
@@ -103,7 +103,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入客户名称（20字符以内）"
                                name="customer" placeholder="请输入客户名称（20字符以内）" maxlength="20"
-                               value="${project.customer}" required readonly/>
+                               value="${project.customer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -112,7 +112,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入终端客户名称（20字符以内）"
                                name="terminalCustomer" placeholder="请输入终端客户名称（20字符以内）" maxlength="20"
-                               value="${project.terminalCustomer}" required readonly/>
+                               value="${project.terminalCustomer}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
@@ -148,7 +148,7 @@
                     <div class="am-u-sm-6 am-u-md-6">
                         <input type="text" class="am-input" data-validate-async data-validation-message="请输入行业场景应用"
                                name="industryScenario" placeholder="请输入行业场景应用" maxlength="20"
-                               value="${project.industryScenario}" required readonly/>
+                               value="${project.industryScenario}" required/>
                     </div>
                     <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>