事件列表和事件详情处理人+协同人

assets/js/controllers/incident/incidentCtrl.js

@@ -326,7 +326,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 displayName: '受理人|处理人/组',
                 width: 150,
                 cellTemplate: '<div style="width: 100%;">' +
-                    '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br>{{row.entity.groupORHandlerUser || "无"}}</div>' +
+                    '<div class="ui-grid-cell-contents">{{row.entity.acceptUser ? row.entity.acceptUser.name : "无"}}<br><span tooltip="{{grid.appScope.transferSynergetic(row.entity)}}" tooltip-placement="top">{{grid.appScope.transferSynergetic(row.entity)}}</span></div>' +
                     '</div>'
             },
             {
@@ -370,6 +370,14 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             return '无';
         }
     }
+    // 转换协同人
+    $scope.transferSynergetic = function(incidentData){
+        let str = incidentData.groupORHandlerUser || "";
+        if(incidentData.synergetic && incidentData.synergetic.length){
+            str += '，' + incidentData.synergetic.map(v => v.name).join('，');
+        }
+        return str;
+    }
     $scope.transferHandlerLog = function (currentLog) {
         if(!currentLog){
             return '无';

assets/js/controllers/incident/incidentDetailCtrl.js

@@ -71,6 +71,22 @@ app.controller('incidentDetailCtrl', ["$scope", "$http", "i18nService", "$rootSc
         });
     };
 
+    // 转换协同人
+    $scope.transferSynergetic = function(synergetic){
+      return synergetic.length ? synergetic.map(v => v.name).join('，') : ''
+    }
+
+    // 转换处理人
+    $scope.transferUser = function(incidentData){
+      if(incidentData.state.value == 'pending' && incidentData.currentLog){
+        return incidentData.currentLog.workerName;
+      }else if(incidentData.state.value != 'pending' && incidentData.handlingPersonnelUser){
+        return incidentData.handlingPersonnelUser.name;
+      }else{
+        return '';
+      }
+    }
+
     // 拨打电话
     $scope.dialout = function (teleno) {
       $rootScope.callout = 2;

assets/views/incident/incidentDetail.html

@@ -431,6 +431,26 @@
                         </div>
                     </div>
                 </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>处理人:</label>
+                            <div>
+                                <input class="form-control" ng-value="transferUser(model)" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-xs-4 ui-label">
+                    <div class="form-group">
+                        <div class="padding-top-5">
+                            <label>协同人:</label>
+                            <div>
+                                <input class="form-control" ng-value="transferSynergetic(model.synergetic)" type="text" disabled="disabled" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div class="col-xs-12 ui-divTextarea">
                     <div class="form-group">
                         <div class="padding-top-5">