Browse Source

处理对账页面搜索无效的问题

hejq 7 years ago
parent
commit
31a494f7a4

+ 3 - 2
src/main/webapp/resources/js/index/app.js

@@ -9575,10 +9575,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.loading = true;
                 var pageParams = params.url();
                 pageParams.searchFilter = { // 筛选条件
-                    keyword: $scope.keyword,
                     fromDate: getDateTime($scope.condition.dateFrom),
                     endDate: getDateTime($scope.condition.dateTo)
                 };
+                pageParams.keyword = $scope.keyword;
                 if ($scope.active === 'all') {
                     FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
@@ -9673,7 +9673,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         // 搜索框回车
-        $scope.onSearch = function () {
+        $scope.onSearch = function (keyword) {
+            $scope.keyword = keyword;
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };

+ 2 - 2
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -215,8 +215,8 @@
 							<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick"
 								 on-toggle="searchAdvance=open">
 								<input type="search" class="form-control input-sm" ng-model="keyword"
-									   ng-search="onSearch()" placeholder="输入单据编号、客户名称、物料名称搜索" style="width: 100%"/>
-								<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+									   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索" style="width: 100%"/>
+								<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
 							</div>
 						</div>
 					</div>