|
|
@@ -20,13 +20,22 @@ angular.module('app.system').controller("userCtrl", function($scope, $state, $st
|
|
20
|
20
|
$scope.loadData = function() {
|
|
21
|
21
|
$scope.username = $scope.replaceStr($scope.search.username);
|
|
22
|
22
|
$scope.realName = $scope.replaceStr($scope.search.realName);
|
|
23
|
|
- userService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.username,
|
|
24
|
|
- $scope.realName, null, null).then(function(data){
|
|
|
23
|
+ userService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.username, $scope.realName, null, null).then(function(data){
|
|
25
|
24
|
$scope.pageInfo = data;
|
|
|
25
|
+ if ($scope.pageInfo.list.length > 0) {
|
|
|
26
|
+ for (let i = 0; i < $scope.pageInfo.list.length; i++) {
|
|
|
27
|
+ let roleNames = $scope.pageInfo.list[i].roleNames;
|
|
|
28
|
+ if (roleNames !== null) {
|
|
|
29
|
+ if (roleNames.indexOf('保管员') !== -1 || roleNames.indexOf('仓储人员') !== -1) {
|
|
|
30
|
+ $scope.pageInfo.list[i].fpcf = '1';
|
|
|
31
|
+ }
|
|
|
32
|
+ }
|
|
|
33
|
+ }
|
|
|
34
|
+ }
|
|
26
|
35
|
},function(data){
|
|
27
|
36
|
console.log(data);
|
|
28
|
37
|
});
|
|
29
|
|
- }
|
|
|
38
|
+ };
|
|
30
|
39
|
$scope.loadData();
|
|
31
|
40
|
|
|
32
|
41
|
// 删除一条记录
|