派人派组BUG

assets/js/controllers/mainCtrl.js

@@ -4197,9 +4197,43 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           };
 
           // 处理人/处理组加责任科室搜索
-          $scope.userAndGroupSearch = function(){
-            $scope.jry_userSearch();
-            $scope.jry_groupSearch();
+          $scope.userAndGroupSearch = async function(){
+            // $scope.jry_userSearch();
+            // $scope.jry_groupSearch();
+            var userData = {
+              idx: 0,
+              sum: 1000,
+              user: {
+                duty: $scope.selectedDuty || undefined,
+                roledata: {rolecode: "first-line support"},
+                selectDetails:'1',
+                simple:true,
+                name: key,
+                selectType: "pinyin_qs",
+                engineer: 1,
+              },
+            };
+
+            var groupData = {
+              idx: 0,
+              sum: 1000,
+              group: {
+                duty: $scope.selectedDuty || undefined,
+                selectType: "nouser"
+              },
+            };
+
+            let userResult = await api_user_data.fetchDataList("user", userData);
+            let groupResult = await api_user_data.fetchDataList("group", groupData);
+
+            $scope.jry_userData = userResult.list;
+            if($scope.incidentModel.user){
+              if(!$scope.incidentModel.user.name){
+                $scope.incidentModel.user = userResult.list.find(v=>v.id == $scope.incidentModel.user.id);
+              }
+            }
+
+            $scope.jry_groupData = groupResult.list;
             // if($scope.incidentModel.assign == 0){
             //   $scope.jry_userSearch();
             //   $scope.jry_groupSearch();
@@ -4226,6 +4260,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                 if(result.status == 200){
                   var deptBinduserConfig = result.list?result.list[0]:null;//获取第一条配置
                   if(deptBinduserConfig){
+                    $scope.userAndGroupSearch();
                     // 如果有科室绑定人员的配置
                     if(deptBinduserConfig.userOrGroupType == 1){
                       // 派单给人
@@ -4236,7 +4271,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                       $scope.incidentModel.assign = 2;
                       $scope.incidentModel.group = $scope.jry_groupData.find(v=>v.id == deptBinduserConfig.group);
                     }
-                    $scope.userAndGroupSearch();
+
                   }else{
                     // 没有查询到科室绑定人员的配置，则根据院区，普通科室，责任科室查询
                     var postData = {
@@ -4257,6 +4292,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                         // 获取第一条配置
                         deptBinduserConfig = deptBinduserConfig[0] || null;
                         if(deptBinduserConfig){
+                          $scope.userAndGroupSearch();
                           // 如果有科室绑定人员的配置
                           if(deptBinduserConfig.userOrGroupType == 1){
                             // 派单给人
@@ -4267,7 +4303,6 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
                             $scope.incidentModel.assign = 2;
                             $scope.incidentModel.group = $scope.jry_groupData.find(v=>v.id == deptBinduserConfig.group);
                           }
-                          $scope.userAndGroupSearch();
                         }else{
                           if($scope.categorySelect){
                             // 选择了故障现象
@@ -4952,6 +4987,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
           function assignCommon(sj){
             console.log(sj);
             if(!sj){return;}
+            $scope.userAndGroupSearch();
             if (sj.branchType == 0) {
               if (sj.userOrGroupType === 1) {
                 //派人
@@ -4998,7 +5034,6 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
               }
             }
 
-            $scope.userAndGroupSearch();
           }
 
           // 取消故障描述弹窗
@@ -5135,7 +5170,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
             newVal && $scope.jry_incident(newVal.id);
             console.log(newVal);
 
-            if($scope.modelData && newVal.id == oldVal.id){
+            if($scope.modelData && (newVal.id === oldVal.id || newVal == oldVal)){
 
             }else{
               if(newVal){