页面修改

src/app/share/detail-ordinary/detail-ordinary.component.html

@@ -1,4 +1,4 @@
-<!-- 标本 -->
+<!-- 万能交接 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
   <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
@@ -18,9 +18,11 @@
           <div nz-col nzSpan="8">起点科室：{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
           <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">配送人员信息：{{orderInfo.worker.name}}</div>
-          <div nz-col nzSpan="8">应收数量：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:'无'}}</div>
-          <div nz-col nzSpan="8">实收数量：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:'无'}}</div>
-          <div nz-col nzSpan="8">送达数量：{{orderInfo.deliveryNum?orderInfo.deliveryNum:'无'}}</div>
+          <ng-container *ngIf="!(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')">
+            <div nz-col nzSpan="8">应收数量：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:'无'}}</div>
+            <div nz-col nzSpan="8">实收数量：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:'无'}}</div>
+            <div nz-col nzSpan="8">送达数量：{{orderInfo.deliveryNum?orderInfo.deliveryNum:'无'}}</div>
+          </ng-container>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
           </div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">

src/app/share/order-detail/order-detail.component.html

@@ -877,7 +877,7 @@
             配送人员信息：{{ orderInfo.worker ? orderInfo.worker.name : "" }}
           </div>
         </div>
-        <div class="info" nz-row>
+        <div class="info" nz-row *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'))">
           <div nz-col nzSpan="6">
             应收数量：{{ orderInfo.expectReceiveNum || "无" }}
           </div>