Эх сурвалжийг харах

fix:1、修复生成对账单时,beginDate和endDate为空为空
2、生成对账单,新增单据时间

shenjunjie 7 жил өмнө
parent
commit
c1d7959776

+ 23 - 4
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -591,7 +591,8 @@ define(['app/app'], function (app) {
                   taxrate: '',
                   sendcode: '',
                   whname: '',
-                  custUserUU: ''
+                  custUserUU: '',
+                  sourceDate: ''
               };
 
               //应收对账单明细行来源表信息
@@ -657,10 +658,10 @@ define(['app/app'], function (app) {
                   }
 
                   //获取筛选时间的开始时间为对账的开始时间
-                  $scope.apCheck.beginDate = $scope.fromDate;
+                  // $scope.apCheck.beginDate = $scope.fromDate;
 
                   //获取筛选的截止时间为对账的截止时间
-                  $scope.apCheck.endDate = $scope.endDate;
+                  // $scope.apCheck.endDate = $scope.endDate;
 
                   //应收对账单明细行数据
                   $scope.item.orderCode = check.ordercode;
@@ -684,7 +685,7 @@ define(['app/app'], function (app) {
                   $scope.item.sendcode = check.sendcode;
                   $scope.item.whname = check.whname;
                   $scope.item.custUserUU = check.custuseruu;
-
+                  $scope.item.sourceDate = check.pidate
                   //来源表相关信息
                   $scope.sourceInfo.sourceid = check.sourceid;
                   $scope.sourceInfo.sourcetable = check.sourcetable;
@@ -695,7 +696,25 @@ define(['app/app'], function (app) {
                   $scope.haveSelected = true;
               }
           });
+          if ($scope.apCheckCondition.$open) {
+              $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+              $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
+          } else {
+              var _isShowApcheckList = $scope.thisMouth + '-01'
+              var _time1 = _isShowApcheckList
+              _time1 = _time1.replace(/-/g, '/')
+              var _d = new Date(_time1)
+              _d.setDate(1)
+              _d.setMonth(_d.getMonth() + 1)
+              _d.setDate(_d.getDate() - 1)
 
+              // 获取筛选时间的开始时间为对账的开始时间
+              var _time2 = _isShowApcheckList
+              _time2 = _time2.replace(/-/g, '/')
+              $scope.fromDate = new Date(_time2).getTime()
+              // 获取筛选的截止时间为对账的截止时间
+              $scope.endDate = _d.getTime()
+          }
           //保存生成的应收对账单
           $scope.saveApCheck = function () {
               if ($scope.apCheck.items.length == 0) {