Browse Source

客户导出应收对账单问题的处理

hejq 7 years ago
parent
commit
407767b45a

BIN
src/main/resources/jxls-tpl/fa/faApCheck.xls


+ 1 - 1
src/main/webapp/resources/js/index/app.js

@@ -10576,6 +10576,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     + "|" + ($scope.condition.factory == null ? "" : $scope.condition.factory)
                     + "|" + ($scope.condition.prodtitle == null ? "" : $scope.condition.prodtitle)
                     + "|" + ($scope.condition.prodspec == null ? "" : $scope.condition.prodspec));//保存当前取值的关键词
+                $scope.exportKeywordXls = encodeURIComponent($scope.keywordXls);
                 $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
                 $scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
                 if (!$scope.suuorname) {
@@ -10832,7 +10833,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if ($scope.sameCust && $scope.validQty) {
                 $scope.saveApCheck();
             }
-
         }
     }]);
 

+ 3 - 10
src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -140,16 +140,9 @@
 						class="fa fa-fw"
 						ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 					<div class="btn-group btn-group-sm">
-						<a class="btn btn-default" ng-click="searchOrder()"><i
-							class="fa fa-search fa-fw btn-icon-left"></i>筛选</a> <a
-							class="btn btn-default" ng-click="createApCheck(check.$selected)"
-							ng-disabled="!data || data.length==0"><i
-							class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a> <a
-							class="btn btn-default"
-							href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
-							target="_self" title="导出Excel"
-							ng-disabled="!data || data.length==0"><i
-							class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
+						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
+						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a>
+						<a class="btn btn-default" href="sale/apCheck/xls?keyword={{exportKeywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
 					</div>
 				</div>
 			</div>