主动报价客户增加筛选

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

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

@@ -1473,19 +1473,28 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
-				VendorService.customer.get(BaseService.parseParams(params.url()), function(page){
+				var pageParams = params.url();
+				pageParams.keyword = $scope.keyword;
+				VendorService.customer.get(BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
-						params.total(page.totalElements);
+						params.total(page.totalElement);
 						$defer.resolve(page.content);
 					}
-					$scope.totalCount = page.totalElements;
+					$scope.totalCount = page.totalElement;
 				}, function(response){
 					$scope.loading = false;
 					toaster.pop('error', '数据加载失败', response.data);
 				});
 			}
 		});
+		
+		// 搜索框回车
+  		$scope.onSearch = function(keyword) {
+  			$scope.customerParams.page(1);
+  			$scope.customerParams.reload();
+  			$scope.tip = keyword;
+  		};
 	}]);
 	app.controller('AddUserInfoCtrl', ['$scope', '$modalInstance', 'customer', 'AccountUser', 'toaster', function($scope, $modalInstance, customer, AccountUser, toaster){
 		$scope.checkboxes = {
@@ -3586,7 +3595,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
 				$scope.loading = true;
-				Customer.get(BaseService.parseParams(params.url()), function(page){
+				var pageParams = params.url();
+				pageParams.keyword = $scope.keyword;
+				Customer.get(BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
@@ -3600,6 +3611,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			}
 		});
 		
+		$scope.onSearch = function() {
+			$scope.tableParams.page(1);
+			$scope.tableParams.reload();
+		};
+		
   		$scope.cancel = function() {
     		$modalInstance.dismiss();
   		};
@@ -11129,7 +11145,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         };
     }]);
 
-
     //类目选择模态框(招标产品明细)
     app.controller('ProdKindChooseCtrl', ['$scope', 'KindAPI', 'actives', 'toaster', '$modalInstance', function($scope, KindAPI, actives, toaster, $modalInstance) {
         $scope.actives = actives;