来电弹屏测试

assets/js/controllers/mainCtrl.js

@@ -3803,7 +3803,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           // }else{
           //   var curentHospital = $rootScope.user.duty?{id:$rootScope.user.duty.branch,hosName:$rootScope.user.duty.branchName}:$rootScope.user.branch;
           // }
-          if(modelData){
+          if(modelData && type !== 'incomingCall'){
             var curentHospital = {id: modelData.branch, hosName: modelData.branchName};
           }else{
             var curentHospital = $rootScope.user.duty?{id:$rootScope.user.duty.branch,hosName:$rootScope.user.duty.branchName}:$rootScope.user.branch;
@@ -3834,7 +3834,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             //来电生成事件，数据回显
             //暂存生成事件，数据回显
             // 报修图片
-            if (modelData.incident) {
+            if (modelData.incident && modelData.incident.id) {
               $rootScope.isMask = true;
               api_wechatfile.listAttachment("wechatRequesterIncident", modelData.incident.id).then( (res) => {
                   $rootScope.isMask = false;
@@ -5176,7 +5176,9 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             newVal && $scope.jry_incident(newVal.id);
             console.log(newVal);
 
-            if($scope.modelData && (newVal.id === oldVal.id || newVal == oldVal)){
+            if($scope.modelData && newVal == oldVal){
+
+            }else if($scope.modelData && newVal.id === oldVal.id){
 
             }else{
               if(newVal){