Browse Source

报表筛选模块

ly 5 months ago
parent
commit
966570c815

+ 1 - 1
src/main/java/com/liang/controller/StaSourceFeeController.java

@@ -186,8 +186,8 @@ public class StaSourceFeeController extends BaseController {
186
                                  @RequestParam(required = false, defaultValue = "", value = "CBS") String cbs,
186
                                  @RequestParam(required = false, defaultValue = "", value = "CBS") String cbs,
187
                                  @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
187
                                  @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
188
                                  @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
188
                                  @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
189
-        List<HashMap<String, Object>> staFeasibilityreport = staSourceFeeService.searchSourceCost(mc, tsmc, cbs, qsrq, jzrq);
190
         PageHelper.startPage(pageNum, pageSize);
189
         PageHelper.startPage(pageNum, pageSize);
190
+        List<HashMap<String, Object>> staFeasibilityreport = staSourceFeeService.searchSourceCost(mc, tsmc, cbs, qsrq, jzrq);
191
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
191
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
192
         List<HashMap<String, Object>> rows = pageinfo.getList();
192
         List<HashMap<String, Object>> rows = pageinfo.getList();
193
         int total = (int) pageinfo.getTotal();
193
         int total = (int) pageinfo.getTotal();

+ 12 - 12
src/main/resources/templates/lsuserinfo/list.html

@@ -16,34 +16,33 @@
16
             <legend>搜索信息(<b>收起-展开</b>)</legend>
16
             <legend>搜索信息(<b>收起-展开</b>)</legend>
17
             <div id="search-div" style="margin: 5px 10px -10px 0px">
17
             <div id="search-div" style="margin: 5px 10px -10px 0px">
18
                 <form class="layui-form" action="" lay-filter="search-form">
18
                 <form class="layui-form" action="" lay-filter="search-form">
19
-                    <div class="layui-form-item">
19
+                    <div class="layui-form-item" style="display: flex; align-items: center; gap: 10px;">
20
                         <div class="layui-inline">
20
                         <div class="layui-inline">
21
-                            <label class="layui-form-label" style="width: 40px">姓名</label>
21
+                            <label class="layui-form-label" style="width: 40px;">姓名</label>
22
                             <div class="layui-input-inline">
22
                             <div class="layui-input-inline">
23
                                 <input type="text" name="xm" autocomplete="off" class="layui-input">
23
                                 <input type="text" name="xm" autocomplete="off" class="layui-input">
24
                             </div>
24
                             </div>
25
                         </div>
25
                         </div>
26
                         <div class="layui-inline">
26
                         <div class="layui-inline">
27
                             <div class="layui-inline">
27
                             <div class="layui-inline">
28
-                                <label class="layui-form-label " style="width: 40px;">学历</label>
28
+                                <label class="layui-form-label" style="width: 40px;">学历</label>
29
                                 <div class="layui-input-inline" style="width: 130px;">
29
                                 <div class="layui-input-inline" style="width: 130px;">
30
                                     <select name="xl" id="xl" lay-search>
30
                                     <select name="xl" id="xl" lay-search>
31
                                         <option value="">请选择</option>
31
                                         <option value="">请选择</option>
32
-                                        <option th:each="item:${xlList}" th:text="${item.name}"
33
-                                                th:value="${item.name}"></option>
32
+                                        <option th:each="item:${xlList}" th:text="${item.name}" th:value="${item.name}"></option>
34
                                     </select>
33
                                     </select>
35
                                 </div>
34
                                 </div>
36
                             </div>
35
                             </div>
37
                         </div>
36
                         </div>
38
                         <div class="layui-inline">
37
                         <div class="layui-inline">
39
-                            <label class="layui-form-label" style="width: 80px">身份证号</label>
38
+                            <label class="layui-form-label" style="width: 80px;">身份证号</label>
40
                             <div class="layui-input-inline">
39
                             <div class="layui-input-inline">
41
                                 <input type="text" name="sfzh" autocomplete="off" class="layui-input">
40
                                 <input type="text" name="sfzh" autocomplete="off" class="layui-input">
42
                             </div>
41
                             </div>
43
                         </div>
42
                         </div>
44
                         <div class="layui-inline">
43
                         <div class="layui-inline">
45
                             <div class="layui-inline">
44
                             <div class="layui-inline">
46
-                                <label class="layui-form-label " style="width: 40px;">状态</label>
45
+                                <label class="layui-form-label" style="width: 40px;">状态</label>
47
                                 <div class="layui-input-inline" style="width: 130px;">
46
                                 <div class="layui-input-inline" style="width: 130px;">
48
                                     <select name="zt" id="zt">
47
                                     <select name="zt" id="zt">
49
                                         <option value="">[请选择]</option>
48
                                         <option value="">[请选择]</option>
@@ -53,16 +52,17 @@
53
                                 </div>
52
                                 </div>
54
                             </div>
53
                             </div>
55
                         </div>
54
                         </div>
56
-                        <div class="layui-inline" style="margin-left: 0px">
55
+                        <div class="layui-inline" style="margin-left: 0px;">
57
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
56
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
58
-                                <i class="layui-icon"></i> 搜 
57
+                                <i class="layui-icon">&#xe615;</i> 搜
59
                             </button>
58
                             </button>
60
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
61
-                                    lay-filter="data-reset-btn">
62
-                                <i class="layui-icon layui-icon-refresh"></i> 重 置
59
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
60
+                                <i class="layui-icon layui-icon-refresh"></i> 重置
63
                             </button>
61
                             </button>
64
                         </div>
62
                         </div>
65
                     </div>
63
                     </div>
64
+
65
+
66
                 </form>
66
                 </form>
67
             </div>
67
             </div>
68
         </fieldset>
68
         </fieldset>

+ 43 - 45
src/main/resources/templates/statistical/expertFee.html

@@ -23,67 +23,65 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-                        <!--                        <div class="layui-inline">-->
34
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
35
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
36
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
37
-                        <!--                                    <option value="">全部</option>-->
38
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
39
-                        <!--                                            th:value="${item.name}"></option>-->
40
-                        <!--                                </select>-->
41
-                        <!--                            </div>-->
42
-                        <!--                        </div>-->
43
-                        <div class="layui-inline">
44
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">专家姓名</label>
45
-                            <div class="layui-input-inline" style="width: 150px">
46
-                                <input type="text" id="ZJXM" name="ZJXM" class="layui-input" autocomplete="off"/>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
47
                             </div>
37
                             </div>
48
                         </div>
38
                         </div>
49
-
50
-                        <div class="layui-inline">
51
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">职称</label>
52
-                            <div class="layui-input-inline" style="width: 150px">
53
-                                <input type="text" id="ZC" name="ZC" class="layui-input" autocomplete="off"/>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
54
                             </div>
49
                             </div>
55
                         </div>
50
                         </div>
51
+                    </div>
56
 
52
 
57
-                        <div class="layui-inline">
58
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
59
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
60
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
61
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
62
                             </div>
58
                             </div>
63
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
64
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
65
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
66
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
62
+                            </div>
63
+                        </div>
64
+                        <div class="layui-inline">
65
+                            <label class="layui-form-label" style="width: 80px">专家姓名</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="ZJXM" name="ZJXM" class="layui-input" autocomplete="off"/>
67
                             </div>
68
                             </div>
68
                         </div>
69
                         </div>
69
-
70
-                        <!--                        <div class="layui-inline">-->
71
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
72
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
73
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
74
-                        <!--                                    <option value="">全部</option>-->
75
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
76
-                        <!--                                            th:value="${item.code}"></option>-->
77
-                        <!--                                </select>-->
78
-                        <!--                            </div>-->
79
-                        <!--                        </div>-->
80
 
70
 
81
                         <div class="layui-inline">
71
                         <div class="layui-inline">
82
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
83
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
72
+                            <label class="layui-form-label" style="width: 80px">职称</label>
73
+                            <div class="layui-input-inline" style="width: 140px">
74
+                                <input type="text" id="ZC" name="ZC" class="layui-input" autocomplete="off"/>
75
+                            </div>
76
+                        </div>
77
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
78
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
79
+                                <i class="layui-icon"></i> 搜 索
84
                             </button>
80
                             </button>
85
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
86
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
81
+                        </div>
82
+                        <div class="layui-inline" style="margin-right: 10px;">
83
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
84
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
87
                             </button>
85
                             </button>
88
                         </div>
86
                         </div>
89
                     </div>
87
                     </div>

+ 49 - 42
src/main/resources/templates/statistical/intellectualPropertyFee.html

@@ -23,69 +23,76 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-
34
-                        <div class="layui-inline">
35
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">产权类别</label>
36
-                            <div class="layui-input-inline" style="width: 150px">
37
-                                <input type="text" id="CQLB" name="CQLB" class="layui-input" autocomplete="off"/>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
38
                             </div>
37
                             </div>
39
                         </div>
38
                         </div>
40
-
41
-                        <div class="layui-inline">
42
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">名称</label>
43
-                            <div class="layui-input-inline" style="width: 150px">
44
-                                <input type="text" id="MC" name="MC" class="layui-input" autocomplete="off"/>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
45
                             </div>
43
                             </div>
46
                         </div>
44
                         </div>
47
-
48
-                        <div class="layui-inline">
49
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">委托机构</label>
50
-                            <div class="layui-input-inline" style="width: 150px">
51
-                                <input type="text" id="WTJG" name="WTJG" class="layui-input" autocomplete="off"/>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
52
                             </div>
49
                             </div>
53
                         </div>
50
                         </div>
51
+                    </div>
54
 
52
 
55
-
56
-                        <!--                        <div class="layui-inline">-->
57
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
58
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
59
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
60
-                        <!--                                    <option value="">全部</option>-->
61
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
62
-                        <!--                                            th:value="${item.code}"></option>-->
63
-                        <!--                                </select>-->
64
-                        <!--                            </div>-->
65
-                        <!--                        </div>-->
66
-
67
-                        <div class="layui-inline">
68
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
69
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
70
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
71
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
72
                             </div>
58
                             </div>
73
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
74
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
75
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
76
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
62
+                            </div>
63
+                        </div>
64
+                        <div class="layui-inline">
65
+                            <label class="layui-form-label" style="width: 60px; margin-left: 20px">产权类别</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="CQLB" name="CQLB" class="layui-input" autocomplete="off"/>
68
+                            </div>
69
+                        </div>
70
+
71
+                        <div class="layui-inline">
72
+                            <label class="layui-form-label" style="width: 80px">名称</label>
73
+                            <div class="layui-input-inline" style="width: 140px">
74
+                                <input type="text" id="MC" name="MC" class="layui-input" autocomplete="off"/>
77
                             </div>
75
                             </div>
78
                         </div>
76
                         </div>
79
 
77
 
80
                         <div class="layui-inline">
78
                         <div class="layui-inline">
81
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
82
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
79
+                            <label class="layui-form-label" style="width: 80px">委托机构</label>
80
+                            <div class="layui-input-inline" style="width: 140px">
81
+                                <input type="text" id="WTJG" name="WTJG" class="layui-input" autocomplete="off"/>
82
+                            </div>
83
+                        </div>
84
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
85
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
86
+                                <i class="layui-icon"></i> 搜 索
83
                             </button>
87
                             </button>
84
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
85
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
88
+                        </div>
89
+                        <div class="layui-inline" style="margin-right: 10px;">
90
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
91
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
86
                             </button>
92
                             </button>
87
                         </div>
93
                         </div>
88
                     </div>
94
                     </div>
95
+
89
                 </form>
96
                 </form>
90
             </div>
97
             </div>
91
         </fieldset>
98
         </fieldset>

+ 47 - 41
src/main/resources/templates/statistical/material.html

@@ -23,66 +23,72 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-
34
-                        <div class="layui-inline">
35
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">材料名称</label>
36
-                            <div class="layui-input-inline" style="width: 150px">
37
-                                <input type="text" id="CLMC" name="CLMC" class="layui-input" autocomplete="off"/>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
38
                             </div>
37
                             </div>
39
                         </div>
38
                         </div>
40
-
41
-                        <div class="layui-inline">
42
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">物料编码</label>
43
-                            <div class="layui-input-inline" style="width: 150px">
44
-                                <input type="text" id="WLBM" name="WLBM" class="layui-input" autocomplete="off"/>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
45
                             </div>
43
                             </div>
46
                         </div>
44
                         </div>
47
-
48
-                        <div class="layui-inline">
49
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">备注</label>
50
-                            <div class="layui-input-inline" style="width: 150px">
51
-                                <input type="text" id="BZ" name="BZ" class="layui-input" autocomplete="off"/>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 60px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
52
                             </div>
49
                             </div>
53
                         </div>
50
                         </div>
51
+                    </div>
54
 
52
 
55
-                        <div class="layui-inline">
56
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
57
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
58
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
59
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
60
                             </div>
58
                             </div>
61
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
62
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
63
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
64
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
62
+                            </div>
63
+                        </div>
64
+                        <div class="layui-inline">
65
+                            <label class="layui-form-label" style="width: 80px">材料名称</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="CLMC" name="CLMC" class="layui-input" autocomplete="off"/>
65
                             </div>
68
                             </div>
66
                         </div>
69
                         </div>
67
 
70
 
68
-
69
-                        <!--                        <div class="layui-inline">-->
70
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
71
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
72
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
73
-                        <!--                                    <option value="">全部</option>-->
74
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
75
-                        <!--                                            th:value="${item.code}"></option>-->
76
-                        <!--                                </select>-->
77
-                        <!--                            </div>-->
78
-                        <!--                        </div>-->
71
+                        <div class="layui-inline">
72
+                            <label class="layui-form-label" style="width: 80px">物料编码</label>
73
+                            <div class="layui-input-inline" style="width: 140px">
74
+                                <input type="text" id="WLBM" name="WLBM" class="layui-input" autocomplete="off"/>
75
+                            </div>
76
+                        </div>
79
 
77
 
80
                         <div class="layui-inline">
78
                         <div class="layui-inline">
81
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
82
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
79
+                            <label class="layui-form-label" style="width: 60px">备注</label>
80
+                            <div class="layui-input-inline" style="width: 140px">
81
+                                <input type="text" id="BZ" name="BZ" class="layui-input" autocomplete="off"/>
82
+                            </div>
83
+                        </div>
84
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
85
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
86
+                                <i class="layui-icon"></i> 搜 索
83
                             </button>
87
                             </button>
84
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
85
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
88
+                        </div>
89
+                        <div class="layui-inline" style="margin-right: 10px;">
90
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
91
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
86
                             </button>
92
                             </button>
87
                         </div>
93
                         </div>
88
                     </div>
94
                     </div>

+ 37 - 36
src/main/resources/templates/statistical/meetingFee.html

@@ -2,7 +2,7 @@
2
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
2
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
3
 <head>
3
 <head>
4
     <meta charset="UTF-8">
4
     <meta charset="UTF-8">
5
-    <title>会议费用</title>
5
+    <title>间接费</title>
6
     <meta name="renderer" content="webkit">
6
     <meta name="renderer" content="webkit">
7
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
7
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
8
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
8
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
@@ -23,57 +23,58 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 60px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-                        <div class="layui-inline">
34
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">ERP编号</label>
35
-                            <div class="layui-input-inline" style="width: 150px">
36
-                                <input type="text" id="erpbh" name="erpbh" class="layui-input" autocomplete="off"/>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
37
                             </div>
37
                             </div>
38
                         </div>
38
                         </div>
39
-
40
-                        <div class="layui-inline">
41
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">会议地点</label>
42
-                            <div class="layui-input-inline" style="width: 150px">
43
-                                <input type="text" id="HYDD" name="HYDD" class="layui-input" autocomplete="off"/>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
44
                             </div>
43
                             </div>
45
                         </div>
44
                         </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
49
+                            </div>
50
+                        </div>
51
+                    </div>
46
 
52
 
47
-
48
-                        <div class="layui-inline">
49
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
50
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
51
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
52
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
53
                             </div>
58
                             </div>
54
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
55
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
56
                                 <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
61
                                 <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
57
                             </div>
62
                             </div>
58
                         </div>
63
                         </div>
59
-
60
-                        <!--                        <div class="layui-inline">-->
61
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
62
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
63
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
64
-                        <!--                                    <option value="">全部</option>-->
65
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
66
-                        <!--                                            th:value="${item.code}"></option>-->
67
-                        <!--                                </select>-->
68
-                        <!--                            </div>-->
69
-                        <!--                        </div>-->
70
-
71
                         <div class="layui-inline">
64
                         <div class="layui-inline">
72
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
73
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
65
+                            <label class="layui-form-label" style="width: 80px">会议地点</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="HYDD" name="HYDD" class="layui-input" autocomplete="off"/>
68
+                            </div>
69
+                        </div>
70
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
71
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
72
+                                <i class="layui-icon"></i> 搜 索
74
                             </button>
73
                             </button>
75
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
76
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
74
+                        </div>
75
+                        <div class="layui-inline" style="margin-right: 10px;">
76
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
77
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
77
                             </button>
78
                             </button>
78
                         </div>
79
                         </div>
79
                     </div>
80
                     </div>

+ 37 - 29
src/main/resources/templates/statistical/outPay.html

@@ -23,48 +23,56 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
37
+                            </div>
38
+                        </div>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
49
+                            </div>
50
+                        </div>
51
+                    </div>
33
 
52
 
34
-
35
-                        <div class="layui-inline">
36
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
37
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
38
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
39
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
40
                             </div>
58
                             </div>
41
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
42
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
43
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
44
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
45
                             </div>
62
                             </div>
46
                         </div>
63
                         </div>
47
-
48
-                        <!--                        <div class="layui-inline">-->
49
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
50
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
51
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
52
-                        <!--                                    <option value="">全部</option>-->
53
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
54
-                        <!--                                            th:value="${item.code}"></option>-->
55
-                        <!--                                </select>-->
56
-                        <!--                            </div>-->
57
-                        <!--                        </div>-->
58
-
59
-                        <div class="layui-inline">
60
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
61
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
64
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
65
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
66
+                                <i class="layui-icon"></i> 搜 索
62
                             </button>
67
                             </button>
63
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
64
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
68
+                        </div>
69
+                        <div class="layui-inline" style="margin-right: 10px;">
70
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
71
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
65
                             </button>
72
                             </button>
66
                         </div>
73
                         </div>
67
                     </div>
74
                     </div>
75
+
68
                 </form>
76
                 </form>
69
             </div>
77
             </div>
70
         </fieldset>
78
         </fieldset>

+ 36 - 17
src/main/resources/templates/statistical/printingFee.html

@@ -23,33 +23,52 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
37
+                            </div>
38
+                        </div>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
49
+                            </div>
50
+                        </div>
51
+                    </div>
33
 
52
 
34
-                        <div class="layui-inline">
35
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
36
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
37
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
38
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
39
                             </div>
58
                             </div>
40
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
41
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
42
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
43
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
44
                             </div>
62
                             </div>
45
                         </div>
63
                         </div>
46
-
47
-                        <div class="layui-inline">
48
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
49
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
64
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
65
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
66
+                                <i class="layui-icon"></i> 搜 索
50
                             </button>
67
                             </button>
51
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
52
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
68
+                        </div>
69
+                        <div class="layui-inline" style="margin-right: 10px;">
70
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
71
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
53
                             </button>
72
                             </button>
54
                         </div>
73
                         </div>
55
                     </div>
74
                     </div>

+ 36 - 15
src/main/resources/templates/statistical/projectPay.html

@@ -23,31 +23,52 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
37
+                            </div>
38
+                        </div>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
49
+                            </div>
50
+                        </div>
51
+                    </div>
33
 
52
 
34
-                        <div class="layui-inline">
35
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
36
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
37
-                                <input type="text" name="QS" id="QS" placeholder="开始日期" class="layui-input" readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
38
                             </div>
58
                             </div>
39
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
40
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
41
-                                <input type="text" name="WC" id="WC" placeholder="结束日期" class="layui-input" readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
42
                             </div>
62
                             </div>
43
                         </div>
63
                         </div>
44
-
45
-                        <div class="layui-inline">
46
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
47
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
64
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
65
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
66
+                                <i class="layui-icon"></i> 搜 索
48
                             </button>
67
                             </button>
49
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
50
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
68
+                        </div>
69
+                        <div class="layui-inline" style="margin-right: 10px;">
70
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
71
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
51
                             </button>
72
                             </button>
52
                         </div>
73
                         </div>
53
                     </div>
74
                     </div>

+ 46 - 46
src/main/resources/templates/statistical/sourceFee.html

@@ -23,67 +23,67 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
26
+
27
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
28
+                        <div class="layui-inline" style="margin-right: 10px;">
29
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
30
+                            <div class="layui-input-inline" style="width: 224px;">
31
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
32
                             </div>
32
                         </div>
33
                         </div>
33
-                        <!--                        <div class="layui-inline">-->
34
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
35
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
36
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
37
-                        <!--                                    <option value="">全部</option>-->
38
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
39
-                        <!--                                            th:value="${item.name}"></option>-->
40
-                        <!--                                </select>-->
41
-                        <!--                            </div>-->
42
-                        <!--                        </div>-->
43
-                        <div class="layui-inline">
44
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">图书名称</label>
45
-                            <div class="layui-input-inline" style="width: 150px">
46
-                                <input type="text" id="TSMC" name="TSMC" class="layui-input" autocomplete="off"/>
34
+                        <div class="layui-inline" style="margin-right: 10px;">
35
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
36
+                            <div class="layui-input-inline" style="width: 140px;">
37
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
47
                             </div>
38
                             </div>
48
                         </div>
39
                         </div>
49
-
50
-                        <div class="layui-inline">
51
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">出版社</label>
52
-                            <div class="layui-input-inline" style="width: 150px">
53
-                                <input type="text" id="CBS" name="CBS" class="layui-input" autocomplete="off"/>
40
+                        <div class="layui-inline" style="margin-right: 10px;">
41
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
42
+                            <div class="layui-input-inline" style="width: 140px;">
43
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
54
                             </div>
44
                             </div>
55
                         </div>
45
                         </div>
46
+                        <div class="layui-inline" style="margin-right: 10px;">
47
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
48
+                            <div class="layui-input-inline" style="width: 140px;">
49
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
50
+                            </div>
51
+                        </div>
52
+                    </div>
53
+
54
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
56
 
55
 
57
-                        <div class="layui-inline">
58
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
56
+                        <div class="layui-inline" style="margin-right: 10px;">
57
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
59
                             <div class="layui-input-inline" style="width: 100px;">
58
                             <div class="layui-input-inline" style="width: 100px;">
60
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
61
-                                       readonly>
59
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
62
                             </div>
60
                             </div>
63
                             <div class="layui-form-mid">-</div>
61
                             <div class="layui-form-mid">-</div>
64
                             <div class="layui-input-inline" style="width: 100px;">
62
                             <div class="layui-input-inline" style="width: 100px;">
65
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
66
-                                       readonly>
63
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
64
+                            </div>
65
+                        </div>
66
+                        <div class="layui-inline" style="margin-left: 20px">
67
+                            <label class="layui-form-label" style="width: 60px">图书名称</label>
68
+                            <div class="layui-input-inline" style="width: 140px">
69
+                                <input type="text" id="TSMC" name="TSMC" class="layui-input" autocomplete="off"/>
67
                             </div>
70
                             </div>
68
                         </div>
71
                         </div>
69
 
72
 
70
-                        <!--                        <div class="layui-inline">-->
71
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
72
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
73
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
74
-                        <!--                                    <option value="">全部</option>-->
75
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
76
-                        <!--                                            th:value="${item.code}"></option>-->
77
-                        <!--                                </select>-->
78
-                        <!--                            </div>-->
79
-                        <!--                        </div>-->
80
-
81
-                        <div class="layui-inline">
82
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
83
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
73
+                        <div class="layui-inline" style="margin-right: 10px">
74
+                            <label class="layui-form-label" style="width: 80px">出版社</label>
75
+                            <div class="layui-input-inline" style="width: 140px">
76
+                                <input type="text" id="CBS" name="CBS" class="layui-input" autocomplete="off"/>
77
+                            </div>
78
+                        </div>
79
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
80
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
81
+                                <i class="layui-icon"></i> 搜 索
84
                             </button>
82
                             </button>
85
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
86
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
83
+                        </div>
84
+                        <div class="layui-inline" style="margin-right: 10px;">
85
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
86
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
87
                             </button>
87
                             </button>
88
                         </div>
88
                         </div>
89
                     </div>
89
                     </div>

+ 48 - 50
src/main/resources/templates/statistical/tempMember.html

@@ -23,78 +23,76 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-                        <!--                        <div class="layui-inline">-->
34
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>-->
35
-                        <!--                            <div class="layui-input-inline" style="width: 150px">-->
36
-                        <!--                                <select name="SPZT" id="SPZT" lay-filter="status">-->
37
-                        <!--                                    <option value="">全部</option>-->
38
-                        <!--                                    <option th:each="item:${approveList}" th:text="${item.name}"-->
39
-                        <!--                                            th:value="${item.name}"></option>-->
40
-                        <!--                                </select>-->
41
-                        <!--                            </div>-->
42
-                        <!--                        </div>-->
43
-                        <div class="layui-inline">
44
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">临时人员姓名</label>
45
-                            <div class="layui-input-inline" style="width: 150px">
46
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
47
-                                       autocomplete="off"/>
48
-                                <!--                                <input type="text" id="parentName" name="parentName"/>-->
49
-                                <!--                                <input type="hidden" id="parentId" name="parentId"/>-->
50
-                                <!--                                <input type="hidden" id="ancestors" name="ancestors"/>-->
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
51
                             </div>
37
                             </div>
52
                         </div>
38
                         </div>
53
-                        <!--                        <div class="layui-inline">-->
54
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
55
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
56
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
57
-                        <!--                                    <option value="">全部</option>-->
58
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
59
-                        <!--                                            th:value="${item.code}"></option>-->
60
-                        <!--                                </select>-->
61
-                        <!--                            </div>-->
62
-                        <!--                        </div>-->
63
-                        <div class="layui-inline">
64
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">聘用日期</label>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
49
+                            </div>
50
+                        </div>
51
+                    </div>
52
+
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
65
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
66
-                                <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
67
-                                       class="layui-input" readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
68
                             </div>
58
                             </div>
69
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
70
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
71
-                                <input type="text" name="SQRQEnd" id="SQRQEnd" placeholder="结束日期" class="layui-input"
72
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
62
+                            </div>
63
+                        </div>
64
+                        <div class="layui-inline">
65
+                            <label class="layui-form-label" style="width: 80px">临时人员姓名</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
68
+                                       autocomplete="off"/>
73
                             </div>
69
                             </div>
74
                         </div>
70
                         </div>
75
-
76
                         <div class="layui-inline">
71
                         <div class="layui-inline">
77
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
72
+                            <label class="layui-form-label" style="width: 80px">聘用日期</label>
78
                             <div class="layui-input-inline" style="width: 100px;">
73
                             <div class="layui-input-inline" style="width: 100px;">
79
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
80
-                                       readonly>
74
+                                <input type="text" name="SQRQStart" id="SQRQStart" placeholder="开始日期"
75
+                                       class="layui-input" readonly>
81
                             </div>
76
                             </div>
82
                             <div class="layui-form-mid">-</div>
77
                             <div class="layui-form-mid">-</div>
83
                             <div class="layui-input-inline" style="width: 100px;">
78
                             <div class="layui-input-inline" style="width: 100px;">
84
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
79
+                                <input type="text" name="SQRQEnd" id="SQRQEnd" placeholder="结束日期" class="layui-input"
85
                                        readonly>
80
                                        readonly>
86
                             </div>
81
                             </div>
87
                         </div>
82
                         </div>
88
-
89
-                        <div class="layui-inline">
90
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
91
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
83
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
84
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
85
+                                <i class="layui-icon"></i> 搜 索
92
                             </button>
86
                             </button>
93
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
94
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
87
+                        </div>
88
+                        <div class="layui-inline" style="margin-right: 10px;">
89
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
90
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
95
                             </button>
91
                             </button>
96
                         </div>
92
                         </div>
97
                     </div>
93
                     </div>
94
+
95
+
98
                 </form>
96
                 </form>
99
             </div>
97
             </div>
100
         </fieldset>
98
         </fieldset>

+ 39 - 32
src/main/resources/templates/statistical/travelexpenses.html

@@ -23,51 +23,58 @@
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
23
             <legend>搜索信息(<b>收起-展开</b>)</legend>
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
24
             <div id="search-div" style="margin: 5px 10px -10px 0px">
25
                 <form class="layui-form" action="" lay-filter="search-form">
25
                 <form class="layui-form" action="" lay-filter="search-form">
26
-                    <div class="layui-form-item">
27
-                        <div class="layui-inline">
28
-                            <label class="layui-form-label" style="width: 30px">项目名称</label>
29
-                            <div class="layui-input-inline" style="width: 220px">
30
-                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
26
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px;">
27
+                        <div class="layui-inline" style="margin-right: 10px;">
28
+                            <label class="layui-form-label" style="width: 80px;">项目名称</label>
29
+                            <div class="layui-input-inline" style="width: 224px;">
30
+                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
31
                             </div>
31
                             </div>
32
                         </div>
32
                         </div>
33
-
34
-                        <div class="layui-inline">
35
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">出差地点</label>
36
-                            <div class="layui-input-inline" style="width: 150px">
37
-                                <input type="text" id="CCDD" name="CCDD" class="layui-input" autocomplete="off"/>
33
+                        <div class="layui-inline" style="margin-right: 10px;">
34
+                            <label class="layui-form-label" style="width: 80px;">erp编号</label>
35
+                            <div class="layui-input-inline" style="width: 140px;">
36
+                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
37
+                            </div>
38
+                        </div>
39
+                        <div class="layui-inline" style="margin-right: 10px;">
40
+                            <label class="layui-form-label" style="width: 80px;">费用申请号</label>
41
+                            <div class="layui-input-inline" style="width: 140px;">
42
+                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
43
+                            </div>
44
+                        </div>
45
+                        <div class="layui-inline" style="margin-right: 10px;">
46
+                            <label class="layui-form-label" style="width: 80px;">年度</label>
47
+                            <div class="layui-input-inline" style="width: 140px;">
48
+                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
38
                             </div>
49
                             </div>
39
                         </div>
50
                         </div>
51
+                    </div>
40
 
52
 
41
-                        <div class="layui-inline">
42
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">创建日期</label>
53
+                    <div class="layui-form-item" style="white-space: nowrap; margin-right: -20px; margin-top: 10px;">
54
+                        <div class="layui-inline" style="margin-right: 10px;">
55
+                            <label class="layui-form-label" style="width: 80px;">日期</label>
43
                             <div class="layui-input-inline" style="width: 100px;">
56
                             <div class="layui-input-inline" style="width: 100px;">
44
-                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input"
45
-                                       readonly>
57
+                                <input type="text" name="QSRQ" id="QSRQ" placeholder="开始日期" class="layui-input" readonly>
46
                             </div>
58
                             </div>
47
                             <div class="layui-form-mid">-</div>
59
                             <div class="layui-form-mid">-</div>
48
                             <div class="layui-input-inline" style="width: 100px;">
60
                             <div class="layui-input-inline" style="width: 100px;">
49
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input"
50
-                                       readonly>
61
+                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
51
                             </div>
62
                             </div>
52
                         </div>
63
                         </div>
53
-
54
-                        <!--                        <div class="layui-inline">-->
55
-                        <!--                            <label class="layui-form-label" style="width: 45px; margin-left: -10px">已审批</label>-->
56
-                        <!--                            <div class="layui-input-inline" style="width: 80px">-->
57
-                        <!--                                <select name="YSP" id="YSP" lay-filter="status">-->
58
-                        <!--                                    <option value="">全部</option>-->
59
-                        <!--                                    <option th:each="item:${approvedList}" th:text="${item.name}"-->
60
-                        <!--                                            th:value="${item.code}"></option>-->
61
-                        <!--                                </select>-->
62
-                        <!--                            </div>-->
63
-                        <!--                        </div>-->
64
-
65
                         <div class="layui-inline">
64
                         <div class="layui-inline">
66
-                            <button type="submit" id="btn_search" class="layui-btn" lay-submit
67
-                                    lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
65
+                            <label class="layui-form-label" style="width: 80px">出差地点</label>
66
+                            <div class="layui-input-inline" style="width: 140px">
67
+                                <input type="text" id="CCDD" name="CCDD" class="layui-input" autocomplete="off"/>
68
+                            </div>
69
+                        </div>
70
+                        <div class="layui-inline" style="margin-right: 10px; margin-left: 10px;">
71
+                            <button type="submit" id="btn_search" class="layui-btn" lay-submit lay-filter="data-search-btn">
72
+                                <i class="layui-icon"></i> 搜 索
68
                             </button>
73
                             </button>
69
-                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
70
-                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
74
+                        </div>
75
+                        <div class="layui-inline" style="margin-right: 10px;">
76
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit lay-filter="data-reset-btn">
77
+                                <i class="layui-icon layui-icon-refresh"></i> 重 置
71
                             </button>
78
                             </button>
72
                         </div>
79
                         </div>
73
                     </div>
80
                     </div>