Merge branch 'hotfix-1224' into dev

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

@@ -694,8 +694,8 @@ define(['app/app'], function (app) {
               }
           });
           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
@@ -708,9 +708,9 @@ define(['app/app'], function (app) {
               // 获取筛选时间的开始时间为对账的开始时间
               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()
           }
           //保存生成的应收对账单
           $scope.saveApCheck = function () {