导出Excel分类，关键词

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1137 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -911,6 +911,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;
@@ -1017,6 +1018,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;
@@ -1494,6 +1496,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;
@@ -1565,6 +1568,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;
@@ -1699,6 +1703,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;
@@ -1770,6 +1775,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;
@@ -1841,6 +1847,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;
@@ -1911,6 +1918,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;
@@ -1981,6 +1989,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;
@@ -2051,6 +2060,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;
@@ -2121,6 +2131,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;
@@ -2192,6 +2203,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;

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -112,15 +112,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -206,7 +198,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/apBill/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/apBill/xls?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">

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -110,15 +110,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -204,7 +196,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td clas="text-center">
-				<a href="sale/MRB/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/MRB/xls?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">

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -109,15 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -203,7 +195,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/badIn/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/badIn/xls?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">

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -109,15 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-4">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>
-					</div>
-				</div>
-			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-10">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -203,7 +195,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/badOut/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/badOut/xls?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">

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -195,7 +195,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/accept/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/accept/xls?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">

src/main/webapp/resources/tpl/index/sale/change.html

@@ -211,7 +211,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/changes/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/changes/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">

src/main/webapp/resources/tpl/index/sale/forecast.html

@@ -195,7 +195,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/forecast/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/forecast/xls?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">

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -228,7 +228,7 @@
 					</div> <!-- 分页 -->
 				</td>
 				<td class="text-center">
-					<a href="sale/inquiry/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+					<a href="sale/inquiry/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">

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -195,7 +195,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/return/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/return/xls?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">

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -228,7 +228,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/sample/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/sample/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">

src/main/webapp/resources/tpl/index/sale/send.html

@@ -215,7 +215,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/notice/sends/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				<a href="sale/notice/sends/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">