|
@@ -4595,11 +4595,12 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
$scope.condition.dateTo = ($scope.sdateTo || 0);
|
|
$scope.condition.dateTo = ($scope.sdateTo || 0);
|
|
|
}
|
|
}
|
|
|
$scope.condition.venduuorname = $scope.vuuorname;
|
|
$scope.condition.venduuorname = $scope.vuuorname;
|
|
|
|
|
+ //物料名称和物料规格存在特殊符号,用|作分割符
|
|
|
$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname)
|
|
$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname)
|
|
|
- + ","+ ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname)
|
|
|
|
|
- + ","+ ($scope.condition.factory == null ? "" : $scope.condition.factory)
|
|
|
|
|
- + ","+ ($scope.condition.prodTitle == null ? "" : $scope.condition.prodTitle)
|
|
|
|
|
- + ","+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
|
|
|
|
|
|
|
+ + "|"+ ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname)
|
|
|
|
|
+ + "|"+ ($scope.condition.factory == null ? "" : $scope.condition.factory)
|
|
|
|
|
+ + "|"+ ($scope.condition.prodTitle == null ? "" : $scope.condition.prodTitle)
|
|
|
|
|
+ + "|"+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
|
|
|
console.log($scope.keywordXls);
|
|
console.log($scope.keywordXls);
|
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
|
$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
|
|
$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
|