工作分配自选排班的科室绑定人员添加科室类型

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

@@ -157,6 +157,21 @@
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item *ngIf="queryParamsType == 2 && quickCombinationModel == 3">
+            <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="requireDept" nzFor="deptTypeIds">选择科室类型
+            </nz-form-label>
+            <nz-form-control nzErrorTip="请选择科室类型!">
+              <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false"
+                formControlName="deptTypeIds" nzShowSearch nzAllowClear nzPlaceHolder="请选择科室类型" nzServerSearch (nzOpenChange)="getDeptTypeList($event)">
+                <ng-container *ngFor="let data of deptTypeList">
+                  <nz-option *ngIf="!dLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="dLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
           <nz-form-item *ngIf="queryParamsType==1"
             [hidden]="quickCombinationModel == 1||quickCombinationModel==2||quickCombinationModel===''">
             <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="requireDept" nzFor="quickCombinationDept">选择科室

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

@@ -50,6 +50,7 @@ export class QuickCombinationComponent implements OnInit {
   quickCombinationModel;
   requireGroup = false;
   requireDept = false;
+  requireDeptType = false;
   queryParamsId = ""; //方案id
   queryParamsName = ""; //方案名称
   queryParamsType: any = ""; //方案类型,1是综合排班，2是自选排班
@@ -212,7 +213,13 @@ export class QuickCombinationComponent implements OnInit {
               if (!this.copyFlag) {
                 if (this.info.ruleType == 2) {
                   this.getGroupList(true, "", true);
-                } else if (this.info.ruleType == 3 || this.info.ruleType == 4) {
+                } else if (this.info.ruleType == 3) {
+                  if(this.queryParamsType == 1){
+                    this.getDeptList(true, "", true);
+                  }else{
+                    this.getDeptTypeList(true, true);
+                  }
+                } else if (this.info.ruleType == 4) {
                   this.getDeptList(true, "", true);
                 } else {
                   this.message.remove(this.maskFlag);
@@ -417,26 +424,33 @@ export class QuickCombinationComponent implements OnInit {
     if (this.quickCombinationModel == 1) {
       this.requireGroup = false;
       this.requireDept = false;
+      this.requireDeptType = false;
     } else if (this.quickCombinationModel == 2) {
       this.requireGroup = false;
       this.requireDept = false;
+      this.requireDeptType = false;
     } else if (this.quickCombinationModel == 3) {
       if (this.queryParamsType == 1) {
         this.requireGroup = false;
         this.requireDept = true;
+        this.requireDeptType = false;
       } else if (this.queryParamsType == 2) {
         this.requireGroup = false;
         this.requireDept = false;
+        this.requireDeptType = true;
       }
     } else if (this.quickCombinationModel == 4) {
       this.requireGroup = false;
       this.requireDept = true;
+      this.requireDeptType = false;
     }else if (this.quickCombinationModel == 5) {
       this.requireGroup = false;
       this.requireDept = false;
+      this.requireDeptType = false;
     }else if (this.quickCombinationModel == 6) {
       this.requireGroup = false;
       this.requireDept = false;
+      this.requireDeptType = false;
     }
     if (!this.requireGroup) {
       this.validateForm.get("quickCombinationGroup")!.clearValidators();
@@ -460,6 +474,17 @@ export class QuickCombinationComponent implements OnInit {
     }
     this.validateForm.get("quickCombinationDept")!.updateValueAndValidity();
     // ------
+    if (!this.requireDeptType) {
+      this.validateForm.get("deptTypeIds")!.clearValidators();
+      this.validateForm.get("deptTypeIds")!.markAsPristine();
+    } else {
+      this.validateForm
+        .get("deptTypeIds")!
+        .setValidators(Validators.required);
+      this.validateForm.get("deptTypeIds")!.markAsDirty();
+    }
+    this.validateForm.get("deptTypeIds")!.updateValueAndValidity();
+    // ------
     if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1)) {
       this.validateForm.get("quickCombinationDispatchMethod")!.clearValidators();
       this.validateForm.get("quickCombinationDispatchMethod")!.markAsPristine();
@@ -540,6 +565,39 @@ export class QuickCombinationComponent implements OnInit {
     this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
     this.validateForm.controls.quickCombinationDispatchWeight.setValue(null);
   }
+
+  //获取科室类型列表
+  deptTypeList:any[] = [];
+  getDeptTypeList(flag?, fedit?) {
+    if (!flag) {
+      return;
+    }
+    this.dLoading = true;
+    this.mainService
+      .getDictionary("list", "dept_type")
+      .subscribe((data) => {
+        this.dLoading = false;
+        this.deptTypeList = data;
+        if (fedit) {
+          switch (this.info.ruleType) {
+            case 1:
+              break;
+            case 2:
+              break;
+            case 3:
+              if(this.queryParamsType == 2){
+                console.log(this.info);
+                let deptTypeList = this.info.deptTypeList || [];
+                this.validateForm.controls.deptTypeIds.setValue(deptTypeList.map(v => v.id.toString()));
+              }
+              break;
+            case 4:
+              break;
+          }
+        }
+      });
+  }
+
   deptList = []; //科室列表
   dLoading = false;
   dNum = 0;
@@ -1002,6 +1060,7 @@ export class QuickCombinationComponent implements OnInit {
       quickCombinationModel: [null, [Validators.required]],
       quickCombinationDept: this.requireGroup ? [null, [Validators.required]] : [null],
       quickCombinationGroup: this.requireDept ? [null, [Validators.required]] : [null],
+      deptTypeIds: this.requireDeptType ? [null, [Validators.required]] : [null],
       quickCombinationDispatchMethod: [null],
       quickCombinationDispatchType: [null],
       quickCombinationDispatchWeight: [null],
@@ -1079,6 +1138,11 @@ export class QuickCombinationComponent implements OnInit {
         maxWeight: (this.validateForm.value.quickCombinationDispatchMethod == 2 && this.validateForm.value.quickCombinationDispatchType == 1) ? this.validateForm.value.quickCombinationDispatchWeight : undefined,
       },
     };
+    console.log(this.validateForm.value.deptTypeIds);
+    //添加科室类型字段
+    if (this.validateForm.value.deptTypeIds && this.quickCombinationModel == 3 && this.queryParamsType == 2) {
+      data["workAllocationQuickConfig"]["deptTypeIds"] = this.validateForm.value.deptTypeIds.toString();
+    }
     //添加科室字段,绑定人字段
     if (
       this.validateForm.value.quickCombinationDept &&

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.41');
+    console.info('v2.4.42');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)