seimin 3 years ago
parent
commit
71641cf68c
1 changed files with 28 additions and 14 deletions
  1. 28 14
      src/app/views/round-robin/round-robin.component.ts

+ 28 - 14
src/app/views/round-robin/round-robin.component.ts

@@ -450,6 +450,20 @@ export class RoundRobinComponent implements OnInit {
450 450
         postData.orderPlan.taskTypeDeptOrder =
451 451
           this.validateForm.value.openDepartments;
452 452
       }
453
+      if (this.validateForm.value.timeStep == "day") {
454
+        delete postData.orderPlan.extra1;
455
+      } else if (this.validateForm.value.timeStep == "week") {
456
+        postData.orderPlan.extra1 = this.validateForm.value.doWeek;
457
+      } else if (this.validateForm.value.timeStep == "month") {
458
+        postData.orderPlan.extra1 = this.validateForm.value.doMonth;
459
+      } else if (this.validateForm.value.timeStep == "year") {
460
+        delete postData.orderPlan.extra1;
461
+        postData.orderPlan.executeTime = new Date(
462
+          format(new Date(this.validateForm.value.doYear), "yyyy-MM-dd") +
463
+            " " +
464
+            format(new Date(this.validateForm.value.executeTime), "HH:mm:ss")
465
+        ).getTime();
466
+      }
453 467
     } else {
454 468
       //编辑
455 469
       postData = {
@@ -468,20 +482,20 @@ export class RoundRobinComponent implements OnInit {
468 482
         //其他配送
469 483
         postData.taskTypeDeptOrder = this.validateForm.value.openDepartments;
470 484
       }
471
-    }
472
-    if (this.validateForm.value.timeStep == "day") {
473
-      delete postData.orderPlan.extra1;
474
-    } else if (this.validateForm.value.timeStep == "week") {
475
-      postData.orderPlan.extra1 = this.validateForm.value.doWeek;
476
-    } else if (this.validateForm.value.timeStep == "month") {
477
-      postData.orderPlan.extra1 = this.validateForm.value.doMonth;
478
-    } else if (this.validateForm.value.timeStep == "year") {
479
-      delete postData.orderPlan.extra1;
480
-      postData.executeTime = new Date(
481
-        format(new Date(this.validateForm.value.doYear), "yyyy-MM-dd") +
482
-          " " +
483
-          format(new Date(this.validateForm.value.executeTime), "HH:mm:ss")
484
-      ).getTime();
485
+      if (this.validateForm.value.timeStep == "day") {
486
+        delete postData.extra1;
487
+      } else if (this.validateForm.value.timeStep == "week") {
488
+        postData.extra1 = this.validateForm.value.doWeek;
489
+      } else if (this.validateForm.value.timeStep == "month") {
490
+        postData.extra1 = this.validateForm.value.doMonth;
491
+      } else if (this.validateForm.value.timeStep == "year") {
492
+        delete postData.extra1;
493
+        postData.executeTime = new Date(
494
+          format(new Date(this.validateForm.value.doYear), "yyyy-MM-dd") +
495
+            " " +
496
+            format(new Date(this.validateForm.value.executeTime), "HH:mm:ss")
497
+        ).getTime();
498
+      }
485 499
     }
486 500
     console.log(postData);
487 501
     // return; //baba