Ver Fonte

【前台】+【对账单导出excel可以用搜索条件】

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@3291 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof há 10 anos atrás
pai
commit
26dedab25a

+ 3 - 0
src/main/webapp/resources/js/index/app.js

@@ -3941,6 +3941,9 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				$scope.condition.dateTo = ($scope.sdateTo || 0);
 			}
 			$scope.condition.venduuorname = $scope.vuuorname;
+			$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" :  $scope.condition.uuorname) + "-" + ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname));//保存当前取值的关键词
+			$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
+			$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
 		}
 		
 		/**

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -117,7 +117,7 @@
 					</div>
 					<div class="col-xs-2" style="margin-top:4px">
 						<div class="pull-right">
-							<a href="sale/apCheck/xls" target="_self" title="导出Excel表格">
+							<a href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" title="导出Excel表格">
 							<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 						</div>
 					</div>