自动派单接口联调

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

@@ -198,8 +198,7 @@
             <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>
+                <label nz-radio [nzValue]="item.value" *ngFor="let item of dispatchMethods">{{item.name}}</label>
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
@@ -207,8 +206,7 @@
             <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>
+                <label nz-radio [nzValue]="item.value" *ngFor="let item of dispatchTypes">{{item.name}}</label>
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>

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

@@ -87,6 +87,8 @@ export class QuickCombinationComponent implements OnInit {
     this.currentHospital = this.tool.getCurrentHospital();
     this.initForm();
     this.getList(1);
+    this.getDispatchMethods();
+    this.getDispatchTypes();
   }
   // 重置
   reset() {
@@ -466,7 +468,12 @@ export class QuickCombinationComponent implements OnInit {
       this.validateForm.get("quickCombinationDispatchMethod")!.markAsDirty();
     }
     this.validateForm.get("quickCombinationDispatchMethod")!.updateValueAndValidity();
-    this.validateForm.controls.quickCombinationDispatchMethod.setValue(null);
+    if(this.add){
+      this.validateForm.controls.quickCombinationDispatchMethod.setValue(null);
+    }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();
@@ -482,10 +489,32 @@ export class QuickCombinationComponent implements OnInit {
       this.validateForm.get("quickCombinationDispatchWeight")!.markAsDirty();
     }
     this.validateForm.get("quickCombinationDispatchType")!.updateValueAndValidity();
-    this.validateForm.controls.quickCombinationDispatchType.setValue(null);
+    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();
-    this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
+    if(this.add){
+      this.validateForm.controls.quickCombinationDispatchWeight.setValue(0);
+    }else{
+      this.validateForm.controls.quickCombinationDispatchWeight.setValue(this.info.maxWeight || null);
+    }
+  }
+  //获取派单方式
+  dispatchMethods:any[] = [];
+  getDispatchMethods() {
+    this.mainService.getDictionary("list", "dispatchMethod").subscribe((data) => {
+      this.dispatchMethods = data;
+    });
+  }
+  //获取派单类型
+  dispatchTypes:any[] = [];
+  getDispatchTypes() {
+    this.mainService.getDictionary("list", "dispatchType").subscribe((data) => {
+      this.dispatchTypes = data;
+    });
   }
   // 选择派单方式
   radioDispatchMethod(){
@@ -1026,6 +1055,9 @@ export class QuickCombinationComponent implements OnInit {
         taskTypes: taskTypesIds,
         ruleType: this.quickCombinationModelComputed,
         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,
       },
     };
     //添加科室字段,绑定人字段

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

@@ -262,12 +262,16 @@
           <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" />
+          <nz-form-label class="label">急单权重</nz-form-label>
+          <input nz-input type="number" min="0" class="mb8" [(ngModel)]="urgeWeight" 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" />
+          <nz-form-label class="label">普单权重</nz-form-label>
+          <input nz-input type="number" min="0" 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" />
         </div>
       </div>
       <!-- 规则信息 -->

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

@@ -83,8 +83,9 @@ export class TaskTypeManagementComponent implements OnInit {
   allScheduleClass; //班次列表
   //基础信息详情字段
   taskName; //任务名称
-  urgentWeight:number = 0; //急单权重
-  generalWeight:number = 0; //普单权重
+  urgeWeight:any; //急单权重
+  commonWeight:any; //普单权重
+  countRemark:string = ''; //统计备注
   association: any = {
     id: "",
     value: "",
@@ -828,6 +829,9 @@ export class TaskTypeManagementComponent implements OnInit {
     };
     this.taskData.taskType["id"] = data.id;
     this.taskName = data.taskName;
+    this.urgeWeight = data.urgeWeight;
+    this.commonWeight = data.commonWeight;
+    this.countRemark = data.countRemark || '';
     this.association = {
       id: data.associationType.id + "",
       value: data.associationType.value,
@@ -1132,6 +1136,9 @@ export class TaskTypeManagementComponent implements OnInit {
     } else {
       this.taskData.taskType["taskName"] = this.taskName;
     }
+    this.taskData.taskType["urgeWeight"] = this.urgeWeight;
+    this.taskData.taskType["commonWeight"] = this.commonWeight;
+    this.taskData.taskType["countRemark"] = this.countRemark;
     if (this.association.id) {
       this.taskData.taskType["associationType"] = this.association;
     } else {
@@ -1455,6 +1462,9 @@ export class TaskTypeManagementComponent implements OnInit {
     this.departmentIds = "";
     this.departmentTypeIds = "";
     this.taskName = ""; //任务名称
+    this.urgeWeight = ''; 
+    this.commonWeight = ''; 
+    this.countRemark = ''; 
     this.association = {
       id: null,
       value: "",