|
@@ -322,8 +322,20 @@ define(['app/app'], function (app) {
|
|
|
// 默认本月
|
|
// 默认本月
|
|
|
$scope.sdateTo = new Date();
|
|
$scope.sdateTo = new Date();
|
|
|
$scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
|
|
$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.uuorname = '';
|
|
|
// $scope.condition.dateFrom = '';
|
|
// $scope.condition.dateFrom = '';
|
|
|
// $scope.condition.dateTo = '';
|
|
// $scope.condition.dateTo = '';
|