diff --git a/src/main/resources/templates/admin/monthly_settle_list.ftl b/src/main/resources/templates/admin/monthly_settle_list.ftl
index efa472a..345b21d 100644
--- a/src/main/resources/templates/admin/monthly_settle_list.ftl
+++ b/src/main/resources/templates/admin/monthly_settle_list.ftl
@@ -16,64 +16,74 @@
                     <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                         <tbody>
                         <tr>
-                            <th class="am-text-middle">姓名</th>
+                            <th class="am-text-middle">项目编号</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <input type="text" id="realName" class="am-form-field am-input-sm" maxlength="20"
-                                           value="${realName!}"/>
+                                    <input type="text" id="projectNo" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${projectNo!}"/>
                                 </div>
                             </td>
-                            <th class="am-text-middle">手机号</th>
+                            <th class="am-text-middle">项目名称</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <input type="text" id="telephone" class="am-form-field am-input-sm" maxlength="11"
-                                           value="${telephone!}"/>
+                                    <input type="text" id="name" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${name!}"/>
                                 </div>
                             </td>
-                            <th class="am-text-middle">工号</th>
+                            <th class="am-text-middle">最终业主</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <input type="text" id="userName" class="am-form-field am-input-sm" maxlength="20"
-                                           value="${userName!}"/>
+                                    <input type="text" id="owner" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${owner!}"/>
+                                </div>
+                            </td>
+                            <th class="am-text-middle">合同方</th>
+                            <td>
+                                <div class="am-u-sm-10">
+                                    <input type="text" id="contractParty" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${contractParty!}"/>
                                 </div>
                             </td>
                         </tr>
                         <tr>
-                            <th class="am-text-middle">一级部门</th>
+                            <th class="am-text-middle">合同编号</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <select data-am-selected id="deptId" name="deptId">
-                                        <option value="-1">全部</option>
-                                        <#list  deptList as dept>
-                                            <option value=${dept.id!} <#if deptId! =="${dept.id}" >
-                                                    selected</#if>>${dept.name!}</option>
-                                        </#list>
-                                    </select>
+                                    <input type="text" id="contractNo" class="am-form-field am-input-sm" maxlength="100"
+                                           value="${contractNo!}"/>
                                 </div>
                             </td>
-                            <th class="am-text-middle">角色名称</th>
+                            <th class="am-text-middle">项目类型</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <select data-am-selected id="roleId" name="roleId">
-                                        <option value="-1">全部</option>
-                                        <#list  roleList as role>
-                                            <option value=${role.id!} <#if roleId! =="${role.id}" >
-                                                    selected
-                                                    </#if>>${role.name!}</option>
-                                        </#list>
-                                    </select>
+                                    <input type="text" id="projectType" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${projectType!}"/>
                                 </div>
                             </td>
-                            <th class="am-text-middle">常驻地</th>
+                            <th class="am-text-middle">销售经理</th>
                             <td>
                                 <div class="am-u-sm-10">
-                                    <input type="text" id="workLocation" class="am-form-field am-input-sm" maxlength="20"
-                                           value="${workLocation!}"/>
+                                    <input type="text" id="saleManager" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${saleManager!}"/>
+                                </div>
+                            </td>
+                            <th class="am-text-middle">项目经理</th>
+                            <td>
+                                <div class="am-u-sm-10">
+                                    <input type="text" id="projectManager" class="am-form-field am-input-sm" maxlength="50"
+                                           value="${projectManager!}"/>
                                 </div>
                             </td>
                         </tr>
                         <tr>
-                            <th class="am-text-middle">创建时间</th>
+                            <th class="am-text-middle">超期天数</th>
+                            <td>
+                                <div class="am-u-sm-10">
+                                    <input type="text" id="timeOutDay" class="am-form-field am-input-sm" maxlength="20"
+                                           value="${timeOutDay!}"/>
+                                </div>
+                            </td>
+                            <th class="am-text-middle">实际收款时间</th>
                             <td>
                                 <div class="am-u-sm-10">
                                     <div class="am-form am-form-inline">
@@ -92,7 +102,26 @@
                                     </div>
                                 </div>
                             </td>
-                            <td colspan="4">
+                            <th class="am-text-middle">合同签订时间</th>
+                            <td>
+                                <div class="am-u-sm-10">
+                                    <div class="am-form am-form-inline">
+                                        <div class="am-form-group am-form-icon">
+                                            <i class="am-icon-calendar"></i>
+                                            <input type="text" class="am-form-field am-input-sm" id="contractStartTime" readonly
+                                                   value="${contractStartTime!}" placeholder="开始日期" data-am-datepicker>
+                                        </div>
+                                        <div class="am-form-group">至</div>
+                                        <div class="am-form-group am-form-icon">
+                                            <i class="am-icon-calendar"></i>
+                                            <input type="text" class="am-form-field am-input-sm" id="contractEndTime" readonly
+                                                   value="${contractEndTime!}"
+                                                   placeholder="结束日期" data-am-datepicker>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td colspan="2">
                                 <div align='right'>
                                     <button type="button" class="am-btn am-btn-default am-btn-sm am-text-secondary"
                                             id="submit-btn" onclick="sub_function('query')">搜索
@@ -135,18 +164,18 @@
                         <thead>
                         <tr class="am-text-nowrap">
                             <th class="table-title">项目编号</th>
-                            <th class="table-title">最终业主</th>
-                            <th class="table-title">合同方</th>
                             <th class="table-title">项目名称</th>
+                            <th class="table-title">项目类型</th>
+                            <th class="table-title">合同编号</th>
+                            <th class="table-title">合同方</th>
                             <th class="table-title">合同金额</th>
+                            <th class="table-title">合同签订时间</th>
+                            <th class="table-title">最终业主</th>
                             <th class="table-title">累计已收款</th>
                             <th class="table-title">已采购累计付款</th>
                             <th class="table-title">已采购累计未付款</th>
                             <th class="table-title">超期垫资金额</th>
                             <th class="table-title">销售累计开票金额</th>
-                            <th class="table-title">合同编号</th>
-                            <th class="table-title">项目类型</th>
-                            <th class="table-title">合同签订时间</th>
                             <th class="table-title">销售经理</th>
                             <th class="table-title">项目经理</th>
                             <th class="table-title">收款节点</th>
@@ -155,30 +184,30 @@
                             <th class="table-title">实际收款时间</th>
                             <th class="table-title">实际收款金额</th>
                             <th class="table-title">实际欠收金额</th>
-                            <th class="table-title">超期天数</th>
                             <th class="table-title">到货证明</th>
-                            <th class="table-title">验收报告时间</th>
                             <th class="table-title">项目风险预警</th>
-                            <th class="table-title">已计收金额</th>
-                            <th class="table-title">未计收金额</th>
+                            <th class="table-title">未收金额</th>
+                            <th class="table-title">已收金额</th>
+                            <th class="table-title">超期天数</th>
+                            <th class="table-title">验收报告时间</th>
                         </tr>
                         </thead>
                         <tbody>
                         <#list  pager.list as list>
                             <tr>
                                 <td>${list.projectNo!}</td>
-                                <td>${list.owner!}</td>
-                                <td>${list.contractParty!}</td>
                                 <td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/monthlySettle/info?id=${list.id}'">${list.projectName!}</a></td>
+                                <td>${list.projectType!}</td>
+                                <td>${list.contractNo!}</td>
+                                <td>${list.contractParty!}</td>
                                 <td>${list.contractAmount!}</td>
+                                <td>${list.contractSignTime!}</td>
+                                <td>${list.owner!}</td>
                                 <td>${list.totalCollect!}</td>
                                 <td>${list.totalPurchasedPaid!}</td>
                                 <td>${list.totalPurchasedUnpaid!}</td>
                                 <td>${list.timeOutAmount!}</td>
                                 <td>${list.totalBillAmount!}</td>
-                                <td>${list.contractNo!}</td>
-                                <td>${list.projectType!}</td>
-                                <td>${list.contractSignTime!}</td>
                                 <td>${list.saleManager!}</td>
                                 <td>${list.projectManager!}</td>
                                 <td>${list.collectPoint!}</td>
@@ -187,12 +216,12 @@
                                 <td>${list.collectActualTime!}</td>
                                 <td>${list.collectActualAmount!}</td>
                                 <td>${list.uncollectActualAmount!}</td>
-                                <td>${list.timeOutDay!}</td>
                                 <td>${list.productCertificate!}</td>
-                                <td>${list.inspectionReportTime!}</td>
                                 <td>${list.riskWarning!}</td>
-                                <td>${list.calColAmount!}</td>
                                 <td>${list.uncalColAmount!}</td>
+                                <td>${list.calColAmount!}</td>
+                                <td>${list.timeOutDay!}</td>
+                                <td>${list.inspectionReportTime!}</td>
                             </tr>
                         </#list>
                         </tbody>
@@ -228,39 +257,39 @@
 <script src="${base}/common/jQuery-File-Upload/js/jquery.fileupload-validate.js"></script>
 <script src="../assets/js/amazeui.switch.js"></script>
 <script type="text/javascript">
-    $(function () {
-
-        var keywordsObj = {};
-        $("#submit-btn").on("click", function () {
-            if ($("#realName").val())
-                keywordsObj.realName = $("#realName").val();
-            if ($("#telephone").val())
-                keywordsObj.telephone = $("#telephone").val();
-            if ($("#userName").val())
-                keywordsObj.userName = $("#userName").val();
-            if ($("#deptId").val())
-                keywordsObj.deptId = $("#deptId").val();
-            if ($("#roleId").val())
-                keywordsObj.roleId = $("#roleId").val();
-            if ($("#workLocation").val())
-                keywordsObj.workLocation = $("#workLocation").val();
-            if ($("#startTime").val())
-                keywordsObj.startTime = $("#startTime").val();
-            if ($("#endTime").val())
-                keywordsObj.endTime = $("#endTime").val();
-            var startTime = $("#startTime").val();
-            var endTime = $("#endTime").val();
-            if(startTime > endTime){
-                window.confirm('开始日期应早于结束日期');
-            }
-            var keywords = "";
-            if (!$.isEmptyObject(keywordsObj)) {
-                keywords = JSON.stringify(keywordsObj);
-            }
-            $("#keywords").val(keywords);
-            $("#listForm").submit();
-        });
-    });
+    // $(function () {
+    //
+    //     var keywordsObj = {};
+    //     $("#submit-btn").on("click", function () {
+    //         if ($("#realName").val())
+    //             keywordsObj.realName = $("#realName").val();
+    //         if ($("#telephone").val())
+    //             keywordsObj.telephone = $("#telephone").val();
+    //         if ($("#userName").val())
+    //             keywordsObj.userName = $("#userName").val();
+    //         if ($("#deptId").val())
+    //             keywordsObj.deptId = $("#deptId").val();
+    //         if ($("#roleId").val())
+    //             keywordsObj.roleId = $("#roleId").val();
+    //         if ($("#workLocation").val())
+    //             keywordsObj.workLocation = $("#workLocation").val();
+    //         if ($("#startTime").val())
+    //             keywordsObj.startTime = $("#startTime").val();
+    //         if ($("#endTime").val())
+    //             keywordsObj.endTime = $("#endTime").val();
+    //         var startTime = $("#startTime").val();
+    //         var endTime = $("#endTime").val();
+    //         if(startTime > endTime){
+    //             window.confirm('开始日期应早于结束日期');
+    //         }
+    //         var keywords = "";
+    //         if (!$.isEmptyObject(keywordsObj)) {
+    //             keywords = JSON.stringify(keywordsObj);
+    //         }
+    //         $("#keywords").val(keywords);
+    //         $("#listForm").submit();
+    //     });
+    // });
 
     function ajaxUploadFile(id, url) {
         $.ajaxFileUpload({
@@ -302,18 +331,28 @@
 
     function initSearch() {
         var keywordsObj = {};
-        if ($("#realName").val())
-            keywordsObj.realName = $("#realName").val();
-        if ($("#telephone").val())
-            keywordsObj.telephone = $("#telephone").val();
-        if ($("#userName").val())
-            keywordsObj.userName = $("#userName").val();
-        if ($("#deptId").val())
-            keywordsObj.deptId = $("#deptId").val();
-        if ($("#roleId").val())
-            keywordsObj.roleId = $("#roleId").val();
-        if ($("#workLocation").val())
-            keywordsObj.workLocation = $("#workLocation").val();
+        if ($("#projectNo").val())
+            keywordsObj.projectNo = $("#projectNo").val();
+        if ($("#name").val())
+            keywordsObj.name = $("#name").val();
+        if ($("#owner").val())
+            keywordsObj.owner = $("#owner").val();
+        if ($("#contractParty").val())
+            keywordsObj.contractParty = $("#contractParty").val();
+        if ($("#contractNo").val())
+            keywordsObj.contractNo = $("#contractNo").val();
+        if ($("#projectType").val())
+            keywordsObj.projectType = $("#projectType").val();
+        if ($("#saleManager").val())
+            keywordsObj.saleManager = $("#saleManager").val();
+        if ($("#projectManager").val())
+            keywordsObj.projectManager = $("#projectManager").val();
+        if ($("#timeOutDay").val())
+            keywordsObj.timeOutDay = $("#timeOutDay").val();
+        if ($("#contractStartTime").val())
+            keywordsObj.contractStartTime = $("#contractStartTime").val();
+        if ($("#contractEndTime").val())
+            keywordsObj.contractEndTime = $("#contractEndTime").val();
         if ($("#startTime").val())
             keywordsObj.startTime = $("#startTime").val();
         if ($("#endTime").val())