优化

src/app/views/limit-initiation-time/limit-initiation-time.component.html

@@ -58,9 +58,9 @@
       <div class="content">
         <form nz-form [formGroup]="validateForm" class="addForm">
           <nz-form-item>
-            <nz-form-label [nzSpan]="24" nzRequired nzFor="taskType">任务类型</nz-form-label>
+            <nz-form-label [nzSpan]="24" nzRequired nzFor="taskTypeIds">任务类型</nz-form-label>
             <nz-form-control nzErrorTip="请选择任务类型!">
-              <nz-select class="formItem" nzMode="multiple" (nzOnSearch)="changeInp($event, 'taskType')" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择任务类型" formControlName="taskType" (nzOpenChange)="getTaskTypeList($event)">
+              <nz-select class="formItem" nzMode="multiple" (nzOnSearch)="changeInp($event, 'taskTypeIds')" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择任务类型" formControlName="taskTypeIds" (nzOpenChange)="getTaskTypeList($event)">
                 <ng-container *ngFor="let option of taskTypeList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
                 </ng-container>

src/app/views/limit-initiation-time/limit-initiation-time.component.ts

@@ -47,7 +47,7 @@ export class LimitInitiationTimeComponent implements OnInit {
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      if(v[1] === 'taskType'){
+      if(v[1] === 'taskTypeIds'){
         this.getTaskTypeList(true, v[0]);
       }else if(v[1] === 'building'){
         this.getBuildingList(true, v[0]);
@@ -103,7 +103,7 @@ export class LimitInitiationTimeComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.listOfData = data.list.map(v => ({...v, taskNames: v.taskTypeDTO.map(v => v.taskName.toString())}));
+          this.listOfData = data.list.map(v => ({...v, taskNames: v.taskTypes.map(v => v.taskName.toString())}));
           this.listLength = data.totalNum;
         }
       });
@@ -253,7 +253,7 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.startTimeHourdis = () => [];
     this.startTimeMindis = () => [];
     this.validateForm = this.fb.group({
-      taskType: [null, [Validators.required]],
+      taskTypeIds: [null, [Validators.required]],
       limitAllDept: [1, [Validators.required]],
       buildingIds: [[]],
       deptIds: [[]],
@@ -385,7 +385,7 @@ export class LimitInitiationTimeComponent implements OnInit {
     if (this.add) {
       //增加
       data = {
-        taskType: this.validateForm.value.taskType.toString(),
+        taskTypeIds: this.validateForm.value.taskTypeIds.toString(),
         limitAllDept: this.validateForm.value.limitAllDept,
         buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
         deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
@@ -406,7 +406,7 @@ export class LimitInitiationTimeComponent implements OnInit {
       //编辑
       data = {
         ...this.coopId,
-        taskType: this.validateForm.value.taskType.toString(),
+        taskTypeIds: this.validateForm.value.taskTypeIds.toString(),
         limitAllDept: this.validateForm.value.limitAllDept,
         buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
         deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
@@ -451,8 +451,8 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.modal = true;
     this.coopId = data;
 
-    this.taskTypeList = data.taskTypeDTO || [];
-    this.validateForm.controls.taskType.setValue(this.taskTypeList.map(v => v.id)); //任务类型
+    this.taskTypeList = data.taskTypes || [];
+    this.validateForm.controls.taskTypeIds.setValue(this.taskTypeList.map(v => v.id)); //任务类型
 
     this.validateForm.controls.limitAllDept.setValue(data.limitAllDept); //是否限制所有科室