purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复报表查询界面-入库明细和出库明细界面分页查询问题

Browse Source
This commit is contained in:
huangsj
2019-01-22 11:16:38 +08:00
parent fd76355f3a
commit 00fcdd8175
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erp_web/pages/reports/in_detail.html
View File

@@ -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);
}
},
//此处添加错误处理

2
erp_web/pages/reports/out_detail.html
View File

@@ -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);
}
},
//此处添加错误处理

4
src/main/java/com/jsh/erp/controller/DepotHeadController.java
View File

@@ -209,7 +209,9 @@ public class DepotHeadController {
Map<String, Object> map = new HashMap<String, Object>();
try {
List<DepotHeadVo4InDetail> resList = new ArrayList<DepotHeadVo4InDetail>();
List<DepotHeadVo4InDetail> list = depotHeadService.findByAll(beginTime, endTime, type, pid, dids, oId, currentPage, pageSize);
Integer limitStart = (currentPage-1)*pageSize;
Integer limitEnd = pageSize;
List<DepotHeadVo4InDetail> 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数组