指派人或组

assets/js/controllers/incident/incidentCtrl.js

@@ -828,7 +828,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //             api_bpm_data.fetchDataList('incidentcategory',postData).then(function(data){
         //                 console.log(data)
         //                     var myData = Restangular.stripRestangular(data);
-        //                     $scope.propTypeOptions = myData[2].form.fields;   
+        //                     $scope.propTypeOptions = myData[2].form.fields;
         //                     // console.log($scope.propTypeOptions)
         //             });
         //         }
@@ -865,7 +865,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         if (JSON.parse(sessionStorage.getItem("searchincident")).incident) {
             $scope.searchkeys = JSON.parse(sessionStorage.getItem("searchincident")).incident;
         }
-        
+
         if ($scope.searchkeys.acceptDate) {
             $scope.searchkeys.acceptDate = new Date($scope.searchkeys.acceptDate);
         }
@@ -923,7 +923,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             item.statusId = undefined;
         }
         console.log(item)
-        
+
         var fildata = {};
         if (sessionStorage.searchincident) {
             fildata = JSON.parse(sessionStorage.getItem("searchincident"));
@@ -948,7 +948,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //     angular.extend(fildata, { 'idx': 0, 'sum': $scope.gridOptions.paginationPageSize })
         //     angular.extend(fildata.incident, { 'acceptDate': moment(parameters.paramDateFrom).format('YYYY-MM-DD 00:00:00'), 'acceptDateEnd': moment(parameters.paramDateTo).format('YYYY-MM-DD 23:59:59') })
         // }
-        
+
         var transitiondata = angular.copy(item);
         angular.extend(fildata.incident, transitiondata)
         sessionStorage['searchincident'] = JSON.stringify(fildata);
@@ -956,7 +956,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         fildata.assignee = loginUser.id;
         // seimin
         if($scope.searchstate === 'all_del'){
-            fildata.searchType = 'all'; 
+            fildata.searchType = 'all';
         }else{
             fildata.searchType = $scope.searchstate;
         }
@@ -1011,7 +1011,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 $scope.requester = data.list
             });
         }
-        
+
     }
     getRequester();
 
@@ -1313,7 +1313,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 filtersData.assignee = loginUser.id;
                 $scope.refreshData('expand-right', filtersData);
             }
-            // $scope.refreshData('expand-right', {"assignee":$rootScope.user.id, "candidateGroups":$rootScope.user.group[0].id, "idx":newPage-1,"sum":pageSize});                                            
+            // $scope.refreshData('expand-right', {"assignee":$rootScope.user.id, "candidateGroups":$rootScope.user.group[0].id, "idx":newPage-1,"sum":pageSize});
         });
 
         // gridApi.selection.on.rowSelectionChanged($scope, function(data) {
@@ -1529,7 +1529,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 // {name:"处理结果",value:data.handleResult}];
                 // {name:"用户评价",value:''},
                 // {name:"满意度",value:''},
-                // {name:"用户签字",value:''}];                                                                         
+                // {name:"用户签字",value:''}];
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
@@ -1713,7 +1713,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         filtersData.idx = newPage - 1;
                         filtersData.sum = pageSize;
                         $scope.loadData(filtersData);
-                        // $scope.loadData({"idx":newPage-1,"sum":pageSize});                                            
+                        // $scope.loadData({"idx":newPage-1,"sum":pageSize});
                     });
                     gridApi.selection.on.rowSelectionChanged($scope, function (scope) {
                         scope.grid.appScope.selected.items[0] = scope.entity;
@@ -1816,7 +1816,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     // };
 
     /*
-      appScopeProvider: { 
+      appScopeProvider: {
           onDblClick : function(row) {
              var url = '//google.com';
              $window.open(url, "_blank", "height=600,width=800,toolbar=no,location=no,menubar=no,titlebar=no");
@@ -2265,8 +2265,8 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
-    // 指派弹窗
-    $scope.toAssign = function (model) {
+    // 指派人弹窗
+    $scope.toAssignPerson = function (model) {
         console.log(model)
         var modalInstance = $modal.open({
             templateUrl: 'assets/views/incident/tpl/toAssign.tpl.html',
@@ -2322,7 +2322,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.assignGroup = item.id;
                     $scope.getUsers(item.id)
                 }
-                
+
                 $scope.ok = function () {
                     if (!$scope.assignUser){
                         Alert.swal({
@@ -2332,7 +2332,137 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                         });
                         return;
                     }
-                    api_bpm_domain.delegateTask(model.taskId, {assginee:$scope.assignUser}).then(function (response) {
+                    var taskType = undefined;
+                    var handlerIncidentId = undefined;
+                    if(model.state.value == "pending"){
+                        taskType = 'receiveform';
+                    }else if(model.state.value == "handler"){
+                        taskType = 'handlerform';
+                        handlerIncidentId = model.id;
+                    }
+                    api_bpm_domain.delegateTask(model.taskId, {assginee:$scope.assignUser, taskType, handlerIncidentId}).then(function (response) {
+                        console.log(response)
+                        if (response.status == 200) {
+                            Alert.swal({
+                                title: "操作成功!",
+                                confirmButtonColor: "#007AFF",
+                                type: "success"
+                            });
+                            $modalInstance.close('success');
+                        } else {
+                            Alert.swal({
+                                title: "操作失败",
+                                text: "操作失败, 请稍后再试!",
+                                type: "error"
+                            });
+                        }
+                    });
+                }
+
+                $scope.cancel = function () {
+                    $modalInstance.dismiss('cancel');
+                }
+            },
+            size: 'sm',
+            resolve: {
+                api_bpm: function () {
+                    return api_bpm;
+                },
+                modelData: function () {
+                    return model;
+                },
+                currentUserId: function () {
+                    return loginUser.id;
+                },
+                Alert: function () {
+                    return SweetAlert;
+                },
+                api_user_data: function () {
+                    return api_user_data;
+                }
+            }
+        });
+        modalInstance.result.then(function (selectedItem) {
+            if (selectedItem == 'success') {
+                defaultFilterData.assignee = loginUser.id;
+                $scope.refreshData('expand-right', defaultFilterData);
+            }
+        });
+    }
+    // 指派组弹窗
+    $scope.toAssignGroup = function (model) {
+        console.log(model)
+        var modalInstance = $modal.open({
+            templateUrl: 'assets/views/incident/tpl/toAssign.tpl.html',
+            controller: function ($scope, $modalInstance, api_bpm_domain, modelData, currentUserId, Alert, api_user_data) {
+                console.log(model,loginUser);
+                $scope.isGroup = true;
+                //获取组下面的用户
+                $scope.getUsers = function(groupId){
+                    $scope.user = [];
+                    var postData = {};
+                    if(groupId){
+                        postData = {
+                            "idx": 0,
+                            "sum": 100,
+                            user: {
+                                groupdata:{id:groupId},
+                                roledata: { rolecode: "first-line support" },
+                                roledata2: { rolecode: "second-line support" },
+                                selectType: "1",
+                                selectDetails:1
+                            }
+                        }
+                    }else{
+                        postData = {
+                            "idx": 0,
+                            "sum": 100,
+                            user: {
+                                roledata: { rolecode: "first-line support" },
+                                roledata2: { rolecode: "second-line support" },
+                                selectType: "1",
+                                selectDetails:1
+                            }
+                        }
+                    }
+                    api_user_data.fetchDataList('user', postData).then(function (data) {
+                        $scope.user = data.list;
+                    })
+                }
+                $scope.assignUser = null;
+                $scope.user = [];
+                $scope.group = [];
+                // $scope.getUsers();
+                api_user_data.fetchDataList('group', {
+                    "idx": 0,
+                    "sum": 100,
+                    group: {'selectType':'nouser'}
+                }).then(function (data) {
+                    $scope.group = data.list;
+                })
+                $scope.onChangeRotateUser = function(item){
+                    $scope.assignUser = item.id;
+                }
+                $scope.onChangeRotateGroup = function(item){
+                    $scope.assignGroup = item.id;
+                    // $scope.getUsers(item.id)
+                }
+
+                $scope.ok = function () {
+                    if (!$scope.assignGroup){
+                        Alert.swal({
+                            title: "操作失败",
+                            text: "请选择转派组信息!",
+                            type: "error"
+                        });
+                        return;
+                    }
+                    var handlerIncidentId = undefined;
+                    if(model.state.value == "pending"){
+                    }else if(model.state.value == "handler"){
+                        handlerIncidentId = model.id;
+                    }
+                    api_bpm_domain.delegateTask(model.taskId, {group:$scope.assignGroup, handlerIncidentId}).then(function (response) {
                         console.log(response)
                         if (response.status == 200) {
                             Alert.swal({
@@ -2409,7 +2539,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
-    
+
     // 新增发送短信弹窗
     $scope.toSms = function (model) {
         console.log(model)
@@ -2457,7 +2587,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 $scope.group = [];
                 $scope.getUsers();
                 $scope.getGroups();
-                
+
                 $scope.ok = function () {
                     if ($scope.userOrGroup == 1 && !$scope.sms.assignUser){
                         Alert.swal({
@@ -2568,7 +2698,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                             if (data.errno == 0) {
                                 $rootScope.status = 6;
                                 $scope.telephone = telephone;
-                                
+
                             }else{
                                 $scope.callId = undefined;
                             }
@@ -2625,7 +2755,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                             }
                         });
                     });
-                    
+
                 }
 
                 $scope.cancel = function () {
@@ -2864,7 +2994,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //     }
         // }
         // // -----------seimin-------------
-        
+
         // $scope.refreshData('expand-right', defaultFilterData);
         // $interval.cancel($scope.timer);
         // $scope.timer = $interval(function () {
@@ -3015,7 +3145,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         //$scope.callsPending++;
         $scope.memoryfilterData = filterData;
         $scope.gridOptions['sum'] = filterData.sum;
-        
+
         api_bpm_domain.fetchtask(pdKey, filterData).then(function (data) {
             if (data.data) {
                 // if(filterData.searchType == 'all'){
@@ -3037,7 +3167,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 });
             }
             $scope.ldloading[style.replace('-', '_')] = false;
-            
+
         }, function () {
             $scope.ldloading[style.replace('-', '_')] = false;
         });
@@ -3148,7 +3278,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
         // }
         $scope.refreshData('expand-right');
     }
-    
+
     $scope.timer = $interval(function () {
         $scope.jry_refresh()
     }, $rootScope.refreshTime);
@@ -3279,7 +3409,7 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
         } else {
             return false
         }
-        // }   
+        // }
     }
     $scope.coordination = function () {
         $scope.colobject.grid.appScope.coordination($scope.item);
@@ -3322,9 +3452,14 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
         $scope.colobject.grid.appScope.rotate($scope.item);
         // $scope.doEdit($scope.item.id);
     }
-    // 指派
-    $scope.toAssign = function () { //print
-        $scope.colobject.grid.appScope.toAssign($scope.item);
+    // 指派人
+    $scope.toAssignPerson = function () { //print
+        $scope.colobject.grid.appScope.toAssignPerson($scope.item);
+        // $scope.doEdit($scope.item.id);
+    }
+    // 指派组
+    $scope.toAssignGroup = function () { //print
+        $scope.colobject.grid.appScope.toAssignGroup($scope.item);
         // $scope.doEdit($scope.item.id);
     }
     // 删除事件
@@ -3387,16 +3522,16 @@ app.controller('IncidentOperCtrl', ['$rootScope', '$http', '$scope', '$modal', '
     //       $scope.data={
     //           "name":"视频",
     //           "url":"http://192.168.3.69:8088/recording/recording?callID="+$rootScope.callid
-    //       };  
+    //       };
     //       $scope.data.url = $sce.trustAsResourceUrl($scope.data.url);
 
     //         // $scope.audiourl={url:$sce.trustAsResourceUrl("http://192.168.3.69:8088/recording/recording?callID=218147232")};
 
     //         $scope.cancel = function() {
     //                 $modalInstance.dismiss('cancel');
-    //             };       
-    //             $modalInstance.close();  
-    //       } 
+    //             };
+    //             $modalInstance.close();
+    //       }
     //     });
     // };
 
@@ -3417,7 +3552,8 @@ app.directive('incidentoperator', function () {
             '<a ng-click="handler()" ng-show="{{item.state.id != 1546 &&!item.handlerUser&&item.tiquPower&&qiangdan}}" class="bianjifont" >抢单</a>' +
             // '<a ng-click="visit()"  ng-show="{{item.huifang&&huifang}}"  class="bianjifont">回访</a>' +
             '<a ng-click="changeCenter()"  ng-show="jry_modify(item)"  class="luyinfont">编辑</a>' +
-            '<a ng-click="toAssign()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag&&item.assignee}}" class="assign" >指派</a>' +
+            '<a ng-click="toAssignPerson()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag}}" class="assign" >指派人</a>' +
+            '<a ng-click="toAssignGroup()" ng-show="{{(item.state.id==1543||item.state.id==1544)&&assignFlag}}" class="assign" >指派组</a>' +
             // '<a ng-click="toHandlerLog()" ng-show="{{item.state.id==1544}}" class="assign" >新增沟通记录</a>' +
             // '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
             // '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +

assets/js/main.js

@@ -31,7 +31,7 @@ if(document.domain === 'itsm.zuel.edu.cn'){
 // var callIp = "http://192.168.2.63:80/service";
 //101测试
 // var serverIp = "http://192.168.3.101/service";
-// var reportIp = "http://192.168.3.101/service"; 
+// var reportIp = "http://192.168.3.101/service";
 // var inspectIp = "http://192.168.3.101/service";
 // var imgBaseUrl = "http://192.168.3.101";//富文本框上传图片路径
 // var callIp = "http://192.168.3.122:29005";
@@ -700,7 +700,7 @@ app.factory('api_statistic', ['BpmRestangular', function (BpmRestangular) {
         // exportData: function(reportView, uuid, reportfileName){
         //     return  reportService.one('query/rest/export/xls/?exportname='+reportfileName+'xls');
 
-        // }   
+        // }
         getTask: function (userid, idx, sum) {
             return table.customGET('getTask/' + userid + '/' + idx + '/' + sum);
         },

assets/views/incident/tpl/toAssign.tpl.html

@@ -21,7 +21,7 @@
             </div>
         </div>
     </div>
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="!isGroup">
         <div class=" input-group" style="margin:8px 0 0;">
             <div class="control-label pull-left margin-top-5 margin-right-5">
                 <label class="demoincident">指派对象</label>:</div>