|
|
@@ -145,6 +145,7 @@ define(['app/app'], function(app) {
|
|
|
var param = BaseService.parseParams(params.url());
|
|
|
$scope.goodsFilter.startTime = $scope.startFormatDate;
|
|
|
$scope.goodsFilter.endTime = $scope.endFormatDate;
|
|
|
+ $scope.pageParams = param;
|
|
|
Goods.loadGoodsList(param, $scope.goodsFilter, function (data) {
|
|
|
$scope.totalCount = data.totalElements;
|
|
|
$scope.goodsList = data.content;
|
|
|
@@ -307,7 +308,8 @@ define(['app/app'], function(app) {
|
|
|
// 产品导出事件
|
|
|
$scope.exportClick = function () {
|
|
|
// 拼装链接
|
|
|
- var url = '/trade/goods/background/download?startTime=' + $scope.startDate.getTime() + "&endTime=" + $scope.endDate.getTime();
|
|
|
+ var url = '/trade/goods/background/download?startTime=' + $scope.startDate.getTime() + "&endTime=" + $scope.endDate.getTime()
|
|
|
+ + "&page=" + $scope.pageParams.page + "&count=" + $scope.pageParams.count + "&sorting=" + encodeURIComponent(angular.toJson($scope.pageParams.sorting));
|
|
|
if (angular.isDefined($scope.goodsFilter.kindUuid)) {
|
|
|
url = url + "&kindUuid=" + $scope.goodsFilter.kindUuid;
|
|
|
}
|
hejq