|
|
@@ -1140,13 +1140,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
}, {
|
|
|
total : 0,
|
|
|
counts: [5, 10, 15, 25, 50],
|
|
|
- getData : function($defer, params) { // 获取数据的方法
|
|
|
+ getData : function($defer, params) {// 获取数据的方法
|
|
|
$scope.loading = true;
|
|
|
var pageParams = params.url();
|
|
|
pageParams.searchFilter = { // 筛选条件
|
|
|
- keyword: $scope.keyword,
|
|
|
- fromDate: getDateTime($scope.condition.dateFrom),
|
|
|
- endDate: getDateTime($scope.condition.dateTo)
|
|
|
+ keyword: $scope.keyword,
|
|
|
+ fromDate: getDateTime($scope.condition.dateFrom),
|
|
|
+ endDate: getDateTime($scope.condition.dateTo)
|
|
|
};
|
|
|
console.log(getPurcStatus($scope.active));
|
|
|
PurcOrderItem[getPurcStatus($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
@@ -1260,7 +1260,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
count : 5,
|
|
|
sorting: {
|
|
|
display: 'desc',
|
|
|
- date: 'desc'
|
|
|
+ date: 'desc',
|
|
|
+ id: 'desc'
|
|
|
}
|
|
|
}, {
|
|
|
total : 0,
|
|
|
@@ -3974,7 +3975,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
$scope.openDatePicker = function($event, item, openParam) {
|
|
|
$event.preventDefault();
|
|
|
$event.stopPropagation();
|