From 92e18e8790a7422fd42f0b6dbea7cf8ef38f4cb3 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 13 Jun 2023 14:55:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=B3=E8=BD=AC=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProjectController.java   | 2 +-
 src/main/resources/templates/admin/project_estimate_add.ftl | 6 ++----
 .../resources/templates/admin/project_estimate_edit.ftl     | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index d3630cb..140aad3 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -322,7 +322,7 @@ public class ProjectController extends BaseController {
         model.put("estimateBean", estimateBean);
         //freemarker可以利用的静态方法
         model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
-        if (project.getStatus() >= 5) {
+        if (project.getStatus() >= 5 || project.getApproveStatusEstimate() == 2) {
             model.put("saveStage", 1);
         } else {
             model.put("saveStage", 0);
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index d34f832..105b15b 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -329,7 +329,7 @@
                             </tr>
                             <tr class="am-text-nowrap">
                                 <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
-                                <td class="table-title" colspan="1" >
+                                <td class="table-title" colspan="2" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
                                         <option value="0" >C0、项目可研</option>
                                         <option value="1" >C1、项目申报</option>
@@ -341,10 +341,8 @@
                                         <option value="7" >C7、项目结算期</option>
                                     </select>
                                 </td>
-                            </tr>
-                            <tr class="am-text-nowrap">
                                 <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
-                                <td class="table-title" colspan="1" >
+                                <td class="table-title" colspan="2" >
                                     <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
                                         <option value="0" >S0-商机线索</option>
                                         <option value="1" >S1-需求摸索</option>
diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl
index c491aaf..7a8b3fd 100644
--- a/src/main/resources/templates/admin/project_estimate_edit.ftl
+++ b/src/main/resources/templates/admin/project_estimate_edit.ftl
@@ -376,7 +376,7 @@
                     </tr>
                     <tr class="am-text-nowrap">
                         <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
-                        <td class="table-title" colspan="1" >
+                        <td class="table-title" colspan="2" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="stage" name="stage">
                                 <option value="0" <#if project.stage?? && project.stage=0>selected</#if>>C0、项目可研</option>
                                 <option value="1" <#if project.stage?? && project.stage=1>selected</#if>>C1、项目申报</option>
@@ -389,7 +389,7 @@
                             </select>
                         </td>
                         <th class="table-title" colspan="1" ><span style="font-size: 15px">公司销售阶段:</span></th>
-                        <td class="table-title" colspan="1" >
+                        <td class="table-title" colspan="2" >
                             <select data-am-selected="{btnSize: 'sm',btnWidth: '80%',searchBox: 1}" id="saleStage" name="saleStage">
                                 <option value="0" <#if project.saleStage?? && project.saleStage=0>selected</#if>>S0-商机线索</option>
                                 <option value="1" <#if project.saleStage?? && project.saleStage=1>selected</#if>>S1-需求摸索</option>