seimin преди 1 година
родител
ревизия
5b33b4ce32
променени са 1 файла, в които са добавени 5 реда и са изтрити 8 реда
  1. 5 8
      assets/js/controllers/mainCtrl.js

+ 5 - 8
assets/js/controllers/mainCtrl.js

@@ -3395,7 +3395,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
3395
     //     }
3395
     //     }
3396
     // }
3396
     // }
3397
     $rootScope.getpending = function () {
3397
     $rootScope.getpending = function () {
3398
-      if(!loginUser){return;}
3398
+      if(!$rootScope.user){return;}
3399
       if ($rootScope.userMenus && $rootScope.userMenus.length > 0) {
3399
       if ($rootScope.userMenus && $rootScope.userMenus.length > 0) {
3400
         if ($rootScope.user.group) {
3400
         if ($rootScope.user.group) {
3401
           var groupArr = [];
3401
           var groupArr = [];
@@ -3421,21 +3421,18 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
3421
             {key: 'storage', value: '暂存', num: ''},
3421
             {key: 'storage', value: '暂存', num: ''},
3422
           ]
3422
           ]
3423
 
3423
 
3424
-          for (var i = 0; i < loginUser.menu.length; i++) {
3425
-              if (loginUser.menu[i].link == "shijianliebiao_all") {
3424
+          for (var i = 0; i < $rootScope.user.menu.length; i++) {
3425
+              if ($rootScope.user.menu[i].link == "shijianliebiao_all") {
3426
                   $scope.tabs.splice(0, 0 , {key: 'all', value: '全部事件', num: ''});
3426
                   $scope.tabs.splice(0, 0 , {key: 'all', value: '全部事件', num: ''});
3427
               }
3427
               }
3428
-              if (loginUser.menu[i].link == "shijianliebiao_huifang") {
3428
+              if ($rootScope.user.menu[i].link == "shijianliebiao_huifang") {
3429
                   let index = $scope.tabs.findIndex(v => v.key == 'resolve');
3429
                   let index = $scope.tabs.findIndex(v => v.key == 'resolve');
3430
                   $scope.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: ''});
3430
                   $scope.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: ''});
3431
               }
3431
               }
3432
-              if (loginUser.menu[i].link == "shijianliebiao_reassign") {
3432
+              if ($rootScope.user.menu[i].link == "shijianliebiao_reassign") {
3433
                   let index = $scope.tabs.findIndex(v => v.key == 'doing');
3433
                   let index = $scope.tabs.findIndex(v => v.key == 'doing');
3434
                   $scope.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: ''});
3434
                   $scope.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: ''});
3435
               }
3435
               }
3436
-              if (loginUser.menu[i].link == "shijianliebiao_daochu") {
3437
-                  $scope.daochu = true
3438
-              }
3439
           }
3436
           }
3440
 
3437
 
3441
           postData.queryTask = $scope.tabs.map(v => v.key).toString()
3438
           postData.queryTask = $scope.tabs.map(v => v.key).toString()