Ver código fonte

筛选单据时,将日期筛选扩展为超出默认日期条件

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7020 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 anos atrás
pai
commit
91b7aea128
1 arquivos alterados com 16 adições e 14 exclusões
  1. 16 14
      src/main/webapp/resources/js/index/app.js

+ 16 - 14
src/main/webapp/resources/js/index/app.js

@@ -4742,20 +4742,22 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 							+ "|"+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
 			$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.condition.dateFrom != null || $scope.condition.dateTo != null) {
-				$scope.fromDate =$scope.condition.dateFrom ?  $scope.condition.dateFrom.getTime() : null;
-				$scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
-				FaApCheck.getAllByDate({fromDate: $scope.fromDate, endDate: $scope.endDate}, function(data) {
-					$scope.data = data;
-					angular.forEach($scope.data, function(item) {
-							item:{
-								$selected:true;
-							}
-						});
-					$scope.loading = false;
-				}, function(response) {
-					toaster.pop('error', '提示', response.data);
-				});
+			if($scope.keywordXls.length == 4){
+				if($scope.condition.dateFrom != null || $scope.condition.dateTo != null) {
+					$scope.fromDate =$scope.condition.dateFrom ?  $scope.condition.dateFrom.getTime() : null;
+					$scope.endDate = $scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null;
+					FaApCheck.getAllByDate({fromDate: $scope.fromDate, endDate: $scope.endDate}, function(data) {
+						$scope.data = data;
+						angular.forEach($scope.data, function(item) {
+								item:{
+									$selected:true;
+								}
+							});
+						$scope.loading = false;
+					}, function(response) {
+						toaster.pop('error', '提示', response.data);
+					});
+				}
 			}
 		}