Bläddra i källkod

紧急处理应收应付对账,月历选择不对的问题

shenjunjie 7 år sedan
förälder
incheckning
f355b8fa5d
1 ändrade filer med 26 tillägg och 4 borttagningar
  1. 26 4
      src/main/webapp/resources/js/index/app.js

+ 26 - 4
src/main/webapp/resources/js/index/app.js

@@ -9894,8 +9894,20 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 默认本月
         $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 = '';
@@ -10824,8 +10836,18 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 默认本月
         $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.condition.uuorname = '';
         // $scope.condition.dateFrom = '';
         // $scope.condition.dateTo = '';