Browse Source

Merge branch 'hotfix-1224'

shenjunjie 7 years ago
parent
commit
928abb52e5
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/main/webapp/resources/js/index/app.js

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

@@ -11157,8 +11157,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
             });
             if ($scope.apCheckCondition.$open) {
-                $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
-                $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+                $scope.apCheck.beginDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+                $scope.apCheck.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
             } else {
                 var _isShowApcheckList = $scope.thisMouth + '-01'
                 var _time1 = _isShowApcheckList
@@ -11171,9 +11171,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 // 获取筛选时间的开始时间为对账的开始时间
                 var _time2 = _isShowApcheckList
                 _time2 = _time2.replace(/-/g, '/')
-                $scope.fromDate = new Date(_time2).getTime()
+                $scope.apCheck.beginDate = new Date(_time2).getTime()
                 // 获取筛选的截止时间为对账的截止时间
-                $scope.endDate = _d.getTime()
+                $scope.apCheck.endDate = _d.getTime()
             }
 
             //获取筛选时间的开始时间为对账的开始时间