From 6486567b80d36c08f81bbcaf6ab7b82b4b821423 Mon Sep 17 00:00:00 2001
From: "suhang_max@163.com" <suhang_max@163.com>
Date: Tue, 6 Dec 2022 16:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E9=A1=B9=E7=9B=AEor=E5=B8=A6?=
 =?UTF-8?q?=E6=88=91=E5=AE=A1=E6=A0=B8=EF=BC=8C=E9=A1=B6=E9=83=A8=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=AA=E5=B1=95=E7=A4=BA=E4=B8=80=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_list.ftl          | 326 +++++++++---------
 .../templates/admin/project_list_approve.ftl  | 205 +++++------
 2 files changed, 267 insertions(+), 264 deletions(-)

diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index c79960a..de2e2e0 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -3,69 +3,70 @@
 
 <@defaultLayout.layout>
     <link rel="stylesheet" href="../assets/css/amazeui.switch.css"/>
-<style type="text/css">
-    .huanhang{
-    // 表格自动换行
-    table-layout:fixed;
-        word-break:break-all
-    }
-    .focus{
-    // 表格自动换行
-    table-layout:fixed;
-        word-break:break-all
-    }
-    /*固定表头的列表*/
-    .fixed-list {
-        flex: 1 1 auto;
-        overflow: hidden;
-    }
-    .fixed-list table {
-        display: block;
-        width: 100%;
-        max-height: 100%;
-        border-spacing: 0px;
-        border-collapse: collapse;
-        border: none;
-        overflow-y: hidden;
-        overflow-x: auto;
-        margin: 0;
-    }
+    <style type="text/css">
+        .huanhang{
+        // 表格自动换行
+        table-layout:fixed;
+            word-break:break-all
+        }
+        .focus{
+        // 表格自动换行
+        table-layout:fixed;
+            word-break:break-all
+        }
+        /*固定表头的列表*/
+        .fixed-list {
+            flex: 1 1 auto;
+            overflow: hidden;
+        }
+        .fixed-list table {
+            display: block;
+            width: 100%;
+            max-height: 100%;
+            border-spacing: 0px;
+            border-collapse: collapse;
+            border: none;
+            overflow-y: hidden;
+            overflow-x: auto;
+            margin: 0;
+        }
 
-    .fixed-list.is-vertical-scroll table tbody {
-        max-height: calc(100% - 71px);
-    }
-    .fixed-list table>thead>tr>th {
-        height: 40px;
-        text-align: center;
-        vertical-align: middle;
-    }
-    .fixed-list table td {
-        height: 55px;
-        text-align: center;
-    }
-    .fixed-list table tbody {
-        display: block;
-        width: 100%;
-        max-height: calc(100% - 45px);
-        overflow-y: scroll;
-        overflow-x: hidden;
-        -webkit-overflow-scrolling: touch;
-    }
+        .fixed-list.is-vertical-scroll table tbody {
+            max-height: calc(100% - 71px);
+        }
+        .fixed-list table>thead>tr>th {
+            height: 40px;
+            text-align: center;
+            vertical-align: middle;
+        }
+        .fixed-list table td {
+            height: 55px;
+            text-align: center;
+        }
+        .fixed-list table tbody {
+            display: block;
+            width: 100%;
+            max-height: calc(100% - 45px);
+            overflow-y: scroll;
+            overflow-x: hidden;
+            -webkit-overflow-scrolling: touch;
+        }
 
-    .fixed-list table tr {
-        table-layout: fixed;
-        display: table;
-    }
-    .fixed-list table thead tr {
-        width: calc(100% - 18px);
-        border-top: 1px solid #ddd;
-        border-bottom: none;
-    }
-    .fixed-list table tbody tr {
-        width: 100%;
-    }
+        .fixed-list table tr {
+            table-layout: fixed;
+            display: table;
+        }
+        .fixed-list table thead tr {
+            width: calc(100% - 18px);
+            border-top: 1px solid #ddd;
+            border-bottom: none;
+        }
+        .fixed-list table tbody tr {
+            width: 100%;
+        }
+
+    </style>
 
-</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;上、右、下,和左   -->
@@ -160,6 +161,7 @@
                         }
                     </style>
                     <div class="search-table">
+                        <#--第一行默认展示-->
                         <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目编号</div>
@@ -205,107 +207,108 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- 第二行 -->
-                        <div class="flex-row st-row">
-                            <div class="st-col">
-                                <div class="st-col-title">项目类型</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="type" name="type">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
-                                        <option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">合作类型</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
-                                        <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">垫资模式</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资</option>
-<#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资(背靠背)</option>-->
-                                        <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资(账期覆盖)</option>
-                                        <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资(账期不覆盖)</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">项目把握度</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="certainty" name="certainty">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if certainty?? && certainty='1'>selected</#if>>A:项目成功率80%-100%</option>
-                                        <option value="2" <#if certainty?? && certainty='2'>selected</#if>>B:项目成功率60%-80%</option>
-                                        <option value="3" <#if certainty?? && certainty='3'>selected</#if>>C:项目成功率40%-60%</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">客户名称</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- 第三行 -->
-                        <div class="flex-row st-row">
-                            <div class="st-col">
-                                <div class="st-col-title">最终用户名称</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">项目负责人</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">审核状态</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
-                                        <option value="-1">全部</option>
-                                        <option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
-                                        <option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
-                                        <option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
-                                        <option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">是否二次合作</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
-                                        <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">直签</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
-                                        <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
+
                         <!-- 扩展区域 -->
                         <div class="expand-section <#if extend='1'> fold</#if>">
+                            <!-- 第二行 -->
+                            <div class="flex-row st-row">
+                                <div class="st-col">
+                                    <div class="st-col-title">项目类型</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="type" name="type">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
+                                            <option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">合作类型</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
+                                            <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">垫资模式</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资</option>
+                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资(背靠背)</option>-->
+                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资(账期覆盖)</option>
+                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资(账期不覆盖)</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">项目把握度</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="certainty" name="certainty">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if certainty?? && certainty='1'>selected</#if>>A:项目成功率80%-100%</option>
+                                            <option value="2" <#if certainty?? && certainty='2'>selected</#if>>B:项目成功率60%-80%</option>
+                                            <option value="3" <#if certainty?? && certainty='3'>selected</#if>>C:项目成功率40%-60%</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">客户名称</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- 第三行 -->
+                            <div class="flex-row st-row">
+                                <div class="st-col">
+                                    <div class="st-col-title">最终用户名称</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">项目负责人</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">审核状态</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
+                                            <option value="-1">全部</option>
+                                            <option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
+                                            <option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
+                                            <option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
+                                            <option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">是否二次合作</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
+                                            <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">直签</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
+                                            <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
                             <!-- 第四行 -->
                             <div class="flex-row st-row">
                                 <div class="st-col expand-section <#if extend='1'> fold</#if>">
@@ -390,9 +393,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 扩展区域 -->
-                        <div class="expand-section <#if extend='1'> fold</#if>">
                             <!-- 第五行 -->
                             <div class="flex-row st-row">
                                 <div class="st-col st-col-4">
@@ -453,6 +453,7 @@
                                 </div>
                             </div>
                         </div>
+                        <#-- 按钮 -->
                         <div class="flex-row tools-row">
                             <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                     id="extend" value="${extend!}">扩展筛选项
@@ -1153,6 +1154,7 @@
 
 
 </@defaultLayout.layout>
+
 <script type="text/javascript" src="../modal/js/modal.js"></script>
 <script src="../assets/js/amazeui.switch.js"></script>
 <script src="${base}/assets/js/project_common.js"></script>
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index ba8301d..a44201e 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -157,6 +157,7 @@
                         }
                     </style>
                     <div class="search-table">
+                        <#--第一行默认展示-->
                         <div class="flex-row st-row">
                             <div class="st-col">
                                 <div class="st-col-title">项目编号</div>
@@ -202,107 +203,108 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- 第二行 -->
-                        <div class="flex-row st-row">
-                            <div class="st-col">
-                                <div class="st-col-title">项目类型</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="type" name="type">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
-                                        <option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">合作类型</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
-                                        <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">垫资模式</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资(战略合作)</option>
-<#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资(背靠背)</option>-->
-                                        <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资(账期覆盖)</option>
-                                        <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资(账期不覆盖)</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">项目把握度</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="certainty" name="certainty">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if certainty?? && certainty='1'>selected</#if>>A:项目成功率80%-100%</option>
-                                        <option value="2" <#if certainty?? && certainty='2'>selected</#if>>B:项目成功率60%-80%</option>
-                                        <option value="3" <#if certainty?? && certainty='3'>selected</#if>>C:项目成功率40%-60%</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">客户名称</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- 第三行 -->
-                        <div class="flex-row st-row">
-                            <div class="st-col">
-                                <div class="st-col-title">最终用户名称</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">项目负责人</div>
-                                <div class="st-col-field">
-                                    <input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/>
-                                </div>
-                            </div>
-                            <div class="st-col">
-                                <div class="st-col-title">审核状态</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
-                                        <option value="-1">全部</option>
-                                        <option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
-                                        <option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
-                                        <option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
-                                        <option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">是否二次合作</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
-                                        <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
-                                    </select>
-                                </div>
-                            </div>
-                            <div class="st-col expand-section <#if extend='1'> fold</#if>">
-                                <div class="st-col-title">直签</div>
-                                <div class="st-col-field">
-                                    <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
-                                        <option value="-1">全部</option>
-                                        <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
-                                        <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
+
                         <!-- 扩展区域 -->
                         <div class="expand-section <#if extend='1'> fold</#if>">
+                            <!-- 第二行 -->
+                            <div class="flex-row st-row">
+                                <div class="st-col">
+                                    <div class="st-col-title">项目类型</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="type" name="type">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if type?? && type='1'>selected</#if>>工程集成类</option>
+                                            <option value="2" <#if type?? && type='2'>selected</#if>>设备集成类</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">合作类型</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="cooperateType" name="cooperateType">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if cooperateType?? && cooperateType='1'>selected</#if>>战略合作类</option>
+                                            <option value="2" <#if cooperateType?? && cooperateType='2'>selected</#if>>非战略合作类</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">垫资模式</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="underwrittenMode" name="underwrittenMode">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if underwrittenMode?? && underwrittenMode='1'>selected</#if>>A类-不垫资(战略合作)</option>
+                                            <#--                                        <option value="2" <#if underwrittenMode?? && underwrittenMode='2'>selected</#if>>B类-不垫资(背靠背)</option>-->
+                                            <option value="3" <#if underwrittenMode?? && underwrittenMode='3'>selected</#if>>B类-垫资(账期覆盖)</option>
+                                            <option value="4" <#if underwrittenMode?? && underwrittenMode='4'>selected</#if>>C类-垫资(账期不覆盖)</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">项目把握度</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="certainty" name="certainty">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if certainty?? && certainty='1'>selected</#if>>A:项目成功率80%-100%</option>
+                                            <option value="2" <#if certainty?? && certainty='2'>selected</#if>>B:项目成功率60%-80%</option>
+                                            <option value="3" <#if certainty?? && certainty='3'>selected</#if>>C:项目成功率40%-60%</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">客户名称</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="customer" class="am-form-field am-input-sm" value="${customer!}"/>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- 第三行 -->
+                            <div class="flex-row st-row">
+                                <div class="st-col">
+                                    <div class="st-col-title">最终用户名称</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="terminalCustomer" class="am-form-field am-input-sm" value="${terminalCustomer!}"/>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">项目负责人</div>
+                                    <div class="st-col-field">
+                                        <input type="text" id="principal" class="am-form-field am-input-sm" value="${principal!}"/>
+                                    </div>
+                                </div>
+                                <div class="st-col">
+                                    <div class="st-col-title">审核状态</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500,searchBox: 1}" id="approveStatus" name="approveStatus">
+                                            <option value="-1">全部</option>
+                                            <option value="0" <#if approveStatus?? && approveStatus='0'>selected</#if>>草稿</option>
+                                            <option value="1" <#if approveStatus?? && approveStatus='1'>selected</#if>>待审核</option>
+                                            <option value="2" <#if approveStatus?? && approveStatus='2'>selected</#if>>审核通过</option>
+                                            <option value="3" <#if approveStatus?? && approveStatus='3'>selected</#if>>审核不通过</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">是否二次合作</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="isSecond" name="isSecond">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if isSecond?? && isSecond='1'>selected</#if>>是</option>
+                                            <option value="2" <#if isSecond?? && isSecond='2'>selected</#if>>否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                                <div class="st-col expand-section <#if extend='1'> fold</#if>">
+                                    <div class="st-col-title">直签</div>
+                                    <div class="st-col-field">
+                                        <select data-am-selected="{btnSize: 'sm',btnWidth: '100%',maxHeight: 500}" id="signType" name="signType">
+                                            <option value="-1">全部</option>
+                                            <option value="1" <#if signType?? && signType='1'>selected</#if>>是</option>
+                                            <option value="2" <#if signType?? && signType='2'>selected</#if>>否</option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
                             <!-- 第四行 -->
                             <div class="flex-row st-row">
                                 <div class="st-col expand-section <#if extend='1'> fold</#if>">
@@ -387,9 +389,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <!-- 扩展区域 -->
-                        <div class="expand-section <#if extend='1'> fold</#if>">
                             <!-- 第五行 -->
                             <div class="flex-row st-row">
                                 <div class="st-col st-col-4">
@@ -450,6 +449,8 @@
                                 </div>
                             </div>
                         </div>
+
+                        <!-- 按钮 -->
                         <div class="flex-row tools-row">
                             <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                     id="extend" value="${extend!}">扩展筛选项