自动派单-等接口

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

@@ -194,6 +194,32 @@
               </nz-select>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item [hidden]="!(queryParamsType == 1 && quickCombinationModel == 1)">
+            <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="quickCombinationDispatchMethod">派单方式</nz-form-label>
+            <nz-form-control nzErrorTip="请选择派单方式!">
+              <nz-radio-group formControlName="quickCombinationDispatchMethod" (ngModelChange)="radioDispatchMethod($event)">
+                <label nz-radio nzValue="1">抢派单结合</label>
+                <label nz-radio nzValue="2">自动派单</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <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">
+                <label nz-radio nzValue="1">顺序派单</label>
+                <label nz-radio nzValue="2">最优路径</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item [hidden]="!(queryParamsType == 1 && quickCombinationModel == 1 && validateForm.value.quickCombinationDispatchMethod == 2)">
+            <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="请输入最高权重" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
         </form>
       </div>
       <div class=" display_flex justify-content_flex-center">

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

@@ -457,6 +457,40 @@ export class QuickCombinationComponent implements OnInit {
       this.validateForm.get("quickCombinationDept")!.markAsDirty();
     }
     this.validateForm.get("quickCombinationDept")!.updateValueAndValidity();
+    // ------
+    if (!(this.queryParamsType == 1 && this.quickCombinationModel == 1)) {
+      this.validateForm.get("quickCombinationDispatchMethod")!.clearValidators();
+      this.validateForm.get("quickCombinationDispatchMethod")!.markAsPristine();
+    } else {
+      this.validateForm.get("quickCombinationDispatchMethod")!.setValidators(Validators.required);
+      this.validateForm.get("quickCombinationDispatchMethod")!.markAsDirty();
+    }
+    this.validateForm.get("quickCombinationDispatchMethod")!.updateValueAndValidity();
+    this.validateForm.controls.quickCombinationDispatchMethod.setValue(null);
+    // ------
+    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.controls.quickCombinationDispatchType.setValue(null);
+
+    this.validateForm.get("quickCombinationDispatchWeight")!.updateValueAndValidity();
+    this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
+  }
+  // 选择派单方式
+  radioDispatchMethod(){
+    this.validateForm.controls.quickCombinationDispatchType.setValue(null);
+    this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
   }
   deptList = []; //科室列表
   dLoading = false;
@@ -918,12 +952,11 @@ export class QuickCombinationComponent implements OnInit {
       quickCombinationClass: [null, [Validators.required]],
       quickCombinationType: [null, [Validators.required]],
       quickCombinationModel: [null, [Validators.required]],
-      quickCombinationDept: this.requireGroup
-        ? [null, [Validators.required]]
-        : [null],
-      quickCombinationGroup: this.requireDept
-        ? [null, [Validators.required]]
-        : [null],
+      quickCombinationDept: this.requireGroup ? [null, [Validators.required]] : [null],
+      quickCombinationGroup: this.requireDept ? [null, [Validators.required]] : [null],
+      quickCombinationDispatchMethod: [null],
+      quickCombinationDispatchType: [null],
+      quickCombinationDispatchWeight: [0],
     });
   }
   // 初始化新增form表单

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

@@ -261,6 +261,14 @@
           <nz-form-label class="label">携带设备</nz-form-label>
           <nz-checkbox-group class="handlerType" [nzDisabled]="isRemarks == 1" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
         </div>
+        <div nz-row>
+          <nz-form-label class="label" nzRequired>急单权重</nz-form-label>
+          <input nz-input type="number" min="0" class="mb8" [(ngModel)]="urgentWeight" placeholder="请填写急单权重" nzSize="default" />
+        </div>
+        <div nz-row>
+          <nz-form-label class="label" nzRequired>普单权重</nz-form-label>
+          <input nz-input type="number" min="0" class="mb8" [(ngModel)]="generalWeight" placeholder="请填写普单权重" nzSize="default" />
+        </div>
       </div>
       <!-- 规则信息 -->
       <div *ngIf="tabModalName=='gzxx'" class="ruleList">

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

@@ -83,6 +83,8 @@ export class TaskTypeManagementComponent implements OnInit {
   allScheduleClass; //班次列表
   //基础信息详情字段
   taskName; //任务名称
+  urgentWeight:number = 0; //急单权重
+  generalWeight:number = 0; //普单权重
   association: any = {
     id: "",
     value: "",