21.报修转事件的时候，暂存和直接处理，修改后的信息不对

assets/js/controllers/mainCtrl.js

@@ -3766,7 +3766,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           //   var curentHospital = $rootScope.user.duty?{id:$rootScope.user.duty.branch,hosName:$rootScope.user.duty.branchName}:$rootScope.user.branch;
           // }
           if(modelData){
-            var curentHospital = {};
+            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;
           }
@@ -3805,8 +3805,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
               contacts: modelData.incident.contacts, //联系人
               contactsInformation: modelData.incident.contactsInformation, //联系电话
               branch: curentHospital, //院区
-              area: type === 'incomingCall' ? (modelData.incident.department ? modelData.incident.department.area : "") : modelData.incident.area, //区域
-              place: type === 'incomingCall' ? (modelData.incident.department ? modelData.incident.department.place : "") : modelData.incident.place, //地点
+              area: type === 'incomingCall' ? (modelData.incident.department ? (modelData.incident.department.place ? modelData.incident.department.place.area : "") : "") : (modelData.incident.place ? modelData.incident.place.area : ""), //区域
+              place: type === 'incomingCall' ? (modelData.incident.department ? (modelData.incident.department.place || "") : "") : (modelData.incident.place || ""), //地点
               address: type === 'incomingCall' ? (modelData.incident.department ? modelData.incident.department.address : "") : modelData.incident.houseNumber, //详细地址
               priority: modelData.incident.priority, //优先级
               description: modelData.incident.description, //故障描述
@@ -4714,22 +4714,25 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           $scope.jry_requesterSearch();
           $scope.$watch("incidentModel.requester", function (newVal,oldVal) {
             if(newVal){
-              $scope.incidentModel.contacts = newVal.name;
-              SweetAlert.swal({
-                title: "提示",
-                text: "是否覆盖联系电话?",
-                type: "warning",
-                showCancelButton: true,
-                confirmButtonColor: "#DD6B55",
-                confirmButtonText: "确认覆盖",
-                cancelButtonText: "取消操作",
-                closeOnConfirm: true,
-                closeOnCancel: true
-              }, function (isConfirm) {
-                  if (isConfirm) {
-                    $scope.incidentModel.contactsInformation = newVal.phone;
-                  }
-              });
+              if($scope.modelData && newVal.id == oldVal.id){
+              }else{
+                $scope.incidentModel.contacts = newVal.name;
+                SweetAlert.swal({
+                  title: "提示",
+                  text: "是否覆盖联系电话?",
+                  type: "warning",
+                  showCancelButton: true,
+                  confirmButtonColor: "#DD6B55",
+                  confirmButtonText: "确认覆盖",
+                  cancelButtonText: "取消操作",
+                  closeOnConfirm: true,
+                  closeOnCancel: true
+                }, function (isConfirm) {
+                    if (isConfirm) {
+                      $scope.incidentModel.contactsInformation = newVal.phone;
+                    }
+                });
+              }
             }
           });
           // 处理人模糊搜索
@@ -5044,21 +5047,22 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             newVal && $scope.jry_incident(newVal.id);
             console.log(newVal);
 
-            if(newVal){
-              api_bpm_data.fetchData('department', $scope.incidentModel.department.id).then(res=>{
-                if(res.status == 200){
-                  // $scope.incidentModel.department = res.data;
-                  if(res.data && res.data.place){
-                    $scope.incidentModel.place = res.data.place;
-                    $scope.incidentModel.area = res.data.place.area;
+            if($scope.modelData && newVal.id == oldVal.id){
+
+            }else{
+              if(newVal){
+                if($scope.incidentModel.department){
+                  if($scope.incidentModel.department.place){
+                    $scope.incidentModel.place = $scope.incidentModel.department.place;
+                    $scope.incidentModel.area = $scope.incidentModel.department.place.area;
                   }else{
                     $scope.incidentModel.place = '';
                     $scope.incidentModel.area = '';
                   }
-                  $scope.incidentModel.address = res.data.address || '';
+                  $scope.incidentModel.address = $scope.incidentModel.department.address || '';
 
                   // 如果回显的有联系电话，联系电话不用科室带出
-                  !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (res.data&&res.data.phone)?res.data.phone.split(',')[0]:'');
+                  !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = ($scope.incidentModel.department.phone)?$scope.incidentModel.department.phone.split(',')[0]:'');
                 }else{
                   $scope.incidentModel.place = '';
                   $scope.incidentModel.area = '';
@@ -5066,24 +5070,46 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                   // 如果回显的有联系电话，联系电话不用科室带出
                   !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
                 }
-              })
-            }else{
-              $scope.incidentModel.place = '';
-              $scope.incidentModel.area = '';
-              $scope.incidentModel.address = '';
-              // 如果回显的有联系电话，联系电话不用科室带出
-              !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
+                // api_bpm_data.fetchData('department', $scope.incidentModel.department.id).then(res=>{
+                //   if(res.status == 200){
+                //     // $scope.incidentModel.department = res.data;
+                //     if(res.data && res.data.place){
+                //       $scope.incidentModel.place = res.data.place;
+                //       $scope.incidentModel.area = res.data.place.area;
+                //     }else{
+                //       $scope.incidentModel.place = '';
+                //       $scope.incidentModel.area = '';
+                //     }
+                //     $scope.incidentModel.address = res.data.address || '';
+
+                //     // 如果回显的有联系电话，联系电话不用科室带出
+                //     !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (res.data&&res.data.phone)?res.data.phone.split(',')[0]:'');
+                //   }else{
+                //     $scope.incidentModel.place = '';
+                //     $scope.incidentModel.area = '';
+                //     $scope.incidentModel.address = '';
+                //     // 如果回显的有联系电话，联系电话不用科室带出
+                //     !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
+                //   }
+                // })
+              }else{
+                $scope.incidentModel.place = '';
+                $scope.incidentModel.area = '';
+                $scope.incidentModel.address = '';
+                // 如果回显的有联系电话，联系电话不用科室带出
+                !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
+              }
+              // if(newVal && newVal.place){
+              //   $scope.incidentModel.place = newVal.place;
+              //   $scope.incidentModel.area = newVal.place.area;
+              // }else{
+              //   $scope.incidentModel.place = '';
+              //   $scope.incidentModel.area = '';
+              // }
+
+              // // 如果回显的有联系电话，联系电话不用科室带出
+              // !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
             }
-            // if(newVal && newVal.place){
-            //   $scope.incidentModel.place = newVal.place;
-            //   $scope.incidentModel.area = newVal.place.area;
-            // }else{
-            //   $scope.incidentModel.place = '';
-            //   $scope.incidentModel.area = '';
-            // }
-
-            // // 如果回显的有联系电话，联系电话不用科室带出
-            // !(oldVal && !oldVal.dept) && ($scope.incidentModel.contactsInformation = (newVal&&newVal.phone)?newVal.phone:'');
           });
           // 知识库
           $scope.jry_solution = function (id,key='') {