优化

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

@@ -18,7 +18,7 @@
           <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>
-          <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')">
+          <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' || orderInfo.taskType.ordinaryField.value === 'specimenPackage')">
             <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>

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

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

src/app/views/batch-specimen/batch-specimen.component.ts

@@ -217,7 +217,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
           this.message.success("操作成功");
           setTimeout(()=>{
             this.printBtn.nativeElement.click();
-            this.router.navigateByUrl("/main/orderManagement");
+            this.goBack();
           },0)
         } else {
           this.message.error(data.msg || "操作失败");