Browse Source

修改应收对账导出问题

shenjunjie 7 years ago
parent
commit
d5b74d4709

+ 7 - 1
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -333,7 +333,13 @@ define(['app/app'], function (app) {
       }
 
       $scope.exportApcheckList = function() {
-          var url = 'sale/apCheck/xls?fromDate=' + $scope.fromDate + '&endDate=' + $scope.endDate;
+          var url = 'sale/apCheck/xls?1=1';
+          if (angular.isDefined($scope.fromDate) && angular.isDefined($scope.endDate)) {
+              url = url + '&fromDate=' + $scope.fromDate + '&endDate=' + $scope.endDate;
+          }
+          if (angular.isDefined($scope.thisMouth)) {
+              url = url + '&checkDate=' + $scope.thisMouth;
+          }
           if (angular.isDefined($scope.receiveName)) {
               url = url + '&receiveName=' + $scope.receiveName;
           }

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -691,7 +691,7 @@
           </tr>
         </tbody>
 
-        <tbody ng-if="tableParams.total() == 0">
+        <tbody ng-if="active !== 'all' && tableParams.total() == 0">
         <tr>
           <td colspan="6">
             <div id="empty">