报表增加跳转

assets/js/config.router.js

@@ -495,7 +495,7 @@ app.config(['$authProvider', '$httpProvider', '$stateProvider', '$urlRouterProvi
                     label: 'Incident'
                 }
             }).state('app.incident.list', {
-                url: '/list/{model}/:tab/:state/:date/:handUserId',
+                url: '/list/{model}/:tab/:state/:date/:handUserId/:acceptorId/:isDirectProcess/:source',
                 templateUrl: "assets/views/incident/list.html",
                 resolve: loadSequence('jquery-sparkline', 'spin', 'ladda', 'angular-ladda', 'ui.grid', 'moment', 'angularPrint', 'angularFileUpload', 'ui.select', 'multi.select.tree', 'angularBootstrapNavTree', 'incidentCtrl'),
                 title: 'incident.LIST',

assets/js/controllers/incident/incidentCtrl.js

@@ -873,7 +873,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 if (sessionStorage.searchincident && JSON.parse(sessionStorage.getItem("searchincident")).incident && JSON.parse(sessionStorage.getItem("searchincident")).incident.source) {
                     angular.forEach($scope.source, function (item) {
                         if (item.id == JSON.parse(sessionStorage.getItem("searchincident")).incident.source.id) {
-                            $scope.othcode = {
+                            $scope.searchkeys = {
                                 "source": item
                             };
                         }
@@ -2619,7 +2619,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             $scope.isDisabledState = false;
         }
         $scope.searchstate = searchType;
-        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state,$scope.othcode.source);
+        $scope.chiceIncident($scope.searchkeys,$scope.othcode.state,$scope.searchkeys.source);
         // console.log(defaultFilterData,'fanbu')
         // if(defaultFilterData.incident){
         //     var lsObject = defaultFilterData.incident;
@@ -2694,6 +2694,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         console.log(defaultFilterData,2222)
         $scope.onChange('all');
     }
+
     //获取列表数据
     $scope.refreshData = async function (style, filterData) {
         console.log(filterData,9090)
@@ -2748,6 +2749,38 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         sessionStorage.setItem("searchincident",JSON.stringify(filterData));
                     }
                 }
+                if($state.params.acceptorId){
+                    delete $scope.searchkeys.acceptUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.acceptorId);
+                    if (response.status == 200) {
+                        $scope.acceptUser = [response.data];
+                        $scope.searchkeys.acceptUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.acceptUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.acceptUser = [];
+                        delete $scope.searchkeys.acceptUser;
+                        delete filterData.incident.acceptUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.isDirectProcess){
+                    if ($state.params.isDirectProcess == 1) {
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 1);
+                        filterData.incident.directProcess = 1;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 0);
+                        filterData.incident.directProcess = 0;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.source){
+                    let item = $scope.source.find(v=>v.value == $state.params.source);
+                    $scope.searchkeys.source = item;
+                    filterData.incident.source = item;
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
                     $scope.searchkeys.acceptDateEnd = null;
@@ -2803,6 +2836,38 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         sessionStorage.setItem("searchincident",JSON.stringify(filterData));
                     }
                 }
+                if($state.params.acceptorId){
+                    delete $scope.searchkeys.acceptUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.acceptorId);
+                    if (response.status == 200) {
+                        $scope.acceptUser = [response.data];
+                        $scope.searchkeys.acceptUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.acceptUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.acceptUser = [];
+                        delete $scope.searchkeys.acceptUser;
+                        delete filterData.incident.acceptUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.isDirectProcess){
+                    if ($state.params.isDirectProcess == 1) {
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 1);
+                        filterData.incident.directProcess = 1;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 0);
+                        filterData.incident.directProcess = 0;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.source){
+                    let item = $scope.source.find(v=>v.value == $state.params.source);
+                    $scope.searchkeys.source = item;
+                    filterData.incident.source = item;
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
                     $scope.searchkeys.acceptDateEnd = null;
@@ -2835,7 +2900,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             window.sessionStorage.removeItem('isGoyuqi');
         }
         if(window.sessionStorage.getItem('isZhiJie') == 'yes'){
-            $scope.searchkeys.directProcess = {id:'21',name:'是'};
+            $scope.searchkeys.directProcess = {id:'1',name:'是'};
             if(filterData.incident&&filterData.incident.directProcess){
                 filterData.incident.directProcess = '1';
             }else{
@@ -2926,6 +2991,38 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         sessionStorage.setItem("searchincident",JSON.stringify(filterData));
                     }
                 }
+                if($state.params.acceptorId){
+                    delete $scope.searchkeys.acceptUser;
+                    let response = await api_bpm_data.fetchData('user', $state.params.acceptorId);
+                    if (response.status == 200) {
+                        $scope.acceptUser = [response.data];
+                        $scope.searchkeys.acceptUser = {id:response.data.id, name:response.data.name};
+                        filterData.incident.acceptUser = {id:response.data.id, name:response.data.name};
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.acceptUser = [];
+                        delete $scope.searchkeys.acceptUser;
+                        delete filterData.incident.acceptUser;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.isDirectProcess){
+                    if ($state.params.isDirectProcess == 1) {
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 1);
+                        filterData.incident.directProcess = 1;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }else{
+                        $scope.searchkeys.directProcess = $scope.directProcess.find(v=>v.id == 0);
+                        filterData.incident.directProcess = 0;
+                        sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                    }
+                }
+                if($state.params.source){
+                    let item = $scope.source.find(v=>v.value == $state.params.source);
+                    $scope.searchkeys.source = item;
+                    filterData.incident.source = item;
+                    sessionStorage.setItem("searchincident",JSON.stringify(filterData));
+                }
                 if($state.params.state){
                     $scope.searchkeys.acceptDate = null;
                     $scope.searchkeys.acceptDateEnd = null;

assets/js/controllers/mainCtrl.js

@@ -74,6 +74,9 @@ app.controller('AppCtrl', ['$rootScope', '$scope', '$state', '$translate', '$loc
         //   tlwsa.tlaWca();
         // }
       }
+      if(toState.name == 'app.incident.list'){
+        sessionStorage.removeItem('searchincident');
+      }
       if (isEmpty($auth.retrieveData('auth_headers'))) {
         // if (toState.name != "login.signin" && toState.name != "echart") {
         //     event.preventDefault();

assets/js/controllers/report/service_formCtrl.js

@@ -278,6 +278,48 @@ app.controller('service_formCtrl', ["$scope", "$rootScope", "$state", "$timeout"
                 break;
         }
     };
+    // 跳转
+    $scope.goTo = function(url,data){
+        $state.go(url,data);
+    }
+    $scope.serviceFormTo = function(rowData,type){
+        console.log(rowData.userId);
+        console.log($scope.starttimesModel);
+        console.log($scope.endtimesModel);
+        switch(type){
+            case 'total':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId});
+            break;
+            case 'p_total':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, isDirectProcess:1});
+            break;
+            case 'unp_total':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, isDirectProcess:0});
+            break;
+
+            case 'handle_phone':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'phone'});
+            break;
+            case 'handle_wxweb':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'im'});
+            break;
+            case 'handle_msg':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'record'});
+            break;
+            case 'handle_desk':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'desk'});
+            break;
+            case 'handle_other':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'other'});
+            break;
+            case 'handle_discover':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'discover'});
+            break;
+            case 'handle_leader':
+            $scope.goTo('app.incident.list',{tab:'all',date:$scope.starttimesModel + 'to' + $scope.endtimesModel, acceptorId:rowData.userId, source:'leader'});
+            break;
+        }
+    }
     //导出
     $scope.export = function () {
         var postData = {

assets/views/incident/list.html

@@ -240,7 +240,7 @@
                         </div>
                         <div class="form-group incidentsearch  wt_width">
                             <div class="control-label pull-left margin-top-5">事件来源:</div>
-                            <ui-select ng-disabled="isDisabledState" class="pull-right selectzise wt_width1 wt_width3" ng-model="othcode.source"
+                            <ui-select class="pull-right selectzise wt_width1 wt_width3" ng-model="searchkeys.source"
                                 theme="bootstrap">
                                 <ui-select-match placeholder="请选择事件来源">
                                     {{$select.selected.name}}
@@ -295,7 +295,7 @@
                                 <div class="btn btn-searchbutton steelbutton wt_btn1 wt_btnColor1" ng-click="replacement(parameters,searchkeys,othcode)" type="button">重置</div>
                             </div> -->
                             <div class=" wt_btns">
-                                <div class="btn btn_search" ng-click="chiceIncident(searchkeys,othcode.state,othcode.source)"
+                                <div class="btn btn_search" ng-click="chiceIncident(searchkeys,othcode.state,searchkeys.source)"
                                     type="button">搜索</div>
                             </div>
 

assets/views/report/service_form.html

@@ -229,34 +229,34 @@
                                             <td style="width:10%">
                                                 {{rowData.userName}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'total')">
                                                 {{rowData.total}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'p_total')">
                                                 {{rowData.p_total}}
                                             </td>
-                                            <td style="width:10%">
+                                            <td class="cursor" style="width:10%" ng-click="serviceFormTo(rowData, 'unp_total')">
                                                 {{rowData.unp_total}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_phone')">
                                                 {{rowData.handle_phone}}
                                             </td>
-                                            <td style="width:10%">
+                                            <td class="cursor" style="width:10%" ng-click="serviceFormTo(rowData, 'handle_wxweb')">
                                                 {{rowData.handle_wxweb}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_msg')">
                                                 {{rowData.handle_msg}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_desk')">
                                                 {{rowData.handle_desk}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_other')">
                                                 {{rowData.handle_other}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_discover')">
                                                 {{rowData.handle_discover}}
                                             </td>
-                                            <td style="width:8%">
+                                            <td class="cursor" style="width:8%" ng-click="serviceFormTo(rowData, 'handle_leader')">
                                                 {{rowData.handle_leader}}
                                             </td>
                                         </tr>
@@ -1018,11 +1018,11 @@
         width: 100%;
     }
 
-    .jry_table_body .tbody-hover.service_form-hover td {
+    .jry_table_body .tbody-hover.service_form-hover td.cursor {
         cursor: pointer;
     }
 
-    .jry_table_body .tbody-hover.service_form-hover td:hover {
+    .jry_table_body .tbody-hover.service_form-hover td.cursor:hover {
         text-decoration: underline;
     }