Merge remote-tracking branch 'origin/feature-201844-wangcz' into dev

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;
           }

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">
@@ -708,10 +708,10 @@
           </td>
         </tr>
         </tbody>
-        <tbody ng-show="active === 'all' && ALLList.length === 0">
+        <tbody ng-if="active === 'all' && ALLList.length === 0">
           <tr>
-            <td colspan="6">
-              <div id="empty">
+            <td colspan="4">
+              <div class="empty">
                 <div class="left_img">
                   <a><img src="static/img/all/empty-cart.png"></a>
                   <a>B2B 商务</a>
@@ -987,4 +987,23 @@
   .wui-date.small .wui-date-picker {
     width: 260px
   }
+  .empty {
+    padding: 70px 0;
+    margin: 0 auto;
+    text-align: center;
+    background: #fff;
+  }
+  .empty .left_img {
+    display: inline-block;
+    color: #3f84f6;
+  }
+  .empty .left_img a {
+    font-size: 25px;
+    color: #3f84f6;
+  }
+  .empty .right_link p {
+    margin: 0;
+    font-size: 14px;
+    color: #666;
+  }
 </style>