分组增加派单分组和统计分组

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

@@ -152,6 +152,23 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupType"
+              >分组类型</nz-form-label
+            >
+            <nz-form-control nzErrorTip="请选择分组类型!">
+              <nz-select
+                [nzDropdownMatchSelectWidth]="false"
+                formControlName="groupType"
+                nzShowSearch
+                nzAllowClear
+                nzPlaceHolder="请选择分组类型"
+              >
+                <nz-option nzLabel="统计分组" nzValue="1"></nz-option>
+                <nz-option nzLabel="派单分组" nzValue="2"></nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="groupLeader"
               >分组组长</nz-form-label
             >
@@ -161,7 +178,7 @@
                 class="formItem"
                 nzServerSearch
                 nzShowSearch
-                nzAllowClear
+                [nzLoading]="editLoading" 
                 nzPlaceHolder="请选择分组组长"
                 formControlName="groupLeader"
                 (nzOnSearch)="changeInp($event)"

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

@@ -76,7 +76,7 @@ export class GroupManagementComponent implements OnInit {
   }
   // 打开搜索框
   changeSearch(flag) {
-    if (flag) {
+    if (flag && !this.editLoading) {
       this.changeInp();
     }
   }
@@ -270,6 +270,7 @@ export class GroupManagementComponent implements OnInit {
   // 新增/编辑模态框
   coopModal: boolean = false; //模态框是否展示
   add: boolean = true; //true：新增；false：编辑
+  editLoading = false;
   showCoopModal(type) {
     if (type == "edit" && !this.checkedGroup["groupName"]) {
       this.msg.create("warning", "请选择需要编辑的分组！");
@@ -278,28 +279,39 @@ export class GroupManagementComponent implements OnInit {
     this.coopModal = true;
     this.add = type == "add";
     if (type == "edit") {
+      this.validateForm.controls.groupLeader.setValue(null);//先清空组长
       this.validateForm.controls.classes.setValue(
         this.checkedGroup["scheduleClass"].id + ""
       );
       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.groupType.setValue(
+        this.checkedGroup["type"].toString()
+      );
+      if (this.checkedGroup["manager"]) {
+        this.editLoading = true;
+        this.mainService
+          .getFetchData("data", "user", this.checkedGroup["manager"])
+          .subscribe((result) => {
+            this.editLoading = false;
+            if (result.status == 200) {
+              if (result.data) {
+                this.userList.unshift(result.data);
+              }
+              this.validateForm.controls.groupLeader.setValue(
+                this.checkedGroup["manager"].toString()
+              );
             }
-            this.validateForm.controls.groupLeader.setValue(
-              this.checkedGroup["manager"].toString()
-            );
-          }
-        });
+          });
+      } else {
+        this.validateForm.controls.groupLeader.setValue(null);
+      }
     } else {
       this.validateForm.controls.classes.setValue(null);
       this.validateForm.controls.groupName.setValue(null);
       this.validateForm.controls.groupLeader.setValue(null);
+      this.validateForm.controls.groupType.setValue(null);
     }
   }
   // 隐藏分组信息模态框
@@ -312,6 +324,7 @@ export class GroupManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       classes: [null, [Validators.required]],
       groupName: [null, [Validators.required]],
+      groupType: [null, [Validators.required]],
       groupLeader: [null, [Validators.required]],
     });
   }
@@ -332,6 +345,7 @@ export class GroupManagementComponent implements OnInit {
         hospital: { id: that.hosId - 0 },
         scheduleClass: { id: that.validateForm.value.classes - 0 },
         manager: that.validateForm.value.groupLeader,
+        type: that.validateForm.value.groupType,
       },
     };
     if (!that.add) {

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

@@ -553,7 +553,7 @@ export class QuickCombinationComponent implements OnInit {
       return;
     }
     let hosIds = this.currentHospital.id;
-    let postData = {
+    let postData:any = {
       idx: 0,
       sum: 20,
       group2: {
@@ -564,6 +564,10 @@ export class QuickCombinationComponent implements OnInit {
         hospitals: hosIds,
       },
     };
+    console.log(this.queryParamsType,this.quickCombinationModel);
+    if(this.queryParamsType == 2 && (this.quickCombinationModel == 5 || this.quickCombinationModel == 6)){
+      postData.group2.type = 2;
+    }
     this.gLoading = true;
     this.gNum++;
     this.mainService