Browse Source

移除删除按钮,优化事件列表查询

seimin 2 years ago
parent
commit
e7c52f46d3
1 changed files with 11 additions and 7 deletions
  1. 11 7
      assets/js/controllers/incident/incidentCtrl.js

+ 11 - 7
assets/js/controllers/incident/incidentCtrl.js

@@ -2613,9 +2613,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2613
     if ($stateParams.model) {
2613
     if ($stateParams.model) {
2614
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
2614
         if (JSON.parse($stateParams.model).searchType && JSON.parse($stateParams.model).searchType != null) {
2615
             $scope.searchType = JSON.parse($stateParams.model).searchType;
2615
             $scope.searchType = JSON.parse($stateParams.model).searchType;
2616
+        } else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
2617
+            $scope.searchType = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
2616
         } else {
2618
         } else {
2617
             $scope.searchType = "all";
2619
             $scope.searchType = "all";
2618
         }
2620
         }
2621
+    } else if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).searchType) {
2622
+        $scope.searchType = JSON.parse(sessionStorage.getItem("searchincident")).searchType;
2619
     } else {
2623
     } else {
2620
         $scope.searchType = "all";
2624
         $scope.searchType = "all";
2621
     }
2625
     }
@@ -2972,7 +2976,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2972
             $scope.ldloading[style.replace('-', '_')] = false;
2976
             $scope.ldloading[style.replace('-', '_')] = false;
2973
         });
2977
         });
2974
     };
2978
     };
2975
-    // 进入页面时111
2979
+    // 进入页面时
2976
     if(window.sessionStorage.getItem('searchincident')){
2980
     if(window.sessionStorage.getItem('searchincident')){
2977
         var varLin = JSON.parse(window.sessionStorage.getItem('searchincident'));
2981
         var varLin = JSON.parse(window.sessionStorage.getItem('searchincident'));
2978
         if(varLin.incident&&varLin.incident.selectType){
2982
         if(varLin.incident&&varLin.incident.selectType){
@@ -2988,11 +2992,11 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2988
     if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
2992
     if(window.sessionStorage.getItem('isGoyuqi') === 'yes'){
2989
         $scope.selectTypeChange();
2993
         $scope.selectTypeChange();
2990
     }else{
2994
     }else{
2991
-        if(sessionStorage.getItem("searchincident")){
2992
-            var ss = JSON.parse(sessionStorage.getItem("searchincident"));
2993
-            delete ss.incident;
2994
-            sessionStorage.setItem("searchincident",JSON.stringify(ss));
2995
-        }
2995
+        // if(sessionStorage.getItem("searchincident")){
2996
+        //     var ss = JSON.parse(sessionStorage.getItem("searchincident"));
2997
+        //     delete ss.incident;
2998
+        //     sessionStorage.setItem("searchincident",JSON.stringify(ss));
2999
+        // }
2996
         $scope.refreshData('expand-right');
3000
         $scope.refreshData('expand-right');
2997
     }
3001
     }
2998
     
3002
     
@@ -3261,7 +3265,7 @@ app.directive('incidentoperator', function () {
3261
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
3265
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
3262
             '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +
3266
             '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +
3263
             '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增沟通记录</a>' +
3267
             '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增沟通记录</a>' +
3264
-            '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
3268
+            // '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
3265
             // '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
3269
             // '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
3266
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
3270
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
3267
             '<a ng-click="record()"  ng-show="{{item.callID}}" class="luyinfont" >录音</a>' +
3271
             '<a ng-click="record()"  ng-show="{{item.callID}}" class="luyinfont" >录音</a>' +