From d6de760fe0fc2b95d8e9233bcb1db66a9162b3c2 Mon Sep 17 00:00:00 2001 From: yuan <1551130722@qq.com> Date: Fri, 20 Apr 2018 18:39:36 +0800 Subject: [PATCH] fix bug --- .../ui/static/invoice/invoice_assistant.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/ui/static/invoice/invoice_assistant.js b/src/main/ui/static/invoice/invoice_assistant.js index 7e63b208c..3470257b6 100644 --- a/src/main/ui/static/invoice/invoice_assistant.js +++ b/src/main/ui/static/invoice/invoice_assistant.js @@ -69,9 +69,19 @@ define(['angular','decimal'], function (angular,decimal) { var params = angular.copy($scope.params); if (params.datefrom) { params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd'); + }else { + alert("请选择开始时间"); + return; } if (params.dateto) { params.dateto = $filter('date')(params.dateto, 'yyyyMMdd'); + }else { + alert("请选择结束时间"); + return + } + if(getTime2Time()>30){ + alert("开始时间与结束时间不得超过三十天"); + return; } params.page = page || $scope.pagination.page || 1; $http.get('/partner/invoice/trans_flow', {params: params}).then(function (resp) { @@ -89,6 +99,14 @@ define(['angular','decimal'], function (angular,decimal) { commonDialog.alert({title: 'Search failed', content: resp.data.message, type: 'error'}); }); }; + var getTime2Time = function () { + var time = angular.copy($scope.params); + var from = time.datefrom = $filter('date')(time.datefrom, 'yyyy-MM-dd'); + var to = time.dateto = $filter('date')(time.dateto, 'yyyy-MM-dd'); + var longTime = new Date(to).getTime() - new Date(from).getTime() ; + return Math.floor(longTime/(24*60*60*1000)); + }; + $scope.export = function (type,page) { var url='/partner/invoice/trans_flow/pdf'; var connectSymbol = '?';