Explorar el Código

快速建单处理人处理组BUG

seimin hace 11 meses
padre
commit
be0afb54c7
Se han modificado 2 ficheros con 18 adiciones y 2 borrados
  1. 16 0
      assets/js/controllers/mainCtrl.js
  2. 2 2
      assets/views/newOrderSeimin.html

+ 16 - 0
assets/js/controllers/mainCtrl.js

@@ -4195,6 +4195,18 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
4195 4195
                 };
4196 4196
               });
4197 4197
           };
4198
+
4199
+          // 处理人/处理组加责任科室搜索
4200
+          $scope.userAndGroupSearch = function(){
4201
+            if($scope.incidentModel.assign == 0){
4202
+              $scope.jry_userSearch();
4203
+              $scope.jry_groupSearch();
4204
+            }else if($scope.incidentModel.assign == 1){
4205
+              $scope.jry_userSearch();
4206
+            }else if($scope.incidentModel.assign == 2){
4207
+              $scope.jry_groupSearch();
4208
+            }
4209
+          }
4198 4210
           // 回显处理人或组
4199 4211
           $scope.showUserOrGroup = function(){
4200 4212
             if($scope.incidentModel.department && $scope.categorySelect && $scope.selectedDuty && $scope.incidentModel.branch){
@@ -4222,6 +4234,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
4222 4234
                       $scope.incidentModel.assign = 2;
4223 4235
                       $scope.incidentModel.group = $scope.jry_groupData.find(v=>v.id == deptBinduserConfig.group);
4224 4236
                     }
4237
+                    $scope.userAndGroupSearch();
4225 4238
                   }else{
4226 4239
                     // 没有查询到科室绑定人员的配置,则根据院区,普通科室,责任科室查询
4227 4240
                     var postData = {
@@ -4252,6 +4265,7 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
4252 4265
                             $scope.incidentModel.assign = 2;
4253 4266
                             $scope.incidentModel.group = $scope.jry_groupData.find(v=>v.id == deptBinduserConfig.group);
4254 4267
                           }
4268
+                          $scope.userAndGroupSearch();
4255 4269
                         }else{
4256 4270
                           if($scope.categorySelect){
4257 4271
                             // 选择了故障现象
@@ -4981,6 +4995,8 @@ function ($rootScope, $scope, $state, $translate, $localStorage, $cookieStore, $
4981 4995
                 $scope.incidentModel.group = "";
4982 4996
               }
4983 4997
             }
4998
+
4999
+            $scope.userAndGroupSearch();
4984 5000
           }
4985 5001
 
4986 5002
           // 取消故障描述弹窗

+ 2 - 2
assets/views/newOrderSeimin.html

@@ -351,7 +351,7 @@
351 351
             派单给组
352 352
           </label>
353 353
         </div>
354
-        <div class="c_item clearfix" ng-if="incidentModel.assign==1">
354
+        <div class="c_item clearfix" ng-show="incidentModel.assign==1">
355 355
           <label><span class="colorRed">*</span>处理人:</label>
356 356
           <ui-select
357 357
             class="c_item_value"
@@ -374,7 +374,7 @@
374 374
             </ui-select-choices>
375 375
           </ui-select>
376 376
         </div>
377
-        <div class="c_item clearfix" ng-if="incidentModel.assign==2">
377
+        <div class="c_item clearfix" ng-show="incidentModel.assign==2">
378 378
           <label><span class="colorRed">*</span>处理组:</label>
379 379
           <ui-select
380 380
             class="c_item_value"