|
|
@@ -15651,7 +15651,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
};
|
|
|
var getService = function() {
|
|
|
- return ProductAll;
|
|
|
+ return Products.matchResult;
|
|
|
};
|
|
|
|
|
|
$scope.tableParams = new ngTableParams({
|
|
|
@@ -15667,7 +15667,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
var pageParams = params.url();
|
|
|
pageParams.keyword = $scope.keyword;
|
|
|
pageParams.searchFilter = $scope.searchFilter;
|
|
|
- getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
+ getService().call(null, BaseService.parseParams(pageParams), function(page){
|
|
|
$scope.loading = false;
|
|
|
if(page) {
|
|
|
params.total(page.totalElement);
|
|
|
@@ -16124,7 +16124,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
/**
|
|
|
* 物料详情(采购)
|
|
|
*/
|
|
|
- app.controller('PurcProdDetailCtrl', ['$scope', 'GetProductInfo', '$upload', 'ngTableParams', '$stateParams', 'toaster', 'AuthenticationService', '$filter', 'BaseService', '$modal', function($scope, GetProductInfo, $upload, ngTableParams, $stateParams, toaster, AuthenticationService, $filter, BaseService, $modal) {
|
|
|
+ app.controller('PurcProdDetailCtrl', ['$scope', 'GetProductInfo', '$upload', 'ngTableParams', '$stateParams', 'toaster', 'AuthenticationService', '$filter', 'BaseService', '$modal', 'Products', function($scope, GetProductInfo, $upload, ngTableParams, $stateParams, toaster, AuthenticationService, $filter, BaseService, $modal, Products) {
|
|
|
BaseService.scrollBackToTop();
|
|
|
// 录入人
|
|
|
AuthenticationService.getAuthentication().success(function(data) {
|