工作分配自选排班工作组合增加科室绑定分组和绑定分组

src/app/views/group-management/group-management.component.html

@@ -2,47 +2,95 @@
   <div class="groupInfo">
     <div class="title">分组信息</div>
     <div class="operate">
-      <div *ngIf="coopBtns.add" class="add item" (click)="showCoopModal('add')">新增</div>
-      <div *ngIf="coopBtns.edit" class="edit item" (click)="showCoopModal('edit')">编辑</div>
-      <div *ngIf="coopBtns.del" class="del item" (click)="showDelModal()">删除</div>
+      <div *ngIf="coopBtns.add" class="add item" (click)="showCoopModal('add')">
+        新增
+      </div>
+      <div
+        *ngIf="coopBtns.edit"
+        class="edit item"
+        (click)="showCoopModal('edit')"
+      >
+        编辑
+      </div>
+      <div *ngIf="coopBtns.del" class="del item" (click)="showDelModal()">
+        删除
+      </div>
     </div>
-    <div class="groups" [ngStyle]="{display:!loading1?'block':'none'}">
-      <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height:'100%' }">
-        <div [ngClass]="{'item':true,'checked':data.id==checkedGroup.id}" *ngFor="let data of groupList"
-          (click)="checkGroup(data)" [title]="data.scheduleClass.name+' '+data.groupName">
-          {{data.scheduleClass.name}} {{data.groupName}}</div>
+    <div class="groups" [ngStyle]="{ display: !loading1 ? 'block' : 'none' }">
+      <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height: '100%' }">
+        <div
+          [ngClass]="{ item: true, checked: data.id == checkedGroup.id }"
+          *ngFor="let data of groupList"
+          (click)="checkGroup(data)"
+          [title]="data.scheduleClass.name + ' ' + data.groupName"
+        >
+          {{ data.scheduleClass.name }} {{ data.groupName }}
+        </div>
       </overlay-scrollbars>
     </div>
     <div class="groups" *ngIf="loading1">
-      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+      <div
+        class="loadingFull display_flex justify-content_flex-center align-items_center"
+      >
         <div class="loadingFullInner">
-          <img src="../../../assets/images/loading.gif" alt="">
+          <img src="../../../assets/images/loading.gif" alt="" />
           <div>加载中...</div>
         </div>
       </div>
     </div>
   </div>
   <div class="userInfo">
-    <div class="top display_flex justify-content_space-between align-items_center">
+    <div
+      class="top display_flex justify-content_space-between align-items_center"
+    >
       <div class="display_flex align-items_center">
         <span>用户信息：</span>
-        <input nz-input placeholder="请输入用户信息" [(ngModel)]="searchName" nzSize="default"
-          (ngModelChange)="searchInp($event)" />
+        <input
+          nz-input
+          placeholder="请输入用户信息"
+          [(ngModel)]="searchName"
+          nzSize="default"
+          (ngModelChange)="searchInp($event)"
+        />
       </div>
       <div class="display_flex align-items_center">
-        <span>已选择 {{usersArr.length}} 人</span>
-        <button class="btn default" *ngIf="coopBtns.edit&&groupList.length" nzType="primary" nz-button
-          [nzLoading]="saveLoading" (click)="save()">保存</button>
+        <span>已选择 {{ usersArr.length }} 人</span>
+        <button
+          class="btn default"
+          *ngIf="coopBtns.edit && groupList.length"
+          nzType="primary"
+          nz-button
+          [nzLoading]="saveLoading"
+          (click)="save()"
+        >
+          保存
+        </button>
       </div>
     </div>
     <div class="table" *ngIf="!loading1">
-      <nz-table class="groupManagementTable" #rowSelectionTable [nzPageSize]="9999" [nzData]="allUserList"
-        [nzShowPagination]="false" #fixedTable [nzScroll]="{ y: tableHeight+'px' }" [nzLoading]="loading2">
+      <nz-table
+        class="groupManagementTable"
+        #rowSelectionTable
+        [nzPageSize]="9999"
+        [nzData]="allUserList"
+        [nzShowPagination]="false"
+        #fixedTable
+        [nzScroll]="{ y: tableHeight + 'px' }"
+        [nzLoading]="loading2"
+      >
         <tbody>
-          <tr *ngFor="let data of rowSelectionTable.data" (click)="selectedUser(data)">
-            <td style="text-align: left;cursor: pointer;" nzShowCheckbox [(nzDisabled)]="!coopBtns.edit"
-              [(nzChecked)]="mapOfCheckedId[data.id]" (nzCheckedChange)="refreshStatus()"></td>
-            <td>{{data.dept.dept}} {{ data.name }}</td>
+          <tr
+            *ngFor="let data of rowSelectionTable.data"
+            (click)="selectedUser(data)"
+          >
+            <td
+              style="text-align: left; cursor: pointer"
+              nzShowCheckbox
+              [(nzDisabled)]="!coopBtns.edit"
+              [(nzChecked)]="mapOfCheckedId[data.id]"
+              (nzCheckedChange)="refreshStatus()"
+            ></td>
+            <td>{{ data.dept.dept }} {{ data.name }}</td>
           </tr>
         </tbody>
       </nz-table>
@@ -50,43 +98,127 @@
   </div>
 
   <!-- 新增/编辑模态框 -->
-  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="coopModal">
+  <div
+    class="save display_flex justify-content_flex-center align-items_center add"
+    *ngIf="coopModal"
+  >
     <div class="modalBody">
-      <div class="title">{{add?'新增':'编辑'}}分组信息<i class="icon_transport transport-guanbi" (click)="hideCoopModal()"></i>
+      <div class="title">
+        {{ add ? "新增" : "编辑" }}分组信息<i
+          class="icon_transport transport-guanbi"
+          (click)="hideCoopModal()"
+        ></i>
       </div>
       <div class="content">
-        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+        <form
+          nz-form
+          [formGroup]="validateForm"
+          class="addForm"
+          (ngSubmit)="submitForm()"
+        >
           <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="classes">所属班次</nz-form-label>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="classes"
+              >所属班次</nz-form-label
+            >
             <nz-form-control nzErrorTip="请选择所属班次!">
-              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="classes" nzShowSearch nzAllowClear
-                nzPlaceHolder="请选择所属班次">
-                <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of scheduleList"></nz-option>
+              <nz-select
+                [nzDropdownMatchSelectWidth]="false"
+                formControlName="classes"
+                nzShowSearch
+                nzAllowClear
+                nzPlaceHolder="请选择所属班次"
+              >
+                <nz-option
+                  nzLabel="{{ data.name }}"
+                  nzValue="{{ data.id }}"
+                  *ngFor="let data of scheduleList"
+                ></nz-option>
               </nz-select>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupName">分组名称</nz-form-label>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupName"
+              >分组名称</nz-form-label
+            >
             <nz-form-control nzErrorTip="请输入分组名称!">
               <nz-input-group>
-                <input type="groupName" nz-input formControlName="groupName" placeholder="请输入分组名称" />
+                <input
+                  type="groupName"
+                  nz-input
+                  formControlName="groupName"
+                  placeholder="请输入分组名称"
+                />
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupLeader"
+              >分组组长</nz-form-label
+            >
+            <nz-form-control nzErrorTip="请输入分组组长!">
+              <nz-select
+                [nzDropdownMatchSelectWidth]="false"
+                class="formItem"
+                nzServerSearch
+                nzShowSearch
+                nzAllowClear
+                nzPlaceHolder="请选择分组组长"
+                formControlName="groupLeader"
+                (nzOnSearch)="changeInp($event)"
+                (nzOpenChange)="changeSearch($event)"
+              >
+                <ng-container *ngFor="let data of userList">
+                  <nz-option
+                    *ngIf="!isLoading"
+                    nzLabel="{{ data.name }}"
+                    nzValue="{{ data.id }}"
+                  ></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i>
+                  搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
         </form>
       </div>
-      <div class=" display_flex justify-content_flex-center">
-        <button nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">确认</button>
-        <button class="btn cancel" nz-button nzType="default" (click)="hideCoopModal()">取消</button>
+      <div class="display_flex justify-content_flex-center">
+        <button
+          nzType="primary"
+          [nzLoading]="btnLoading"
+          nz-button
+          (click)="submitForm()"
+        >
+          确认
+        </button>
+        <button
+          class="btn cancel"
+          nz-button
+          nzType="default"
+          (click)="hideCoopModal()"
+        >
+          取消
+        </button>
       </div>
     </div>
   </div>
   <!-- 删除模态框 -->
-  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-    (confirmDelEvent)="confirmDel()" content="您确认要删除此分组吗？"></app-dialog-delete>
+  <app-dialog-delete
+    [delModal]="delModal"
+    (hideDelModalEvent)="hideDelModal()"
+    [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()"
+    content="您确认要删除此分组吗？"
+  ></app-dialog-delete>
 </div>
 
 <!-- 操作成功/失败提示框 -->
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo">
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+>
 </app-prompt-modal>

src/app/views/group-management/group-management.component.ts

@@ -6,6 +6,8 @@ import { NzMessageService } from "ng-zorro-antd/message";
 import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 
 @Component({
   selector: "app-group-management",
@@ -28,6 +30,11 @@ export class GroupManagementComponent implements OnInit {
   })
   osComponentRef1: OverlayScrollbarsComponent;
   ngOnInit() {
+    this.changeInpSubject
+      .pipe(debounceTime(500))
+      .subscribe((keyword: string) => {
+        this.getUserList(keyword);
+      });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
     this.getHospitalList();
@@ -46,6 +53,7 @@ export class GroupManagementComponent implements OnInit {
   hospitalList: Array<any> = []; //院区列表
   hosId: any; //当前选择的院区id
   scheduleList: Array<any> = []; //班次列表
+  userList: Array<any> = []; //用户列表
   searchName: string = ""; //用户信息搜索输入框
 
   promptContent: string; //操作提示框提示信息
@@ -55,10 +63,24 @@ export class GroupManagementComponent implements OnInit {
 
   btnLoading: boolean = false; //确认按钮loading状态
   saveLoading: boolean = false; //批量打印按钮loading状态
+  changeInpSubject = new Subject();
 
   // 初始化增删改按钮
   coopBtns: any = {};
 
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(keyword: string = "") {
+    this.isLoading = true;
+    this.changeInpSubject.next(keyword);
+  }
+  // 打开搜索框
+  changeSearch(flag) {
+    if (flag) {
+      this.changeInp();
+    }
+  }
+
   // 分组列表
   loading1 = false;
   getGroupList() {
@@ -162,6 +184,26 @@ export class GroupManagementComponent implements OnInit {
         this.scheduleList = data.list;
       });
   }
+  // 用户列表
+  getUserList(keyword: string = "") {
+    const data = {
+      idx: 0,
+      user: {
+        hospital: { id: this.hosId },
+        name: keyword,
+        simpleQuery: true,
+      },
+      sum: 5,
+    };
+    this.mainService
+      .getFetchDataList("data", "user", data)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.userList = result.list;
+        }
+      });
+  }
 
   // 选中分组
   positionY = 0; //记录其他建单Y轴滚动距离
@@ -229,23 +271,35 @@ export class GroupManagementComponent implements OnInit {
   coopModal: boolean = false; //模态框是否展示
   add: boolean = true; //true：新增；false：编辑
   showCoopModal(type) {
-    let that = this;
-    if (type == "edit" && !that.checkedGroup["groupName"]) {
-      that.msg.create("warning", "请选择需要编辑的分组！");
+    if (type == "edit" && !this.checkedGroup["groupName"]) {
+      this.msg.create("warning", "请选择需要编辑的分组！");
       return;
     }
-    that.coopModal = true;
-    that.add = type == "add";
+    this.coopModal = true;
+    this.add = type == "add";
     if (type == "edit") {
-      that.validateForm.controls.classes.setValue(
-        that.checkedGroup["scheduleClass"].id + ""
+      this.validateForm.controls.classes.setValue(
+        this.checkedGroup["scheduleClass"].id + ""
       );
-      that.validateForm.controls.groupName.setValue(
-        that.checkedGroup["groupName"]
+      this.validateForm.controls.groupName.setValue(
+        this.checkedGroup["groupName"]
       );
+      this.mainService
+        .getFetchData("data", "user", this.checkedGroup["manager"])
+        .subscribe((result) => {
+          if (result.status == 200) {
+            if (result.data) {
+              this.userList.unshift(result.data);
+            }
+            this.validateForm.controls.groupLeader.setValue(
+              this.checkedGroup["manager"].toString()
+            );
+          }
+        });
     } else {
-      that.validateForm.controls.classes.setValue(null);
-      that.validateForm.controls.groupName.setValue(null);
+      this.validateForm.controls.classes.setValue(null);
+      this.validateForm.controls.groupName.setValue(null);
+      this.validateForm.controls.groupLeader.setValue(null);
     }
   }
   // 隐藏分组信息模态框
@@ -258,6 +312,7 @@ export class GroupManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       classes: [null, [Validators.required]],
       groupName: [null, [Validators.required]],
+      groupLeader: [null, [Validators.required]],
     });
   }
 
@@ -276,6 +331,7 @@ export class GroupManagementComponent implements OnInit {
         groupName: that.validateForm.value.groupName,
         hospital: { id: that.hosId - 0 },
         scheduleClass: { id: that.validateForm.value.classes - 0 },
+        manager: that.validateForm.value.groupLeader,
       },
     };
     if (!that.add) {

src/app/views/quick-combination/quick-combination.component.html

@@ -45,6 +45,7 @@
             <th nzWidth="16%">工作模式</th>
             <th nzWidth="10%" *ngIf="queryParamsType==1">科室</th>
             <th nzWidth="8%" *ngIf="queryParamsType==1">分配人员/组</th>
+            <th nzWidth="8%" *ngIf="queryParamsType==2">分配组</th>
             <th nzWidth="33%">操作</th>
           </tr>
         </thead>
@@ -70,6 +71,10 @@
               <div class="orderPlanTimeShow2" nz-tooltip nzTooltipTitle="{{data.allName?data.allName.join('、'):''}}">
                 {{data.allName?data.allName.join('、'):''}}</div>
             </td>
+            <td *ngIf="queryParamsType==2">
+              <div class="orderPlanTimeShow2" nz-tooltip nzTooltipTitle="{{data.allName?data.allName.join('、'):''}}">
+                {{data.allName?data.allName.join('、'):''}}</div>
+            </td>
             <td>
               <div class="coop">
                 <span (click)="addPersonModal($event,data)" *ngIf="data.ruleType == 3&&queryParamsType==1">分配人员</span>
@@ -147,6 +152,8 @@
                 <label nz-radio nzValue="2" *ngIf="queryParamsType==1">指定分组</label>
                 <label nz-radio nzValue="3">科室绑定人员</label>
                 <label nz-radio nzValue="4" *ngIf="queryParamsType==1">科室绑定分组</label>
+                <label nz-radio nzValue="5" *ngIf="queryParamsType==2">科室绑定分组</label>
+                <label nz-radio nzValue="6" *ngIf="queryParamsType==2">绑定分组</label>
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
@@ -168,11 +175,13 @@
               </nz-select>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item *ngIf="queryParamsType==1" [hidden]="quickCombinationModel != 2||quickCombinationModel===''">
+          <nz-form-item [hidden]="
+          (queryParamsType==1&&(quickCombinationModel != 2||quickCombinationModel===''))||
+          (queryParamsType==2&&((quickCombinationModel != 5 && quickCombinationModel != 6)||quickCombinationModel===''))">
             <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="requireGroup" nzFor="quickCombinationGroup">选择分组
             </nz-form-label>
             <nz-form-control nzErrorTip="请选择分组!">
-              <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false"
+              <nz-select [nzMode]="quickCombinationModel == 6?'default':'multiple'" [nzDropdownMatchSelectWidth]="false"
                 formControlName="quickCombinationGroup" nzShowSearch nzAllowClear nzPlaceHolder="请选择分组" nzServerSearch
                 (nzOnSearch)="searchGroupList($event)" (nzOpenChange)="getGroupList($event)"
                 (ngModelChange)="selectGroupList($event)">

src/app/views/quick-combination/quick-combination.component.ts

@@ -30,6 +30,8 @@ export class QuickCombinationComponent implements OnInit {
         this.allWorkModel = [
           { id: 1, name: "自由抢单" },
           { id: 3, name: "科室绑定人员" },
+          { id: 4, name: "科室绑定分组" },
+          { id: 2, name: "绑定分组" },
         ];
       }
     });
@@ -193,7 +195,17 @@ export class QuickCombinationComponent implements OnInit {
               this.validateForm.controls.quickCombinationType.setValue(
                 this.info.taskTypesId
               ); //任务类型
-              this.quickCombinationModel = this.info.ruleType + "";
+              if(this.queryParamsType == 1){
+                this.quickCombinationModel = this.info.ruleType + "";
+              }else if(this.queryParamsType == 2){
+                if(this.info.ruleType == 2){
+                  this.quickCombinationModel = '6';
+                }else if(this.info.ruleType == 4){
+                  this.quickCombinationModel = '5';
+                }else{
+                  this.quickCombinationModel = this.info.ruleType + "";
+                }
+              }
               this.taskListFlag = false;
               if (!this.copyFlag) {
                 if (this.info.ruleType == 2) {
@@ -265,7 +277,17 @@ export class QuickCombinationComponent implements OnInit {
               );
               console.log(obj);
               if (obj) {
-                this.quickCombinationModel = obj.ruleType + "";
+                if(this.queryParamsType == 1){
+                  this.quickCombinationModel = obj.ruleType + "";
+                }else if(this.queryParamsType == 2){
+                  if(obj.ruleType == 2){
+                    this.quickCombinationModel = '6';
+                  }else if(obj.ruleType == 4){
+                    this.quickCombinationModel = '5';
+                  }else{
+                    this.quickCombinationModel = obj.ruleType + "";
+                  }
+                }
                 this.radioIt(1); //选择任务类型
                 this.taskListFlag = false;
               } else {
@@ -324,6 +346,17 @@ export class QuickCombinationComponent implements OnInit {
       this.searchTaskList("");
     }
   }
+  //对应ruleType与quickCombinationModel
+  get quickCombinationModelComputed(){
+    console.log(this.quickCombinationModel,'---------------------')
+    if(this.quickCombinationModel == 5){//科室绑定分组
+      return 4;
+    }else if(this.quickCombinationModel == 6){//绑定分组
+      return 2;
+    }else{
+      return this.quickCombinationModel;
+    }
+  }
   // 选中工作模式
   radioIt(flag?) {
     //undefined 打开复制弹窗，1 选择任务类型
@@ -332,21 +365,29 @@ export class QuickCombinationComponent implements OnInit {
       // 回显储存的值
       console.log(this.info, this.quickCombinationModel);
       if (
-        this.info.ruleType == this.quickCombinationModel &&
-        this.quickCombinationModel == 2
+        this.info.ruleType == this.quickCombinationModelComputed &&
+        (this.quickCombinationModel == 2 || this.quickCombinationModel == 5 || this.quickCombinationModel == 6)
       ) {
         this.groupList = this.info.groups;
         if (!this.copyFlag) {
-          this.validateForm.controls.quickCombinationGroup.setValue(
-            this.info.groupsId
-          );
+          if(this.quickCombinationModel == 6){
+            this.validateForm.controls.quickCombinationGroup.setValue((this.info.groupsId?this.info.groupsId[0] + '':null));
+          }else{
+            this.validateForm.controls.quickCombinationGroup.setValue(
+              this.info.groupsId
+            );
+          }
         } else {
           if (!flag) {
             this.validateForm.controls.quickCombinationGroup.setValue(null);
           } else {
-            this.validateForm.controls.quickCombinationGroup.setValue(
-              this.info.groupsId
-            );
+            if(this.quickCombinationModel == 6){
+              this.validateForm.controls.quickCombinationGroup.setValue((this.info.groupsId?this.info.groupsId[0] + '':null));
+            }else{
+              this.validateForm.controls.quickCombinationGroup.setValue(
+                this.info.groupsId
+              );
+            }
           }
         }
       }
@@ -388,6 +429,12 @@ export class QuickCombinationComponent implements OnInit {
     } else if (this.quickCombinationModel == 4) {
       this.requireGroup = false;
       this.requireDept = true;
+    }else if (this.quickCombinationModel == 5) {
+      this.requireGroup = false;
+      this.requireDept = false;
+    }else if (this.quickCombinationModel == 6) {
+      this.requireGroup = false;
+      this.requireDept = false;
     }
     if (!this.requireGroup) {
       this.validateForm.get("quickCombinationGroup")!.clearValidators();
@@ -460,19 +507,23 @@ export class QuickCombinationComponent implements OnInit {
                 this.validateForm.controls.quickCombinationDept.setValue(arr);
                 break;
               case 4:
-                let arr1 = [];
-                let arr11 = [];
-                this.info.departmentDTOS.forEach((item) => {
-                  arr1.push(item.id + "");
-                });
-                this.info.departmentDTOS.forEach((item) => {
-                  let flag = this.deptList.some((v) => v.id == item.id);
-                  if (!flag) {
-                    arr11.push(item);
-                  }
-                });
-                this.deptList = [...arr11, ...this.deptList];
-                this.validateForm.controls.quickCombinationDept.setValue(arr1);
+                if(this.queryParamsType == 1){
+                  let arr1 = [];
+                  let arr11 = [];
+                  this.info.departmentDTOS.forEach((item) => {
+                    arr1.push(item.id + "");
+                  });
+                  this.info.departmentDTOS.forEach((item) => {
+                    let flag = this.deptList.some((v) => v.id == item.id);
+                    if (!flag) {
+                      arr11.push(item);
+                    }
+                  });
+                  this.deptList = [...arr11, ...this.deptList];
+                  this.validateForm.controls.quickCombinationDept.setValue(arr1);
+                }else if(this.queryParamsType == 2){
+                  this.validateForm.controls.quickCombinationDept.setValue(null);
+                }
                 break;
             }
           }
@@ -543,13 +594,33 @@ export class QuickCombinationComponent implements OnInit {
                 });
                 this.groupList = [...arrr, ...this.groupList];
                 console.log(this.groupList, arrr, arr);
-                this.validateForm.controls.quickCombinationGroup.setValue(arr);
+                if(this.queryParamsType == 1){
+                  this.validateForm.controls.quickCombinationGroup.setValue(arr);
+                }else if(this.queryParamsType == 2){
+                  this.validateForm.controls.quickCombinationGroup.setValue(arr[0] + '');
+                }
                 break;
               case 3:
                 this.validateForm.controls.quickCombinationGroup.setValue(null);
                 break;
               case 4:
-                this.validateForm.controls.quickCombinationGroup.setValue(null);
+                if(this.queryParamsType == 1){
+                  this.validateForm.controls.quickCombinationGroup.setValue(null);
+                }else if(this.queryParamsType == 2){
+                  let arr = [];
+                  let arrr = [];
+                  this.info.groups.forEach((item) => {
+                    let flag = this.groupList.some((v) => v.id == item.id);
+                    arr.push(item.id + "");
+                    console.log(flag);
+                    if (!flag) {
+                      arrr.push(item);
+                    }
+                  });
+                  this.groupList = [...arrr, ...this.groupList];
+                  console.log(this.groupList, arrr, arr);
+                  this.validateForm.controls.quickCombinationGroup.setValue(arr);
+                }
                 break;
             }
           }
@@ -906,7 +977,7 @@ export class QuickCombinationComponent implements OnInit {
           id: this.validateForm.value.quickCombinationClass,
         },
         taskTypes: taskTypesIds,
-        ruleType: this.validateForm.value.quickCombinationModel,
+        ruleType: this.quickCombinationModelComputed,
         workSchemeId: this.queryParamsId,
       },
     };
@@ -973,21 +1044,34 @@ export class QuickCombinationComponent implements OnInit {
     console.log(this.validateForm.value.quickCombinationGroup);
     if (
       this.validateForm.value.quickCombinationGroup &&
-      this.quickCombinationModel == 2
+      (this.quickCombinationModel == 2 || this.quickCombinationModel == 5 || this.quickCombinationModel == 6)
     ) {
-      let groups = this.validateForm.value.quickCombinationGroup.map((item) => {
-        return {
-          id: item,
-        };
-      });
-      if (groups.length > 0) {
-        if (this.copyFlag) {
-          data["workAllocationQuickConfig"]["groups"] = null;
+      if(this.quickCombinationModel == 5){
+        let groups = this.validateForm.value.quickCombinationGroup.map((item) => {
+          return {
+            id: item,
+          };
+        });
+        if (groups.length > 0) {
+          if (this.copyFlag) {
+            data["workAllocationQuickConfig"]["groups"] = null;
+          } else {
+            data["workAllocationQuickConfig"]["groups"] = groups;
+          }
         } else {
-          data["workAllocationQuickConfig"]["groups"] = groups;
+          data["workAllocationQuickConfig"]["groups"] = null;
+        }
+      }else if(this.quickCombinationModel == 6){
+        if(this.validateForm.value.quickCombinationGroup){
+          let groups = [{id:this.validateForm.value.quickCombinationGroup}];
+          if (this.copyFlag) {
+            data["workAllocationQuickConfig"]["groups"] = null;
+          } else {
+            data["workAllocationQuickConfig"]["groups"] = groups;
+          }
+        }else{
+          data["workAllocationQuickConfig"]["groups"] = null;
         }
-      } else {
-        data["workAllocationQuickConfig"]["groups"] = null;
       }
     }
     if (!this.add && !this.copyFlag) {