|
|
@@ -1158,7 +1158,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
if(page) {
|
|
|
|
|
|
$defer.resolve(page.content);
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
|
|
|
}
|
|
|
}, function(response){
|
|
|
@@ -1657,7 +1657,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -2018,7 +2018,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -2329,7 +2329,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
|
@@ -2611,7 +2611,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
|
@@ -3181,7 +3181,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -3321,7 +3321,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
|
@@ -3480,7 +3480,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -3552,7 +3552,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -3624,7 +3624,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -3696,7 +3696,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|
|
|
@@ -3768,7 +3768,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
- params.total(page.totalElements);
|
|
|
+ params.total(page.totalElement);
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
|
|
|
}
|