【商务平台】 对账单增加过滤条件时，全选时也进行数据筛选

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

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

@@ -4137,6 +4137,9 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		$scope.sdateFrom = '';
 		$scope.sdateTo = '';
 		$scope.vuuorname = '';
+		$scope.factory = '';
+		$scope.prodTitle = '';
+		$scope.prodSpec = '';
 		$scope.condition.uuorname = '';
 		$scope.condition.dateFrom = '';
 		$scope.condition.dateTo = '';
@@ -4163,7 +4166,21 @@ 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.keywordXls = angular
+					.copy(($scope.condition.uuorname == null ? ""
+							: $scope.condition.uuorname)
+							+ "-"
+							+ ($scope.condition.venduuorname == null ? ""
+									: $scope.condition.venduuorname)
+							+ "-"
+							+ ($scope.condition.prodTitle == null ? ""
+									: $scope.condition.prodTitle)
+							+ "-"
+							+ ($scope.condition.prodSpec == null ? ""
+									: $scope.condition.prodSpec)
+							+ "-"
+							+ ($scope.condition.factory == null ? ""
+									: $scope.condition.factory));//保存当前取值的关键词
 			$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
 			$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
 		}
@@ -4179,11 +4196,14 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		// 点击勾选全部的复选框
 		$scope.checkAll = function(){
 			$scope.totalMoney = 0;
-			$scope.filteredData = $filter('filter')($scope.data, $scope.condition.uuorname, $scope.condition.venduuorname);
+			$scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodTitle || $scope.condition.uuorname || $scope.condition.venduuorname ||  $scope.condition.prodSpec || $scope.condition.factory);
 			var uuorname = $scope.suuorname;			
 			var venduuorname = $scope.venduuorname;
 			var dateFrom = $scope.condition.dateFrom;
 			var dateTo = $scope.condition.dateTo;
+			var prodTitle = $scope.condition.prodTitle;
+			var prodSpec = $scope.condition.prodSpec;
+			var factory = $scope.condition.factory;
 			angular.forEach($scope.filteredData, function(item) {
 				if((item.piDate >= dateFrom  || dateFrom == '') && (item.piDate < dateTo  || dateTo == '')){
 					item.$selected = $scope.checkboxes.checked;
@@ -4535,7 +4555,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		$scope.loading = true;
 		AccountUser.findDistribute({},function(data) {
 			$scope.distributes = data;
-			console.log($scope.distributes);
 		},function(response) {
 			toaster.pop('error', '系统错误', response.data);
 		})