From 00fcdd8175def93010e2faf0e28cdf86414ab2d8 Mon Sep 17 00:00:00 2001 From: huangsj Date: Tue, 22 Jan 2019 11:16:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=95=8C=E9=9D=A2-=E5=85=A5=E5=BA=93=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E5=92=8C=E5=87=BA=E5=BA=93=E6=98=8E=E7=BB=86=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/reports/in_detail.html | 2 +- erp_web/pages/reports/out_detail.html | 2 +- src/main/java/com/jsh/erp/controller/DepotHeadController.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/erp_web/pages/reports/in_detail.html b/erp_web/pages/reports/in_detail.html index be21a76b..97e7d3a3 100644 --- a/erp_web/pages/reports/in_detail.html +++ b/erp_web/pages/reports/in_detail.html @@ -292,7 +292,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/erp_web/pages/reports/out_detail.html b/erp_web/pages/reports/out_detail.html index 4e46feab..0238eb2c 100644 --- a/erp_web/pages/reports/out_detail.html +++ b/erp_web/pages/reports/out_detail.html @@ -292,7 +292,7 @@ }), success: function (res) { if(res && res.code === 200 && res.data) { - $("#tableData").datagrid('loadData', res.data.rows); + $("#tableData").datagrid('loadData', res.data); } }, //此处添加错误处理 diff --git a/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 7a1cb3fb..f1be11e8 100644 --- a/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -209,7 +209,9 @@ public class DepotHeadController { Map map = new HashMap(); try { List resList = new ArrayList(); - List list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize); + Integer limitStart = (currentPage-1)*pageSize; + Integer limitEnd = pageSize; + List list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, limitStart, limitEnd); int total = depotHeadService.findByAllCount(beginTime, endTime, type, pid, dids, oId); map.put("total", total); //存放数据json数组