|
|
@@ -3946,10 +3946,11 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
$scope.condition.dateFrom = ($scope.sdateFrom || 0);
|
|
|
$scope.thisdatato = ($scope.sdateTo || 0);
|
|
|
if($scope.thisdatato != 0) {
|
|
|
- $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 24 * 1000) || 0);
|
|
|
+ $scope.condition.dateTo = (new Date($scope.thisdatato.valueOf() + 3600 * 12 * 1000) || 0);
|
|
|
} else {
|
|
|
$scope.condition.dateTo = ($scope.sdateTo || 0);
|
|
|
}
|
|
|
+ console.log($scope.condition.dateTo);
|
|
|
$scope.condition.venduuorname = $scope.vuuorname;
|
|
|
$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname) + "-" + ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname));//保存当前取值的关键词
|
|
|
$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
|
|
|
@@ -3970,13 +3971,10 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
$scope.filteredData = $filter('filter')($scope.data,$scope.condition.uuorname,$scope.condition.venduuorname);
|
|
|
var uuorname = $scope.suuorname;
|
|
|
var venduuorname = $scope.venduuorname;
|
|
|
-// var dateFrom = $scope.sdateFrom;
|
|
|
-// var dateTo = $scope.sdateTo;
|
|
|
var dateFrom = $scope.condition.dateFrom;
|
|
|
var dateTo = $scope.condition.dateTo;
|
|
|
angular.forEach($scope.filteredData, function(item) {
|
|
|
- if((item.piDate > dateFrom || dateFrom == '') && (item.piDate < dateTo || dateTo == '')){
|
|
|
- item.$selected = $scope.checkboxes.checked;
|
|
|
+ if((item.piDate >= dateFrom || dateFrom == '') && (item.piDate < dateTo || dateTo == '')){
|
|
|
}
|
|
|
});
|
|
|
$scope.getTotalMoney();
|
aof