|
|
@@ -3959,9 +3959,11 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
$scope.totalMoney = 0;
|
|
|
$scope.filteredData = $filter('filter')($scope.data,$scope.condition.uuorname,$scope.condition.venduuorname);
|
|
|
var uuorname = $scope.suuorname;
|
|
|
- var dateFrom = $scope.sdateFrom;
|
|
|
- var dateTo = $scope.sdateTo;
|
|
|
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;
|
aof