BUGFIX

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -24,10 +24,10 @@
             <th nzWidth="6%">打包人</th>
             <th nzWidth="15%">打包时间</th>
             <th nzWidth="6%">标本数</th>
-            <th nzWidth="6%">配送人</th>
-            <th nzWidth="15%">配送时间</th>
-            <th nzWidth="6%">接收人</th>
-            <th nzWidth="15%">接收时间</th>
+            <th nzWidth="6%">收取人</th>
+            <th nzWidth="15%">收取时间</th>
+            <th nzWidth="6%">送达人</th>
+            <th nzWidth="15%">送达时间</th>
             <th nzWidth="8%">状态</th>
             <th nzWidth="10%">操作</th>
           </tr>
@@ -38,10 +38,10 @@
             <td>{{ data.packUserDTO?.name }}</td>
             <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.specimenNum }}</td>
-            <td>{{ data.deliveryUserDTO?.name }}</td>
-            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.receiveUserDTO?.name }}</td>
             <td>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.deliveryUserDTO?.name }}</td>
+            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.status?.name }}</td>
             <td>
               <div class="coop">

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

@@ -58,7 +58,8 @@
   </nz-table>
 </div>
 <div class="footer display_flex align-items_center justify-content_flex-center">
-  <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0">打包</button>
+  <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0 && package.status.value === '0'">打包</button>
+  <button nzType="primary" class="btn" nz-button (click)='printPackage()' *ngIf="this.total > 0 && package.status.value === '1'">补打</button>
   <button nzType="default" nz-button class="btn cancel ml8" (click)='goBack()'>取消</button>
 </div>
 

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

@@ -232,7 +232,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
     this.getSpePackageEndDeptList();
   }
 
-  // 查询标本包里的所有终点克是
+  // 查询标本包里的所有终点科室
   isShowEndDeptIdArr:any[] = [];
   getSpePackageEndDeptList(){
     this.mainService

src/app/views/specimen-package/specimen-package.component.html

@@ -18,8 +18,8 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label">配送人</span>：
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择配送人" [(ngModel)]="searchDto.deliveryUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+          <span class="label">送达人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择送达人" [(ngModel)]="searchDto.deliveryUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
             <ng-container *ngFor="let option of deliveryUserList">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
@@ -55,8 +55,8 @@
             <th nzWidth="10%">打包科室</th>
             <th nzWidth="10%">检验科室</th>
             <th nzWidth="10%">标本数</th>
-            <th nzWidth="10%">配送人|配送时间</th>
-            <th nzWidth="10%">接收人|接收时间</th>
+            <th nzWidth="10%">收取人|收取时间</th>
+            <th nzWidth="10%">送达人|送达时间</th>
             <th nzWidth="10%">状态</th>
             <th nzWidth="10%">工单号</th>
             <th nzWidth="10%">操作</th>
@@ -69,8 +69,8 @@
             <td>{{data.packDeptDTO?.dept}}</td>
             <td>{{ data.endDeptNames }}</td>
             <td>{{data.specimenNum}}</td>
-            <td>{{ data.deliveryUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.receiveUserDTO?.name }}<br>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.deliveryUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.status?.name }}</td>
             <td>{{ data.gdDTO?.gdcode }}</td>
             <td>

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

@@ -184,7 +184,7 @@ export class SpecimenPackageComponent implements OnInit {
     flag && this.getDeliveryUserList();
   }
 
-  // 获取配送人
+  // 获取送达人
   deliveryUserList: any = [];
   getDeliveryUserList(e = undefined) {
     let postData = {