浏览代码

新药品详情

seimin 5 月之前
父节点
当前提交
90068db1ad

+ 5 - 2
src/app/share/detail-ordinary/detail-ordinary.component.html

@@ -120,7 +120,10 @@
120
       (click)="openRecallModal()">撤回</button>
120
       (click)="openRecallModal()">撤回</button>
121
     <button *ngIf="showCoop&&(orderInfo.gdState.value==2||orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button
121
     <button *ngIf="showCoop&&(orderInfo.gdState.value==2||orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button
122
       nzType="danger" (click)="openDelModal()">删除</button> -->
122
       nzType="danger" (click)="openDelModal()">删除</button> -->
123
-    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo)">
123
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
124
+      业务数据
125
+    </button>
126
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && (orderInfo.taskType.ordinaryField.value == 'drugsJpbag' || orderInfo.taskType.ordinaryField.value == 'drugsWestern' || orderInfo.taskType.ordinaryField.value == 'drugsReturn' || orderInfo.taskType.ordinaryField.value == 'drugsPoison' || orderInfo.taskType.ordinaryField.value == 'drugsHerbal')" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, orderInfo.taskType.ordinaryField.value)">
124
       业务数据
127
       业务数据
125
     </button>
128
     </button>
126
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
129
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
@@ -162,7 +165,7 @@
162
 <app-businessData-detail-modal
165
 <app-businessData-detail-modal
163
   *ngIf="bloodModalShow"
166
   *ngIf="bloodModalShow"
164
   [show]="bloodModalShow"
167
   [show]="bloodModalShow"
165
-  type="blood"
168
+  [type]="businessDataModalType"
166
   [orderId]="orderId"
169
   [orderId]="orderId"
167
   (closeModelHs)="closeModelBlood($event)"
170
   (closeModelHs)="closeModelBlood($event)"
168
 ></app-businessData-detail-modal>
171
 ></app-businessData-detail-modal>

+ 3 - 1
src/app/share/detail-ordinary/detail-ordinary.component.ts

@@ -74,8 +74,10 @@ export class DetailOrdinaryComponent implements OnInit {
74
   // 查看业务数据
74
   // 查看业务数据
75
   bloodModalShow = false; //业务数据弹窗开关
75
   bloodModalShow = false; //业务数据弹窗开关
76
   orderId = ""; //查看业务数据携带
76
   orderId = ""; //查看业务数据携带
77
-  viewDetail(data) {
77
+  businessDataModalType = ''; //业务数据类型
78
+  viewDetail(data, type) {
78
     this.orderId = data.id;
79
     this.orderId = data.id;
80
+    this.businessDataModalType = type;
79
     this.bloodModalShow = true;
81
     this.bloodModalShow = true;
80
   }
82
   }
81
   // 关闭业务数据弹窗
83
   // 关闭业务数据弹窗