1、应收对账，修复new date字段NAN的问题

2、应收对账，修复new date字段NAN的问题

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -210,6 +210,8 @@
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户
           $rootScope.active = 'buyer_pay_center';
+          BaseService.scrollBackToTop();
+          // 获取当前用户是否为普通用户
           CurrentRole.isUser({}, {}, function (data) {
               $scope.isUser = data.isUser;
           });
@@ -217,9 +219,12 @@
           $scope.condition = {dateZone: 1};
           $scope.currency = Symbol.currency;//将币别转化为对应的符号
           $scope.active = 'all';
-
-
-
+          $scope.apCheckCondition = {
+              $open: false
+          }
+          var getService = function () {
+              return FaArCheck;
+          };
           /* 时间筛选初始化*/
           var fromDate = new Date();
           var toDate = new Date();
@@ -265,9 +270,7 @@
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           };
-          var getService = function () {
-              return FaArCheck;
-          };
+
           //获取应收对账单全部
           $scope.tableParams = new ngTableParams({
               page: 1,
@@ -281,25 +284,28 @@
               getData: function ($defer, params) {
                   $scope.loading = true;
                   var pageParams = params.url();
-
                   pageParams.searchFilter = { // 筛选条件
-                      keyword: $scope.keyword,
                       fromDate: getDateTime($scope.condition.dateFrom),
-                      endDate: getDateTime($scope.condition.dateTo)
+                      endDate: getDateTime($scope.condition.dateTo),
+                      keyword: $scope.keyword
                   };
+                  pageParams.keyword = $scope.keyword;
                   if ($scope.active === 'all') {
                       pageParams.keyword = $scope.keyword
-                      var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
-                      var _d = new Date(_fromDate)
+                      var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
+                      _fromDate = _fromDate.replace(/-/g,'/')
+                      var _d  = new Date(_fromDate)
                       _d.setDate(1)
                       _d.setMonth(_d.getMonth() + 1)
                       _d.setDate(_d.getDate() - 1)
                       var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                      _endDate = _endDate.replace(/-/g, '/')
                       _endDate = new Date(_endDate).getTime()
+                      // _fromDate = _fromDate.replace(/-/g, '/')
                       _fromDate = new Date(_fromDate).getTime()
+
                       pageParams.searchFilter.fromDate =  _fromDate
                       pageParams.searchFilter.endDate = _endDate
-
                       FaApCheck.vendor(BaseService.parseParams(pageParams), function (page) {
                           $scope.loading = false;
                           page.content && page.content.forEach(function(list) {
@@ -323,8 +329,6 @@
                               $defer.resolve(page.content);
                           }
                           $scope.ALLList = page.content
-                          $scope.infoCommon = page
-                          $scope.infoCommon.all = page.content.length
                           $scope.totalCount = page.totalElement;
                       }, function (response) {
                           $scope.loading = false;
@@ -336,8 +340,7 @@
                           if (page) {
                               params.total(page.totalElement);
                               $scope.data = $defer.resolve(page.content);
-                              $scope.infoCommon = page
-                              $scope.infoCommon.all = page.content.length
+
                               $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                           }
                       }, function (response) {
@@ -412,7 +415,8 @@
           };
 
           // 搜索框回车
-          $scope.onSearch = function () {
+          $scope.onSearch = function (keyword) {
+              $scope.keyword = keyword;
               $scope.tableParams.page(1);
               $scope.tableParams.reload();
           };
@@ -488,8 +492,6 @@
           $scope.goToMNs = function(item) {
               $scope.chooseItem = item;
               $scope.showNotCheck = true
-              // $scope.suuorname = item.myEnterprise.enName
-              // $scope.customerUU = item.myEnterprise.uu
               $scope.vendorUU = item.vendorEnterprise.uu
               this.searchOrder()
           }
@@ -530,8 +532,8 @@
               $scope.condition.venduuorname = $scope.vuuorname;
               if ($scope.condition.dateTo != null || $scope.keywordXls != null) {
 
-                  $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
-                  $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+                  // $scope.fromDate = $scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null;
+                  // $scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
                   $scope.searchKeyWord = {
                       receiveName: $scope.receiveName,
                       factory: $scope.factory,
@@ -541,12 +543,8 @@
                       vendorUU: $scope.vendorUU
                   }
                   $scope.exportKeywords = encodeURIComponent($scope.searchKeyWord);
-                  // $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
-                  // $scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
-                  // if (!$scope.suuorname) {
-                  //     toaster.pop('warning', '提示', '请先选择客户');
-                  //     document.getElementById('suuorname').focus();//光标默认在客户
-                  // } else {
+                  $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+                  $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
                   $scope.loading = true;
                   var _params = {}
                   if ($scope.apCheckCondition.$open) {
@@ -559,8 +557,7 @@
                           prodSpec: $scope.prodSpec,
                           taxRate: $scope.taxRate,
                           checkDate: $scope.thisMouth,
-                          // suuorname: $scope.suuorname,
-                          vendorUU: $scope.vendorUU,
+                          vendorUU: $scope.vendorUU
                       }
                   } else {
                       _params = {
@@ -570,11 +567,11 @@
                           prodSpec: $scope.prodSpec,
                           taxRate: $scope.taxRate,
                           checkDate: $scope.thisMouth,
-                          // suuorname: $scope.suuorname,
-                          vendorUU: $scope.vendorUU,
+                          vendorUU: $scope.vendorUU
                       }
                   }
                   FaApCheck.getAllArCheckByKeywords(_params, function (data) {
+                      $scope.checkMain = data;
                       if (data.details.length > 0) {
                           angular.forEach(data.details, function (item) {
                               item.$selected = true;
@@ -596,6 +593,7 @@
                           $scope.dataInfo = data
                           $scope.data = data.details;
                           $scope.checkboxes.checked = true;
+                          // $scope.suuorname = data.vendorName
                           $scope.getTotalMoney();
                       } else {
                           toaster.pop('info', '提示', '当前没有需要对账记录');
@@ -640,7 +638,7 @@
               if (angular.isDefined($scope.taxRate)) {
                   url = url + '&taxRate=' + $scope.taxRate;
               }
-              window.location.href = url;
+              window.open(url);
           }
 
           /**
@@ -657,7 +655,6 @@
               $scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodtitle || $scope.condition.uuorname || $scope.condition.venduuorname || $scope.condition.prodspec || $scope.condition.factory);
               // var dateFrom = $scope.condition.dateFrom;
               // var dateTo = $scope.condition.dateTo;
-
               angular.forEach($scope.filteredData, function (item) {
                   // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
                   item.$selected = $scope.checkboxes.checked;
@@ -683,7 +680,6 @@
           // 点击其中一个明细的复选框
           $scope.checkOne = function (check) {
               check.$selected = !check.$selected
-
               $scope.Checkall()
           };
           $scope.stopPrevent = function(e) {
@@ -703,6 +699,7 @@
               });
               $scope.checkboxes.checked = result;
           }
+
           $scope.haveSelected = false;
 
           //生成应收对账单
@@ -872,7 +869,7 @@
                       FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
                           $scope.loading = false;
                           toaster.pop('success', '成功', '生成应收对账成功');
-                          $state.go('fa_apCheck_detail', {id: data.id}, {reload: true});
+                          $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
                       }, function (response) {
                           $scope.loading = false;
                           toaster.pop('error', '生成对账单失败', response.data);
@@ -884,14 +881,12 @@
               if ($scope.sameCust && $scope.validQty) {
                   $scope.saveApCheck();
               }
-          }
 
+
+          }
           // 新增
           $scope.MouthOutShow = true
           $scope.MouthinShow = true
-          $scope.apCheckCondition = {
-              $open: false
-          }
           $scope.apCheckopenFilterDatePicker = function ($event, item, openParam) {
               $event.preventDefault();
               $event.stopPropagation();
@@ -902,7 +897,10 @@
           };
           $scope.addMouth = function(val) {
               var _sp = new Date()
-              var _time = new Date($scope.thisMouth)
+              var _time1 = $scope.thisMouth + '-01'
+              _time1 = _time1.replace(/-/g, '/')
+              var _time  = new Date(_time1)
+
               _time.setMonth(_time.getMonth() + val)
               _time.setDate(1)
               _time.setMonth(_time.getMonth() + 1)
@@ -914,12 +912,16 @@
               }
               $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
               $scope.apCheckCondition.$open = false
-              $scope.searchOrder()
+              // $scope.searchOrder()
           }
 
           $scope.addMouthOut = function(val) {
               var _sp = new Date()
-              var _time = new Date($scope.thisMouthOut)
+              // var _time = new Date($scope.thisMouthOut)
+              var _time1 = $scope.thisMouthOut + '-01'
+              _time1 = _time1.replace(/-/g, '/')
+              var _time  = new Date(_time1)
+              // var _time  = new Date($scope.thisMouthOut.replace(/-/g,'/'))
               _time.setMonth(_time.getMonth() + val)
               _time.setDate(1)
               _time.setMonth(_time.getMonth() + 1)
@@ -930,8 +932,8 @@
                   $scope.MouthOutShow = true
               }
               $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
-              $scope.tableParams.page(1);
-              $scope.tableParams.reload();
+              // $scope.tableParams.page(1);
+              // $scope.tableParams.reload();
           }
 
           $scope.hideshowNotCheck = function() {
@@ -940,7 +942,9 @@
 
           $scope.$watch('thisMouthOut', function(newVal, oldVal) {
               var _fromDate = new Date()
+
               var _d = new Date(_fromDate)
+              // var _d  = new Date(_fromDate.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -952,7 +956,9 @@
                   return
               }
               if (newVal !== oldVal) {
-                  var _d = new Date(newVal)
+                  // var _d = new Date(newVal)
+                  var _newVal = newVal.replace(/-/g,'/')
+                  var _d  = new Date(_newVal)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)
@@ -969,6 +975,7 @@
           $scope.$watch('thisMouth', function(newVal, oldVal) {
               var _fromDate = new Date()
               var _d = new Date(_fromDate)
+              // var _d  = new Date(_fromDate.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -980,7 +987,9 @@
                   return
               }
               if (newVal !== oldVal) {
-                  var _d = new Date(newVal)
+                  // var _d = new Date(newVal)
+                  var _newVal = newVal.replace(/-/g,'/')
+                  var _d  = new Date(_newVal)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)

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

@@ -4,7 +4,6 @@ define(['app/app'], function (app) {
   app.register.controller('PurchaseApCheckCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'B2bReportService', 'Symbol', 'B2bCurrentRole',  'B2bDecimalNumber', '$filter', '$state',function ($rootScope, $scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
       BaseService.scrollBackToTop();
       // 获取当前用户是否为普通用户
-      $rootScope.active = 'vendor_pay_center';
       CurrentRole.isUser({}, {}, function (data) {
           $scope.isUser = data.isUser;
       });
@@ -12,9 +11,9 @@ define(['app/app'], function (app) {
       $scope.condition = {dateZone: 1};
       $scope.currency = Symbol.currency;//将币别转化为对应的符号
       $scope.active = 'all';
-
-
-
+      $scope.apCheckCondition = {
+          $open: false
+      }
       /* 时间筛选初始化*/
       var fromDate = new Date();
       var toDate = new Date();
@@ -74,25 +73,28 @@ define(['app/app'], function (app) {
           getData: function ($defer, params) {
               $scope.loading = true;
               var pageParams = params.url();
-
               pageParams.searchFilter = { // 筛选条件
-                  keyword: $scope.keyword,
                   fromDate: getDateTime($scope.condition.dateFrom),
-                  endDate: getDateTime($scope.condition.dateTo)
+                  endDate: getDateTime($scope.condition.dateTo),
+                  keyword: $scope.keyword
               };
+              pageParams.keyword = $scope.keyword;
               if ($scope.active === 'all') {
                   pageParams.keyword = $scope.keyword
                   var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
-                  var _d = new Date(_fromDate)
+                  // var _d = new Date(_fromDate)
+                  _fromDate = _fromDate.replace(/-/g,'/')
+                  var _d  = new Date(_fromDate)
                   _d.setDate(1)
                   _d.setMonth(_d.getMonth() + 1)
                   _d.setDate(_d.getDate() - 1)
                   var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                  _endDate = _endDate.replace(/-/g,'/')
+                  _fromDate = _fromDate.replace(/-/g,'/')
                   _endDate = new Date(_endDate).getTime()
                   _fromDate = new Date(_fromDate).getTime()
                   pageParams.searchFilter.fromDate =  _fromDate
                   pageParams.searchFilter.endDate = _endDate
-
                   FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                       $scope.loading = false;
                       page.content && page.content.forEach(function(list) {
@@ -116,8 +118,6 @@ define(['app/app'], function (app) {
                           $defer.resolve(page.content);
                       }
                       $scope.ALLList = page.content
-                      $scope.infoCommon = page
-                      $scope.infoCommon.all = page.content && page.content.length
                       $scope.totalCount = page.totalElement;
                   }, function (response) {
                       $scope.loading = false;
@@ -129,8 +129,7 @@ define(['app/app'], function (app) {
                       if (page) {
                           params.total(page.totalElement);
                           $scope.data = $defer.resolve(page.content);
-                          $scope.infoCommon = page
-                          $scope.infoCommon.all = page.content && page.content.length
+
                           $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                       }
                   }, function (response) {
@@ -205,7 +204,8 @@ define(['app/app'], function (app) {
       };
 
       // 搜索框回车
-      $scope.onSearch = function () {
+      $scope.onSearch = function (keyword) {
+          $scope.keyword = keyword;
           $scope.tableParams.page(1);
           $scope.tableParams.reload();
       };
@@ -322,15 +322,16 @@ define(['app/app'], function (app) {
           $scope.condition.venduuorname = $scope.vuuorname;
           if ($scope.condition.dateTo != null || $scope.keywordXls != null) {
 
-              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
-              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+              // $scope.fromDate = $scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null;
+              // $scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
               $scope.searchKeyWord = {
                   receiveName: $scope.receiveName,
                   factory: $scope.factory,
                   prodTitle: $scope.prodTitle,
                   prodSpec: $scope.prodSpec,
                   taxRate: $scope.taxRate,
-                  suuorname: $scope.suuorname
+                  suuorname: $scope.suuorname,
+                  customerUU: $scope.customerUU
               }
               $scope.exportKeywords = encodeURIComponent($scope.searchKeyWord);
               // $scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
@@ -339,6 +340,8 @@ define(['app/app'], function (app) {
               //     toaster.pop('warning', '提示', '请先选择客户');
               //     document.getElementById('suuorname').focus();//光标默认在客户
               // } else {
+              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
               $scope.loading = true;
               var _params = {}
               if ($scope.apCheckCondition.$open) {
@@ -367,6 +370,7 @@ define(['app/app'], function (app) {
                   }
               }
               FaApCheck.getAllByKeywords(_params, function (data) {
+                  $scope.checkMain = data;
                   if (data.details.length > 0) {
                       angular.forEach(data.details, function (item) {
                           item.$selected = true;
@@ -445,7 +449,6 @@ define(['app/app'], function (app) {
           $scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodtitle || $scope.condition.uuorname || $scope.condition.venduuorname || $scope.condition.prodspec || $scope.condition.factory);
           // var dateFrom = $scope.condition.dateFrom;
           // var dateTo = $scope.condition.dateTo;
-
           angular.forEach($scope.filteredData, function (item) {
               // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
               item.$selected = $scope.checkboxes.checked;
@@ -471,7 +474,6 @@ define(['app/app'], function (app) {
       // 点击其中一个明细的复选框
       $scope.checkOne = function (check) {
           check.$selected = !check.$selected
-
           $scope.Checkall()
       };
       $scope.stopPrevent = function(e) {
@@ -491,6 +493,7 @@ define(['app/app'], function (app) {
           });
           $scope.checkboxes.checked = result;
       }
+
       $scope.haveSelected = false;
 
       //生成应收对账单
@@ -660,7 +663,7 @@ define(['app/app'], function (app) {
                   FaApCheck.saveApCheck({}, $scope.apCheck, function (data) {
                       $scope.loading = false;
                       toaster.pop('success', '成功', '生成应收对账成功');
-                      $state.go('fa_apCheck_detail', {id: data.id}, {reload: true});
+                      $state.go('fa.apCheck_detail', {id: data.id}, {reload: true});
                   }, function (response) {
                       $scope.loading = false;
                       toaster.pop('error', '生成对账单失败', response.data);
@@ -672,14 +675,12 @@ define(['app/app'], function (app) {
           if ($scope.sameCust && $scope.validQty) {
               $scope.saveApCheck();
           }
-      }
 
+
+      }
       // 新增
       $scope.MouthOutShow = true
       $scope.MouthinShow = true
-      $scope.apCheckCondition = {
-          $open: false
-      }
       $scope.apCheckopenFilterDatePicker = function ($event, item, openParam) {
           $event.preventDefault();
           $event.stopPropagation();
@@ -690,7 +691,10 @@ define(['app/app'], function (app) {
       };
       $scope.addMouth = function(val) {
           var _sp = new Date()
-          var _time = new Date($scope.thisMouth)
+          // var _time = new Date($scope.thisMouth)
+          var _time = $scope.thisMouth + '-01'
+          _time = _time.replace(/-/g,'/')
+          _time  = new Date(_time)
           _time.setMonth(_time.getMonth() + val)
           _time.setDate(1)
           _time.setMonth(_time.getMonth() + 1)
@@ -702,12 +706,16 @@ define(['app/app'], function (app) {
           }
           $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
           $scope.apCheckCondition.$open = false
-          $scope.searchOrder()
+          // $scope.searchOrder()
       }
 
       $scope.addMouthOut = function(val) {
           var _sp = new Date()
-          var _time = new Date($scope.thisMouthOut)
+          var _time = $scope.thisMouthOut + '-01'
+          _time = _time.replace(/-/g,'/')
+          _time  = new Date(_time)
+          // var _time = new Date($scope.thisMouthOut)
+          // var _time  = new Date($scope.thisMouthOut.replace(/-/g,'/'))
           _time.setMonth(_time.getMonth() + val)
           _time.setDate(1)
           _time.setMonth(_time.getMonth() + 1)
@@ -718,8 +726,8 @@ define(['app/app'], function (app) {
               $scope.MouthOutShow = true
           }
           $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
-          $scope.tableParams.page(1);
-          $scope.tableParams.reload();
+          // $scope.tableParams.page(1);
+          // $scope.tableParams.reload();
       }
 
       $scope.hideshowNotCheck = function() {
@@ -729,6 +737,7 @@ define(['app/app'], function (app) {
       $scope.$watch('thisMouthOut', function(newVal, oldVal) {
           var _fromDate = new Date()
           var _d = new Date(_fromDate)
+          // var _d  = new Date(_fromDate.replace(/-/g,'/'))
           _d.setDate(1)
           _d.setMonth(_d.getMonth() + 1)
           _d.setDate(_d.getDate() - 1)
@@ -740,7 +749,11 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
-              var _d = new Date(newVal)
+              // var _d = new Date(newVal)
+              var _d = newVal + '-01'
+              _d = _d.replace(/-/g,'/')
+              _d  = new Date(_d)
+              // var _d  = new Date(newVal.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -757,6 +770,7 @@ define(['app/app'], function (app) {
       $scope.$watch('thisMouth', function(newVal, oldVal) {
           var _fromDate = new Date()
           var _d = new Date(_fromDate)
+          // var _d  = new Date(_fromDate.replace(/-/g,'/'))
           _d.setDate(1)
           _d.setMonth(_d.getMonth() + 1)
           _d.setDate(_d.getDate() - 1)
@@ -768,7 +782,11 @@ define(['app/app'], function (app) {
               return
           }
           if (newVal !== oldVal) {
-              var _d = new Date(newVal)
+              // var _d = new Date(newVal)
+              var _d = newVal + '-01'
+              _d = _d.replace(/-/g,'/')
+              _d  = new Date(_d)
+              // var _d  = new Date(newVal.replace(/-/g,'/'))
               _d.setDate(1)
               _d.setMonth(_d.getMonth() + 1)
               _d.setDate(_d.getDate() - 1)
@@ -783,7 +801,6 @@ define(['app/app'], function (app) {
       })
 
 
-
       /**
      * 将日期转化为整数日期
      */