搜索信息中统一常用搜索内容:项目名称，erp编号，费用申请号，年度，审批状态。这5个请统一排序，其余搜索内容可根据现有应用

保留。

src/main/resources/templates/annualbudget/list.html

@@ -22,27 +22,12 @@
                                 <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="xmlx" id="xmlx" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${xmlxList}" th:text="${item.name}" th:value="${item.code}"></option>
-                                </select>
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">ERP编号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 30px">年份</label>
                             <div class="layui-input-inline" style="width: 150px">
@@ -52,12 +37,6 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">任务书</label>
-                            <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">审批状态</label>
                             <div class="layui-input-inline" style="width: 150px">
@@ -67,6 +46,30 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">项目类型</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="xmlx" id="xmlx" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${xmlxList}" th:text="${item.name}" th:value="${item.code}"></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">所属部门</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">任务书</label>
+                            <div class="layui-input-inline" style="width: 300px">
+                                <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
                         <div class="layui-inline" style="margin-left: 0px">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
                             <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置 </button>

src/main/resources/templates/payapply/list.html

@@ -16,6 +16,19 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
+
+                        <label class="layui-form-label" style="width: 60px">项目名称</label>
+                        <div class="layui-input-inline"  style="width: 250px">
+                            <input type="text" name="rwsmc" autocomplete="off" class="layui-input">
+                        </div>
+                        <label class="layui-form-label" style="width: 60px">ERP编号</label>
+                        <div class="layui-input-inline"  style="width: 200px">
+                            <input type="text" name="erpbh" autocomplete="off" class="layui-input">
+                        </div>
+                        <label class="layui-form-label" style="width: 60px;left: 5px">申请编号</label>
+                        <div class="layui-input-inline"  style="width: 225px">
+                            <input type="text" name="bh" autocomplete="off" class="layui-input">
+                        </div>
                         <label class="layui-form-label" style="width: 60px">审批状态</label>
                         <div class="layui-input-inline" style="width: 150px">
                             <select name="spzt" lay-filter="status">
@@ -24,29 +37,19 @@
                                         th:value="${item.name}"></option>
                             </select>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">项目名称</label>
-                        <div class="layui-input-inline"  style="width: 250px">
-                            <input type="text" name="rwsmc" autocomplete="off" class="layui-input">
-                        </div>
-                        <label class="layui-form-label" style="width: 60px">费用申请</label>
-                        <div class="layui-input-inline"  style="width: 250px">
-                            <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
+                        <tr>
+                        <div class="layui-inline" style="top: 10px;left: 0px">
+                            <label class="layui-form-label" style="width: 60px">费用申请</label>
+                            <div class="layui-input-inline"  style="width: 250px">
+                                <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
+                            </div>
+                        <label class="layui-form-label" style="width: 60px">创建人</label>
+                        <div class="layui-input-inline"  style="width: 200px">
+                            <input type="text" name="cjr" autocomplete="off" class="layui-input">
                         </div>
 
 
-                        <label class="layui-form-label" style="width: 50px">创建人</label>
-                        <div class="layui-input-inline"  style="width: 150px">
-                            <input type="text" name="cjr" autocomplete="off" class="layui-input">
-                        </div>
-                        <label class="layui-form-label" style="width: 60px">ERP编号</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="erpbh" autocomplete="off" class="layui-input">
-                        </div>
 
-                            <label class="layui-form-label" style="width: 60px;left: 5px">申请编号</label>
-                            <div class="layui-input-inline"  style="width: 200px">
-                                <input type="text" name="bh" autocomplete="off" class="layui-input">
-                            </div>
                             <div class="layui-inline">
                                 <label class="layui-form-label" style="width: 60px">创建时间</label>
                                 <div class="layui-input-inline" style="width: 100px">
@@ -61,7 +64,9 @@
 
                         <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
                         <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置 </button>
-                    </div>
+                        </div>
+                        </tr>
+                        </div>
                 </form>
             </div>
         </fieldset>
@@ -142,12 +147,12 @@
                     {field: 'spzt', width: '11%',title: '审批状态', fixed: 'left'},
                     {field: 'rwsmc', width: '11%', title: '项目名称'},
                     {field: 'htmc', width: '11%', title: '合同'},
-                    {field: 'fysqmc', width: '25%',title: '费用申请'},
+                    {field: 'fysqmc', width: '15%',title: '费用申请'},
                     {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)'},
                     {field: 'fkjhmc', width: '12%', title: '付款计划'},
                     {field: 'cjrxm', width: '7%', title: '创建人'},
                     {field: 'cjrq', width: '8%', title: '创建时间', align: 'center'},
-                    {field: 'htje', title: '合同金额(万元)'}
+                    {field: 'htje', title: '合同金额(万元)' ,width: '8%'}
                 ]
             ],
             autoSort: false,

src/main/resources/templates/reimburse/list.html

@@ -16,6 +16,21 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
+                        <label class="layui-form-label" style="width: 60px">报账名称</label>
+                        <div class="layui-input-inline"  style="width: 200px">
+                            <input type="text" name="mc" autocomplete="off" class="layui-input">
+                        </div>
+                        <label class="layui-form-label" style="width: 90px">费用申请编号</label>
+                        <div class="layui-input-inline"  style="width: 200px">
+                            <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
+                        </div>
+                        <label class="layui-form-label" style="width: 30px">年份</label>
+                        <div class="layui-input-inline" style="width: 150px">
+                            <select name="nf" id="nf" lay-filter="status">
+                                <option value="">全部</option>
+                                <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
+                            </select>
+                        </div>
                         <label class="layui-form-label" style="width: 60px">审批状态</label>
                         <div class="layui-input-inline" style="width: 150px">
                             <select name="spzt" lay-filter="status">
@@ -25,26 +40,11 @@
                             </select>
                         </div>
 
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
-                                </select>
-                            </div>
-
-                        <label class="layui-form-label" style="width: 90px">费用申请编号</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
-                        </div>
                         <label class="layui-form-label" style="width: 60px">报账人</label>
                         <div class="layui-input-inline"  style="width: 150px">
                             <input type="text" name="bzr" autocomplete="off" class="layui-input">
                         </div>
-                        <label class="layui-form-label" style="width: 60px">报账名称</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="mc" autocomplete="off" class="layui-input">
-                        </div>
+
 
 
                         <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>

src/main/resources/templates/stabudgetapproval/list_imprest_my.html

@@ -18,19 +18,10 @@
           <div class="layui-form-item" >
             <div class="layui-inline">
               <label class="layui-form-label" style="width: 60px">项目名称</label>
-              <div class="layui-input-inline" style="width: 300px">
+              <div class="layui-input-inline" style="width: 200px">
                 <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
               </div>
             </div>
-            <div class="layui-inline">
-              <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>
-              <div class="layui-input-inline" style="width: 180px">
-                <select name="spzt" id="spzt" lay-filter="status">
-                  <option value="">全部</option>
-                  <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
-                </select>
-              </div>
-            </div>
             <div class="layui-inline">
               <label class="layui-form-label" style="width: 60px; margin-left: -10px">ERP编号</label>
               <div class="layui-input-inline" style="width: 150px">
@@ -38,11 +29,12 @@
               </div>
             </div>
             <div class="layui-inline">
-              <label class="layui-form-label" style="width: 30px; margin-left: -10px">编号</label>
+              <label class="layui-form-label" style="width: 60px; margin-left: -10px">申请编号</label>
               <div class="layui-input-inline" style="width: 150px">
                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
               </div>
             </div>
+
             <div class="layui-inline">
               <label class="layui-form-label" style="width: 30px; margin-left: -10px">年份</label>
               <div class="layui-input-inline" style="width: 100px">
@@ -52,6 +44,17 @@
                 </select>
               </div>
             </div>
+            <div class="layui-inline">
+              <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>
+              <div class="layui-input-inline" style="width: 150px">
+                <select name="spzt" id="spzt" lay-filter="status">
+                  <option value="">全部</option>
+                  <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
+                </select>
+              </div>
+            </div>
+
+
 
             <div class="layui-inline" style="margin-left: 0px">
               <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>

src/main/resources/templates/stafeemanage/list_allapply.html

@@ -24,39 +24,51 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">费用类别</label>
-                            <div class="layui-input-inline" style="width: 200px">
-                                <input type="text" id="fylb" name="fylb" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">申请人</label>
-                            <div class="layui-input-inline" style="width: 200px">
-                                <input type="text" id="sqr" name="sqr" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 60px">ERP编号</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">编号</label>
+                            <label class="layui-form-label" style="width: 90px">费用申请编号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
+                                            th:value="${item.nf}"></option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 225px">
-                                <select name="xmlx" id="xmlx" lay-filter="status">
+                            <label class="layui-form-label" style="width: 60px">审批状态</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="spzt" id="spzt" lay-filter="status">
                                     <option value="">全部</option>
-                                    <option th:each="item:${xmlxList}" th:text="${item.name}"
-                                            th:value="${item.code}"></option>
+                                    <option th:each="item:${approveList}" th:text="${item.name}"
+                                            th:value="${item.name}"></option>
                                 </select>
                             </div>
                         </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">费用类别</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <input type="text" id="fylb" name="fylb" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">申请人</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <input type="text" id="sqr" name="sqr" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 90px">电科院负责人</label>
                             <div class="layui-input-inline" style="width: 150px">
@@ -65,34 +77,25 @@
                                        class="layui-input" readonly>
                             </div>
                         </div>
-                        <br>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">审批状态</label>
+                            <label class="layui-form-label" style="width: 60px">项目类型</label>
                             <div class="layui-input-inline" style="width: 200px">
-                                <select name="spzt" id="spzt" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${approveList}" th:text="${item.name}"
-                                            th:value="${item.name}"></option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="nf" id="nf" lay-filter="status">
+                                <select name="xmlx" id="xmlx" lay-filter="status">
                                     <option value="">全部</option>
-                                    <option th:each="item:${yearList}" th:text="${item.nf}"
-                                            th:value="${item.nf}"></option>
+                                    <option th:each="item:${xmlxList}" th:text="${item.name}"
+                                            th:value="${item.code}"></option>
                                 </select>
                             </div>
                         </div>
+
+                        <br>
                         <div class="layui-inline">
                             <label class="layui-form-label required" style="width: 60px">所属部门</label>
-                            <div class="layui-input-block">
+                            <div class="layui-input-block" style="width: 200px;left:-20px">
                                 <input type="text" id="ssbmmc" name="ssbmmc" >
                             </div>
                         </div>
-                        <div class="layui-inline">
+                        <div class="layui-inline" style="left: -10px">
                             <label class="layui-form-label" style="width: 60px">申请时间</label>
                             <div class="layui-input-inline" style="width: 100px">
                                 <input type="text" name="sqsj1" id="sqsj1" placeholder="开始时间" class="layui-input"
@@ -104,21 +107,21 @@
                                        readonly>
                             </div>
                         </div>
+                        <br>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 90px">是否备用金</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="sfbyj" id="sfbyj" lay-filter="status">
+                            <label class="layui-form-label" style="width: 60px">是否报账</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="sfbz" id="sfbz" lay-filter="status">
                                     <option value="">全部</option>
                                     <option value="1">是</option>
                                     <option value="0">否</option>
                                 </select>
                             </div>
                         </div>
-                        <br>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">是否报账</label>
-                            <div class="layui-input-inline" style="width: 200px">
-                                <select name="sfbz" id="sfbz" lay-filter="status">
+                        <div class="layui-inline" style="left: -30px">
+                            <label class="layui-form-label" style="width: 90px">是否备用金</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="sfbyj" id="sfbyj" lay-filter="status">
                                     <option value="">全部</option>
                                     <option value="1">是</option>
                                     <option value="0">否</option>
@@ -398,7 +401,9 @@
                 "nf": '',
                 "spzt": '',
                 "sfbz": '',
-                "dkyfzr": ''
+                "dkyfzr": '',
+                "sqsj1":'',
+                "sqsj2":''
             });
             // 执行搜索重载
             currTable.reload({

src/main/resources/templates/stafeemanage/list_approving.html

@@ -23,20 +23,39 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">编号</label>
+                            <label class="layui-form-label" style="width: 60px">ERP编号</label>
+                            <div class="layui-input-inline" style="width: 225px">
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 90px">费用申请编号</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">ERP编号</label>
+                            <label class="layui-form-label" style="width: 30px">年份</label>
                             <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">审批状态</label>
+                            <div class="layui-input-inline" style="width: 200px">
+                                <select name="spzt" id="spzt" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 225px">
+                            <div class="layui-input-inline" style="width: 200px">
                                 <select name="xmlx" id="xmlx" lay-filter="status">
                                     <option value="">全部</option>
                                     <option th:each="item:${xmlxList}" th:text="${item.name}" th:value="${item.code}"></option>
@@ -54,35 +73,18 @@
 <!--                            </div>-->
 <!--                        </div>-->
 <!--                        <br>-->
-                        <div class="layui-inline">
+                        <div class="layui-inline" style="left: -30px">
                             <label class="layui-form-label" style="width: 90px">电科院负责人</label>
-                            <div class="layui-input-inline" style="width: 200px">
+                            <div class="layui-input-inline" style="width: 225px">
                                 <input type="hidden" id="dkyfzr" name="dkyfzr" class="layui-input">
                                 <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" class="layui-input" readonly>
                             </div>
                         </div>
                         <br>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 200px">
-                                <select name="spzt" id="spzt" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
-                                </select>
-                            </div>
-                        </div>
+
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <div class="layui-input-inline" style="width: 200px">
                                 <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>

src/main/resources/templates/stafeemanage/list_feemanage.html

@@ -18,7 +18,7 @@
                     <div class="layui-form-item" >
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 450px">
+                            <div class="layui-input-inline" style="width: 415px">
                                 <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -28,6 +28,15 @@
                                 <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 150px">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
+                                </select>
+                            </div>
+                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">项目类型</label>
                             <div class="layui-input-inline" style="width: 150px">
@@ -37,28 +46,20 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="layui-inline">
+                        <div class="layui-inline" style="left: -35px">
                             <label class="layui-form-label" style="width: 95px">项目负责人</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="hidden" id="xmfzr" name="xmfzr" class="layui-input">
                                 <input type="text" id="xmfzrxm" name="xmfzrxm" placeholder="可多选" autocomplete="off" class="layui-input" readonly>
                             </div>
                         </div>
-                        <div class="layui-inline">
+                        <div class="layui-inline" style="left: -35px">
                             <label class="layui-form-label" style="width: 60px">所属部门</label>
                             <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="nf" id="nf" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${yearList}" th:text="${item.nf}" th:value="${item.nf}"></option>
-                                </select>
-                            </div>
-                        </div>
+
                         <div class="layui-inline" style="margin-left: 0px">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索</button>
                             <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置 </button>
@@ -67,19 +68,19 @@
                 </form>
             </div>
         </fieldset>
-                <script type="text/html" id="toolbarDemo">
-                    <div class="layui-btn-container">
-                        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view">
-                            <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
-                        </button>
-                        <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
-                            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
-                        </button>
-                    </div>
-                </script>
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
     </div>
 </div>
+<script type="text/html" id="toolbarDemo">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm layui-btn-warm" lay-event="view">
+            <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
+        </button>
+        <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
+            <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表
+        </button>
+    </div>
+</script>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
@@ -97,6 +98,7 @@
             elem: '#currentTableId',
             url: AjaxUtil.ctx + 'staBudgetapproval/list_feemanage',
             method: 'post',
+            toolbar: '#toolbarDemo', // 自定义模板
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
             cols: [
@@ -220,13 +222,12 @@
             }
         });
 
-        监听工具栏事件
+        // 监听工具栏事件
         table.on('toolbar(currentTableFilter)', function (obj) {
         if (obj.event == 'view') {
             var dataApproval = table.cache["currentTableId"];
             if(dataApproval.length == 0)
                 return;
-
             var checkStatus = table.checkStatus('currentTableId')
                 , data = checkStatus.data;
             if (data == null || data.length === 0) {
@@ -242,7 +243,6 @@
                     "xmfzrxm": data.xmfzrxm,
                     "ssbmmc": data.ssbmmc
                 }
-
                 layer.open({
                     title: '浏览费用申请',
                     type: 2,
@@ -259,6 +259,7 @@
             }
         }
         else if (obj.event === 'exportExcel') {
+            
             var dataApproval = table.cache["currentTableId"];
             if(dataApproval.length == 0)
                 return;

src/main/resources/templates/statistical/meetingFee.html

@@ -129,6 +129,7 @@
                     {field: 'FYSQ', width: '9%', title: '申请费用'},
                     {field: 'BZFYH', width: '10%', title: '报账费用（含税）'},
                     {field: 'BZFYBH', width: '10%', title: '报账费用（不含税）'},
+                    {field: 'ERPBH',width: '10%',title: '项目编号(ERP）'},
                     {field: 'KYFH', width: '15%', title: '科研费号'},
                     {field: 'SFBYJ', width: '10%', title: '是否备用金'},
                     {field: 'SQSJ', width: '10%', title: '申请时间'},