Merge branch 'dev' into feature-201847-wangcz

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -358,9 +358,9 @@
                               $defer.resolve(page.content);
                           }
                           $scope.infoCommon = page
-                          $scope.infoCommon.all = page.content.length
+                          $scope.infoCommon.all = page.content && page.content.length || 0
                           $scope.ALLList = page.content || []
-                          $scope.totalCount = page.totalElement;
+                          $scope.totalCount = page.totalElement || 0;
                       }, function (response) {
                           $scope.loading = false;
                           toaster.pop('error', '数据加载失败', response.data);
@@ -534,8 +534,20 @@
           // 默认本月
           $scope.sdateTo = new Date();
           $scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
-          $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
-          $scope.thisMouthOut = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
+          if ($scope.sdateTo.getMonth() === 0) {
+              var _time  = new Date($scope.sdateTo)
+              _time.setMonth(_time.getMonth())
+              _time.setDate(1)
+              // _time.setMonth(_time.getMonth())
+              _time.setDate(_time.getDate() - 1)
+              $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+              $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+          } else {
+              $scope.thisMouth = $scope.sdateTo.getFullYear() + '-' + ($scope.sdateTo.getMonth())
+              $scope.thisMouthOut = $scope.sdateTo.getFullYear() + '-' + ($scope.sdateTo.getMonth())
+          }
+          // $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
+          // $scope.thisMouthOut = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
           $scope.condition.uuorname = '';
           // $scope.condition.dateFrom = '';
           // $scope.condition.dateTo = '';

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -146,9 +146,9 @@ define(['app/app'], function (app) {
                           $defer.resolve(page.content);
                       }
                       $scope.infoCommon = page
-                      $scope.infoCommon.all = page.content.length
-                      $scope.ALLList = page.content
-                      $scope.totalCount = page.totalElement;
+                      $scope.infoCommon.all = page.content && page.content.length || 0
+                      $scope.ALLList = page.content || []
+                      $scope.totalCount = page.totalElement || 0;
                   }, function (response) {
                       $scope.loading = false;
                       toaster.pop('error', '数据加载失败', response.data);
@@ -322,8 +322,20 @@ define(['app/app'], function (app) {
       // 默认本月
       $scope.sdateTo = new Date();
       $scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
-      $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
-      $scope.thisMouthOut = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
+      if ($scope.sdateTo.getMonth() === 0) {
+          var _time  = new Date($scope.sdateTo)
+          _time.setMonth(_time.getMonth())
+          _time.setDate(1)
+          // _time.setMonth(_time.getMonth())
+          _time.setDate(_time.getDate() - 1)
+          $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+          $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+      } else {
+          $scope.thisMouth = $scope.sdateTo.getFullYear() + '-' + ($scope.sdateTo.getMonth())
+          $scope.thisMouthOut = $scope.sdateTo.getFullYear() + '-' + ($scope.sdateTo.getMonth())
+      }
+      // $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
+      // $scope.thisMouthOut = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
       $scope.condition.uuorname = '';
       // $scope.condition.dateFrom = '';
       // $scope.condition.dateTo = '';