|
|
@@ -13590,8 +13590,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
getData : function($defer, params) {
|
|
|
$scope.loading = true;
|
|
|
var pageParams = params.url();
|
|
|
- pageParams.keyword = $rootScope.enterpriseKeyword;
|
|
|
- $scope.tip = $rootScope.enterpriseKeyword;
|
|
|
+ pageParams.keyword = $scope.keyword;
|
|
|
+ $scope.tip = $scope.keyword;
|
|
|
getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page) {
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
@@ -13608,7 +13608,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
|
|
|
// 搜索框回车
|
|
|
$scope.onSearch = function(keyword) {
|
|
|
- $rootScope.enterpriseKeyword = keyword;
|
|
|
+ $scope.keyword = keyword;
|
|
|
$scope.tableParams.page(1);
|
|
|
$scope.tableParams.reload();
|
|
|
};
|