浏览代码

护士端血制品详情

seimin 2 年之前
父节点
当前提交
ef2b2844a8

+ 0 - 1
src/app/views/fuwutai/fuwutai.component.ts

@@ -1097,7 +1097,6 @@ export class FuwutaiComponent implements OnInit {
1097
 
1097
 
1098
   // 查看工单详情
1098
   // 查看工单详情
1099
   openDetails(data) {
1099
   openDetails(data) {
1100
-    console.log(data);
1101
     if (data.taskType.associationType.value == 'specimen' || data.taskType.associationType.value == 'specimenPlan') {
1100
     if (data.taskType.associationType.value == 'specimen' || data.taskType.associationType.value == 'specimenPlan') {
1102
       // 标本类
1101
       // 标本类
1103
       this.router.navigateByUrl("dispatchingDesk/detailSample/" + data.id);
1102
       this.router.navigateByUrl("dispatchingDesk/detailSample/" + data.id);

+ 2 - 7
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1721,7 +1721,7 @@
1721
                   >
1721
                   >
1722
                     <div>状态:</div>
1722
                     <div>状态:</div>
1723
                     <div>
1723
                     <div>
1724
-                      <nz-select 
1724
+                      <nz-select
1725
                         style="width: 160px;"
1725
                         style="width: 160px;"
1726
                         class="formItem"
1726
                         class="formItem"
1727
                         [nzDropdownMatchSelectWidth]="false"
1727
                         [nzDropdownMatchSelectWidth]="false"
@@ -1966,12 +1966,7 @@
1966
                               nz-col
1966
                               nz-col
1967
                               nzSpan="12"
1967
                               nzSpan="12"
1968
                               class="col txtR toDetail"
1968
                               class="col txtR toDetail"
1969
-                              (click)="
1970
-                                openDetails(
1971
-                                  item.id,
1972
-                                  item.taskType.associationType.id
1973
-                                )
1974
-                              "
1969
+                              (click)="openDetails(item)"
1975
                             >
1970
                             >
1976
                               <span>查看详情>></span>
1971
                               <span>查看详情>></span>
1977
                             </div>
1972
                             </div>

+ 12 - 9
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -3172,19 +3172,22 @@ export class HushijiandanComponent implements OnInit {
3172
   }
3172
   }
3173
 
3173
 
3174
   // 查看工单详情
3174
   // 查看工单详情
3175
-  openDetails(id, typeId) {
3176
-    if (typeId == 256 || typeId == 380) {
3175
+  openDetails(data) {
3176
+    if (data.taskType.associationType.value == 'specimen' || data.taskType.associationType.value == 'specimenPlan') {
3177
       // 标本类
3177
       // 标本类
3178
-      this.router.navigateByUrl("nurse/detailSample/" + id);
3179
-    } else if (typeId == 260 || typeId == 255) {
3180
-      // 患者陪检/患者转运
3181
-      this.router.navigateByUrl("nurse/detailPatients/" + id);
3182
-    } else if (typeId == 257 || typeId == 258) {
3178
+      this.router.navigateByUrl("nurse/detailSample/" + data.id);
3179
+    } else if (data.taskType.associationType.value == 'inspect' || data.taskType.associationType.value == 'patientTransport') {
3180
+      // 送患者
3181
+      this.router.navigateByUrl("nurse/detailPatients/" + data.id);
3182
+    } else if (data.taskType.associationType.value == 'drugsBag' || data.taskType.associationType.value == 'jPBag') {
3183
       // 药品配送/静配
3183
       // 药品配送/静配
3184
-      this.router.navigate(["nurse/detailDrug/" + id]);
3184
+      this.router.navigateByUrl("nurse/detailDrug/" + data.id);
3185
+    } else if (data.taskType.associationType.value == 'ordinary' && data.taskType.ordinaryField.value == 'blood') {
3186
+      // 万能交接服务&&血制品
3187
+      this.router.navigateByUrl("nurse/detailBlood/" + data.id);
3185
     } else {
3188
     } else {
3186
       // 其他
3189
       // 其他
3187
-      this.router.navigateByUrl("nurse/detailOthers/" + id);
3190
+      this.router.navigateByUrl("nurse/detailOthers/" + data.id);
3188
     }
3191
     }
3189
   }
3192
   }
3190
 
3193