|
|
@@ -14346,30 +14346,32 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.loading = false;
|
|
|
$scope.thisUser = data;
|
|
|
});
|
|
|
+
|
|
|
$scope.customerParams = new ngTableParams({
|
|
|
- page : 1,
|
|
|
+ page : 1,
|
|
|
count : 10
|
|
|
}, {
|
|
|
- total : 0,
|
|
|
+ total : 0,
|
|
|
counts: [],
|
|
|
getData : function($defer, params) {
|
|
|
$scope.loading = true;
|
|
|
var pageParams = params.url();
|
|
|
pageParams.keyword = $scope.keyword;
|
|
|
- VendorService.customer.get(BaseService.parseParams(pageParams), function(page){
|
|
|
+ VendorService.customer.get.call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
params.total(page.totalElement);
|
|
|
+ $scope.total = page.totalElement;
|
|
|
$defer.resolve(page.content);
|
|
|
}
|
|
|
- $scope.totalCount = page.totalElement;
|
|
|
+ $scope.totalCount = page.totalElements;
|
|
|
}, function(response){
|
|
|
$scope.loading = false;
|
|
|
toaster.pop('error', '数据加载失败', response.data);
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
// 搜索框回车
|
|
|
$scope.onSearch = function(keyword) {
|
|
|
$scope.customerParams.page(1);
|
hejq