|
|
@@ -2505,7 +2505,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
|
|
|
$scope.userParams = new ngTableParams({ // ng-Table参数
|
|
|
page: 1,
|
|
|
- count: 20,
|
|
|
+ count: 10,
|
|
|
sorting: {
|
|
|
}
|
|
|
}, {
|
|
|
@@ -2521,6 +2521,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
if (page) {
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.userinfos = page.content;
|
|
|
+ var distribute = [];
|
|
|
+ angular.forEach($scope.userinfos, function (user, index) {
|
|
|
+ if (user.distribute) {
|
|
|
+ distribute.push({num: index});
|
|
|
+ }
|
|
|
+ });
|
|
|
+ $scope.distribute = distribute;
|
|
|
+ $scope.havedone = angular.copy($scope.distribute);
|
|
|
$scope.total = page.totalElement;
|
|
|
params.total(page.totalElement);
|
|
|
$scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
|
|
|
@@ -2628,7 +2636,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
params = {id : customer.id};
|
|
|
urlSaveData = 'transferSaleUserToVendor';
|
|
|
urlData = 'findSaleUsers';
|
|
|
- uuData = id;
|
|
|
+ uuData = customer.id;
|
|
|
} else {
|
|
|
params = {id : customer.id};
|
|
|
urlSaveData = 'transferUserToVendor';
|
|
|
@@ -2647,7 +2655,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.transfer = [];
|
|
|
$scope.userParams = new ngTableParams({ // ng-Table参数
|
|
|
page: 1,
|
|
|
- count: 20,
|
|
|
+ count: 10,
|
|
|
sorting: {
|
|
|
}
|
|
|
}, {
|
|
|
@@ -2663,6 +2671,28 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
if (page) {
|
|
|
$defer.resolve(page.content);
|
|
|
$scope.userinfos = page.content;
|
|
|
+ var transfer = [];
|
|
|
+ angular.forEach($scope.userinfos, function (user, index) {
|
|
|
+ // 当前用户是被管理员转移权限时,转移的是被管理员转移的权限。
|
|
|
+ if ($scope.thisUser.userUU === user.userUU && user.transfer) {
|
|
|
+ $scope.thisUser.transfer = true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ angular.forEach($scope.userinfos, function (user, index) {
|
|
|
+ if ($scope.thisUser.sys || $scope.thisUser.transfer) {
|
|
|
+ if (user.transfer) {
|
|
|
+ transfer.push({num: index});
|
|
|
+ user.checked = true;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if (user.distribute) {
|
|
|
+ transfer.push({num: index});
|
|
|
+ user.checked = true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ $scope.transfer = transfer;
|
|
|
+ $scope.havedone = angular.copy($scope.transfer);
|
|
|
$scope.total = page.totalElement;
|
|
|
params.total(page.totalElement);
|
|
|
$scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
|
|
|
@@ -2673,6 +2703,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+
|
|
|
/*AccountUser[urlData](params, {}, function (data) {
|
|
|
$scope.userinfos = data;
|
|
|
var transfer = [];
|