事件详情添加回访

assets/js/controllers/incident/incidentCtrl.js

@@ -877,6 +877,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 engineer: 1,
             }
         }
+				if($rootScope.user.duty){
+						delete filuser.user.branchId
+				    filuser.user.dutyId = $rootScope.user.duty.id;
+				}else if($rootScope.user.branch){
+						delete filuser.user.dutyId
+				    filuser.user.branchId = $rootScope.user.branch.id;
+				}
         getUser(filuser, 1);
     }
     //处理人过滤
@@ -890,6 +897,13 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                 engineer: 1,
             }
         }
+				if($rootScope.user.duty){
+						delete filuser.user.branchId
+				    filuser.user.dutyId = $rootScope.user.duty.id;
+				}else if($rootScope.user.branch){
+						delete filuser.user.dutyId
+				    filuser.user.branchId = $rootScope.user.branch.id;
+				}
         getUser(filuser, 2);
     }
 
@@ -1429,7 +1443,6 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     };
     //回访
     $scope.visit = function (model) {
-        console.log(model)
         var modalInstance = $modal.open({
             backdrop: false,
             templateUrl: 'assets/views/incident/tpl/callback.tpl.html',

assets/views/incident/incidentDetail.html

@@ -560,6 +560,8 @@
                 <button type="submit" ng-if="vm.model.submit" ladda="ldloading.expand_right " style="height: 34px;"
                     data-style="expand-right " class="btn btn-addbutton addbutton "
                     ng-disabled="ldloading.expand_right ">{{vm.model.submit}}</button>
+								<button type="close" ng-if="model.state.name=='已关闭'" class="btn btn-default default" ng-click="payReturn()"
+										>回访</button>
                 <button type="close" class="btn btn-default default" ng-click="closeModel()"
                     translate="form.button.CLOSE">CLOSE</button>
             </div>