瀏覽代碼

hotfix: 紧急修复应收应付月历选择不正确的问题

shenjunjie 7 年之前
父節點
當前提交
77a71c8b6f

+ 14 - 2
src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -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 = '';

+ 14 - 2
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -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 = '';