bug修复

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

@@ -214,7 +214,7 @@
             <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="quickCombinationDispatchWeight">最高权重</nz-form-label>
             <nz-form-control nzErrorTip="请选择最高权重!">
               <nz-input-group>
-                <input nz-input type="number" formControlName="quickCombinationDispatchWeight" min="0" placeholder="请输入最高权重" />
+                <input nz-input type="number" formControlName="quickCombinationDispatchWeight" placeholder="请输入最高权重" />
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>

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

@@ -473,7 +473,6 @@ export class QuickCombinationComponent implements OnInit {
     }else{
       this.validateForm.controls.quickCombinationDispatchMethod.setValue(this.info.dispatchMethod ? this.info.dispatchMethod.value : null);
     }
-    
     // ------
     if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1 && this.validateForm.value.quickCombinationDispatchMethod == 2)) {
       this.validateForm.get("quickCombinationDispatchType")!.clearValidators();
@@ -489,17 +488,17 @@ export class QuickCombinationComponent implements OnInit {
       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);
     }
 
-    this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
     if(this.add){
-      this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
+      this.validateForm.controls.quickCombinationDispatchWeight.setValue(null);
     }else{
-      this.validateForm.controls.quickCombinationDispatchWeight.setValue(this.info.maxWeight || null);
+      this.validateForm.controls.quickCombinationDispatchWeight.setValue(this.info.maxWeight);
     }
   }
   //获取派单方式
@@ -518,8 +517,23 @@ export class QuickCombinationComponent implements OnInit {
   }
   // 选择派单方式
   radioDispatchMethod(){
+    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();
     this.validateForm.controls.quickCombinationDispatchType.setValue(null);
-    this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
+    this.validateForm.controls.quickCombinationDispatchWeight.setValue(null);
   }
   deptList = []; //科室列表
   dLoading = false;
@@ -985,7 +999,7 @@ export class QuickCombinationComponent implements OnInit {
       quickCombinationGroup: this.requireDept ? [null, [Validators.required]] : [null],
       quickCombinationDispatchMethod: [null],
       quickCombinationDispatchType: [null],
-      quickCombinationDispatchWeight: [0],
+      quickCombinationDispatchWeight: [null],
     });
   }
   // 初始化新增form表单

src/app/views/task-type-management/task-type-management.component.html

@@ -263,15 +263,15 @@
         </div>
         <div nz-row>
           <nz-form-label class="label">急单权重</nz-form-label>
-          <input nz-input type="number" min="0" class="mb8" [(ngModel)]="urgeWeight" placeholder="请填写急单权重" nzSize="default" />
+          <input nz-input type="number" class="mb8" [(ngModel)]="urgeWeight" placeholder="请填写急单权重" nzSize="default" />
         </div>
         <div nz-row>
           <nz-form-label class="label">普单权重</nz-form-label>
-          <input nz-input type="number" min="0" class="mb8" [(ngModel)]="commonWeight" placeholder="请填写普单权重" nzSize="default" />
+          <input nz-input type="number" class="mb8" [(ngModel)]="commonWeight" placeholder="请填写普单权重" nzSize="default" />
         </div>
         <div nz-row>
           <nz-form-label class="label">统计备注</nz-form-label>
-          <input nz-input type="text" min="0" class="mb8" [(ngModel)]="countRemark" placeholder="请填写统计备注" nzSize="default" />
+          <input nz-input type="text" class="mb8" [(ngModel)]="countRemark" placeholder="请填写统计备注" nzSize="default" />
         </div>
       </div>
       <!-- 规则信息 -->