Browse Source

根据筛选条件和分类导出Excel

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1075 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 years ago
parent
commit
1c36ec6299

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

@@ -642,6 +642,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					if(page) {
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
+						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
 					}
 				}, function(response){
 					$scope.loading = false;

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/order.html

@@ -216,7 +216,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/orders/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/orders/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
 		</tr>
 		<tr class="sep-row">