顺序派单才有最高权重

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

@@ -205,12 +205,12 @@
           <nz-form-item [hidden]="!(queryParamsType == 1 && quickCombinationModel == 1 && validateForm.value.quickCombinationDispatchMethod == 2)">
             <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="quickCombinationDispatchType">自动派单类型</nz-form-label>
             <nz-form-control nzErrorTip="请选择自动派单类型!">
-              <nz-radio-group formControlName="quickCombinationDispatchType">
+              <nz-radio-group formControlName="quickCombinationDispatchType" (ngModelChange)="radioDispatchType($event)">
                 <label nz-radio [nzValue]="item.value" *ngFor="let item of dispatchTypes">{{item.name}}</label>
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
-          <nz-form-item [hidden]="!(queryParamsType == 1 && quickCombinationModel == 1 && validateForm.value.quickCombinationDispatchMethod == 2)">
+          <nz-form-item [hidden]="!(queryParamsType == 1 && quickCombinationModel == 1 && validateForm.value.quickCombinationDispatchMethod == 2 && validateForm.value.quickCombinationDispatchType == 1)">
             <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="quickCombinationDispatchWeight">最高权重</nz-form-label>
             <nz-form-control nzErrorTip="请选择最高权重!">
               <nz-input-group>

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

@@ -477,24 +477,25 @@ export class QuickCombinationComponent implements OnInit {
     if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1 && this.validateForm.value.quickCombinationDispatchMethod == 2)) {
       this.validateForm.get("quickCombinationDispatchType")!.clearValidators();
       this.validateForm.get("quickCombinationDispatchType")!.markAsPristine();
-
-      this.validateForm.get("quickCombinationDispatchWeight")!.clearValidators();
-      this.validateForm.get("quickCombinationDispatchWeight")!.markAsPristine();
     } else {
       this.validateForm.get("quickCombinationDispatchType")!.setValidators(Validators.required);
       this.validateForm.get("quickCombinationDispatchType")!.markAsDirty();
-
-      this.validateForm.get("quickCombinationDispatchWeight")!.setValidators(Validators.required);
-      this.validateForm.get("quickCombinationDispatchWeight")!.markAsDirty();
     }
     this.validateForm.get("quickCombinationDispatchType")!.updateValueAndValidity();
-    this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
     if(this.add){
       this.validateForm.controls.quickCombinationDispatchType.setValue(null);
     }else{
       this.validateForm.controls.quickCombinationDispatchType.setValue(this.info.dispatchType ? this.info.dispatchType.value : null);
     }
-
+    // ------
+    if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1 && this.validateForm.value.quickCombinationDispatchMethod == 2 && this.validateForm.value.quickCombinationDispatchType == 1)) {
+      this.validateForm.get("quickCombinationDispatchWeight")!.clearValidators();
+      this.validateForm.get("quickCombinationDispatchWeight")!.markAsPristine();
+    } else {
+      this.validateForm.get("quickCombinationDispatchWeight")!.setValidators(Validators.required);
+      this.validateForm.get("quickCombinationDispatchWeight")!.markAsDirty();
+    }
+    this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
     if(this.add){
       this.validateForm.controls.quickCombinationDispatchWeight.setValue(null);
     }else{
@@ -520,19 +521,23 @@ export class QuickCombinationComponent implements OnInit {
     if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1 && this.validateForm.value.quickCombinationDispatchMethod == 2)) {
       this.validateForm.get("quickCombinationDispatchType")!.clearValidators();
       this.validateForm.get("quickCombinationDispatchType")!.markAsPristine();
-
-      this.validateForm.get("quickCombinationDispatchWeight")!.clearValidators();
-      this.validateForm.get("quickCombinationDispatchWeight")!.markAsPristine();
     } else {
       this.validateForm.get("quickCombinationDispatchType")!.setValidators(Validators.required);
       this.validateForm.get("quickCombinationDispatchType")!.markAsDirty();
-
+    }
+    this.validateForm.get("quickCombinationDispatchType")!.updateValueAndValidity();
+    this.validateForm.controls.quickCombinationDispatchType.setValue(null);
+  }
+  // 选择自动派单类型
+  radioDispatchType(){
+    if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1 && this.validateForm.value.quickCombinationDispatchMethod == 2 && this.validateForm.value.quickCombinationDispatchType == 1)) {
+      this.validateForm.get("quickCombinationDispatchWeight")!.clearValidators();
+      this.validateForm.get("quickCombinationDispatchWeight")!.markAsPristine();
+    } else {
       this.validateForm.get("quickCombinationDispatchWeight")!.setValidators(Validators.required);
       this.validateForm.get("quickCombinationDispatchWeight")!.markAsDirty();
     }
-    this.validateForm.get("quickCombinationDispatchType")!.updateValueAndValidity();
     this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
-    this.validateForm.controls.quickCombinationDispatchType.setValue(null);
     this.validateForm.controls.quickCombinationDispatchWeight.setValue(null);
   }
   deptList = []; //科室列表
@@ -1071,7 +1076,7 @@ export class QuickCombinationComponent implements OnInit {
         workSchemeId: this.queryParamsId,
         dispatchMethod: this.dispatchMethods.find(v => v.value == this.validateForm.value.quickCombinationDispatchMethod),
         dispatchType: this.validateForm.value.quickCombinationDispatchMethod == 2 ? (this.dispatchTypes.find(v => v.value == this.validateForm.value.quickCombinationDispatchType)) : undefined,
-        maxWeight: this.validateForm.value.quickCombinationDispatchMethod == 2 ? this.validateForm.value.quickCombinationDispatchWeight : undefined,
+        maxWeight: (this.validateForm.value.quickCombinationDispatchMethod == 2 && this.validateForm.value.quickCombinationDispatchType == 1) ? this.validateForm.value.quickCombinationDispatchWeight : undefined,
       },
     };
     //添加科室字段,绑定人字段