seimin преди 1 година
родител
ревизия
7e1227e6ef
променени са 1 файла, в които са добавени 6 реда и са изтрити 1 реда
  1. 6 1
      assets/js/controllers/incident/incidentCtrl.js

+ 6 - 1
assets/js/controllers/incident/incidentCtrl.js

@@ -2336,6 +2336,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2336
                     var handlerIncidentId = undefined;
2336
                     var handlerIncidentId = undefined;
2337
                     if(model.state.value == "pending"){
2337
                     if(model.state.value == "pending"){
2338
                         taskType = 'receiveform';
2338
                         taskType = 'receiveform';
2339
+                        handlerIncidentId = model.id;
2339
                     }else if(model.state.value == "handler"){
2340
                     }else if(model.state.value == "handler"){
2340
                         taskType = 'handlerform';
2341
                         taskType = 'handlerform';
2341
                         handlerIncidentId = model.id;
2342
                         handlerIncidentId = model.id;
@@ -2457,12 +2458,16 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
2457
                         });
2458
                         });
2458
                         return;
2459
                         return;
2459
                     }
2460
                     }
2461
+                    var taskType = undefined;
2460
                     var handlerIncidentId = undefined;
2462
                     var handlerIncidentId = undefined;
2461
                     if(model.state.value == "pending"){
2463
                     if(model.state.value == "pending"){
2464
+                        taskType = 'receiveform';
2465
+                        handlerIncidentId = model.id;
2462
                     }else if(model.state.value == "handler"){
2466
                     }else if(model.state.value == "handler"){
2467
+                        taskType = 'handlerform';
2463
                         handlerIncidentId = model.id;
2468
                         handlerIncidentId = model.id;
2464
                     }
2469
                     }
2465
-                    api_bpm_domain.delegateTask(model.taskId, {group:$scope.assignGroup, handlerIncidentId}).then(function (response) {
2470
+                    api_bpm_domain.delegateTask(model.taskId, {group:$scope.assignGroup, taskType, handlerIncidentId}).then(function (response) {
2466
                         console.log(response)
2471
                         console.log(response)
2467
                         if (response.status == 200) {
2472
                         if (response.status == 200) {
2468
                             Alert.swal({
2473
                             Alert.swal({