Browse Source

Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc into develop

seimin 3 years ago
parent
commit
14024fc136
1 changed files with 24 additions and 6 deletions
  1. 24 6
      src/app/views/task-type-management/task-type-management.component.ts

+ 24 - 6
src/app/views/task-type-management/task-type-management.component.ts

@@ -673,12 +673,12 @@ export class TaskTypeManagementComponent implements OnInit {
673 673
 
674 674
       if (this.allScheduleClass[i].checked) {
675 675
         this.scheduleClassChecked.push(this.allScheduleClass[i]);
676
-        if (data.associationType.value=='specimen') {
676
+        if (data.associationType.value == "specimen") {
677 677
           this.autoClass.push(this.allScheduleClass[i]);
678 678
         }
679 679
       }
680 680
     }
681
-    if (data.associationType.value=='specimen') {
681
+    if (data.associationType.value == "specimen") {
682 682
       let ids = data.carryingCourses[0].createRuleConfiguration
683 683
         ? data.carryingCourses[0].createRuleConfiguration.map(
684 684
             (item) => item.classesId
@@ -1555,12 +1555,30 @@ export class TaskTypeManagementComponent implements OnInit {
1555 1555
   getcheckout() {
1556 1556
     var that = this;
1557 1557
     //静配type
1558
-    if (this.association.value == "jPBag") {
1559
-      this.jyfsType = "jPBag_method";
1558
+    if (
1559
+      this.carryingCourses[this.indexs].nodeId.id == 261 &&
1560
+      this.association.value == "jPBag"
1561
+    ) {
1562
+      this.jyfsType = "jPBag_start_method";
1563
+    }
1564
+    if (
1565
+      this.carryingCourses[this.indexs].nodeId.id == 263 &&
1566
+      this.association.value == "jPBag"
1567
+    ) {
1568
+      this.jyfsType = "jPBag_end_method";
1560 1569
     }
1561 1570
     //药品type
1562
-    if (this.association.value == "drugsBag") {
1563
-      this.jyfsType = "drugsBag_method";
1571
+    if (
1572
+      this.carryingCourses[this.indexs].nodeId.id == 261 &&
1573
+      this.association.value == "drugsBag"
1574
+    ) {
1575
+      this.jyfsType = "drugsBag_start_method";
1576
+    }
1577
+    if (
1578
+      this.carryingCourses[this.indexs].nodeId.id == 263 &&
1579
+      this.association.value == "drugsBag"
1580
+    ) {
1581
+      this.jyfsType = "drugsBag_end_method";
1564 1582
     }
1565 1583
     //标本type
1566 1584
     if (