diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index a2bec2302cbd2b22f0b7f5960841f1d0591167a9..9abcc3a3448feeb238d9833b1f5a8029418f9daf 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -1087,12 +1087,12 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService //初始化多选框 // scope.Tools.initCheckBox(); if(!first){ //判断不是第一次加载 - // var param = scope.listParam(); + var param = {}; param.pageNo = obj.curr; //当前页 param.pageSize = obj.limit; //最大页 scope.pageSize = obj.limit; //设置最大页 scope.pageNo = obj.curr; //设置当前页 - scope.list(); + scope.list(param); } }) }else{ diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index fe90bddfae66edf51c945bd6ecaa9f3ffd9729a2..2e6df10d380bdb367df8f96cd3d2b0c2da6f8955 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-26*/ +/**Created on 2017-12-28*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://wms.unlcn.com/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"plc_SUnCe)F*`WI"}}; \ No newline at end of file