Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/overheadline/entity/Settlement.java

@@ -11,6 +11,8 @@ public class Settlement {
     private String theAmount;//比对金额:json
     private String reason;//原因
     private String del_Flag;
+    private Double totalFee;
+    private Double difference;
 
     public String getId() {
         return id;
@@ -75,4 +77,20 @@ public class Settlement {
     public void setDel_Flag(String del_Flag) {
         this.del_Flag = del_Flag;
     }
+
+    public Double getTotalFee() {
+        return totalFee;
+    }
+
+    public void setTotalFee(Double totalFee) {
+        this.totalFee = totalFee;
+    }
+
+    public Double getDifference() {
+        return difference;
+    }
+
+    public void setDifference(Double difference) {
+        this.difference = difference;
+    }
 }

src/main/webapp/webpage/modules/sg/project/management.jsp

@@ -132,9 +132,7 @@
                             <%--<button type="button" class="layui-btn layui-btn-primary layui-btn-sm"><i class="layui-icon"></i></button>--%>
                         </div>
                         <table id="table1" class="layui-table" lay-filter="table1"></table>
-                        <table:page page="${page}"></table:page>
-                        <div style="clear: both;"></div>
-                    </div>
+                        <div id="page"><div>
                 </div>
             </div>
         </div>
@@ -149,4 +147,24 @@
         $("#fromSumbit").submit();
     }
 </script>
+<script>
+    layui.use(['laypage', 'layer'], function(){
+        var laypage = layui.laypage
+            ,layer = layui.layer;
+        //自定义排版
+        laypage.render({
+            elem: 'page'
+            ,count: ${page.count}
+            ,layout: ['limit', 'prev', 'page', 'next']
+            ,jump: function(obj, first){
+                //首次不执行
+                if(!first){
+                    $("#pageNo").val(obj.curr);
+                    $("#pageSize").val(obj.limit);
+                    $("#fromSumbit").submit();
+                }
+            }
+        });
+    });
+</script>
 </html>