|
|
@@ -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);
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|