bugfix

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -651,7 +651,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
             this.deptList = this.configs.spePackageDeptList || [];
             this.spePackageTubeIds = this.configs.spePackageTubeIds ? this.configs.spePackageTubeIds.split(',').map(v => +v) : [];
             this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
-            this.spePackageCreateOrder[0].checked = true;
+            this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
             this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
 					}
         }

src/app/share/dialog-delete/dialog-delete.component.less

@@ -12,7 +12,7 @@
 
   .modalBody {
     width: 350px;
-    height: 220px;
+    min-height: 220px;
     background: #fff;
     border-radius: 8px;
     padding: 8px 16px;

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

@@ -22,13 +22,12 @@
           <tr class="thead">
             <th nzWidth="13%">包号</th>
             <th nzWidth="6%">打包人</th>
-            <th nzWidth="12%">打包时间</th>
-            <th nzWidth="9%">申请单数</th>
+            <th nzWidth="15%">打包时间</th>
             <th nzWidth="6%">标本数</th>
             <th nzWidth="6%">配送人</th>
-            <th nzWidth="12%">配送时间</th>
+            <th nzWidth="15%">配送时间</th>
             <th nzWidth="6%">接收人</th>
-            <th nzWidth="12%">接收时间</th>
+            <th nzWidth="15%">接收时间</th>
             <th nzWidth="8%">状态</th>
             <th nzWidth="10%">操作</th>
           </tr>
@@ -38,7 +37,6 @@
             <td>{{ data.packCode }}</td>
             <td>{{ data.packUserDTO?.name }}</td>
             <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
-            <td>{{ data.pathologyFormNum }}</td>
             <td>{{ data.specimenNum }}</td>
             <td>{{ data.deliveryUserDTO?.name }}</td>
             <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
@@ -47,7 +45,7 @@
             <td>{{ data.status?.name }}</td>
             <td>
               <div class="coop">
-                <span (click)="printPackageByConfig(data)">补打</span>
+                <span (click)="printPackageByConfig(data)" *ngIf="data.status.value !== '0'">补打</span>
                 <span (click)="toSpecimenPackage(data)" *ngIf="data.status.value === '0' || data.status.value === '1'">修改</span>
               </div>
             </td>

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

@@ -94,8 +94,8 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
       deptId: this.deptDTO.id,
     };
 
-    if(this.route.snapshot.paramMap.get("id")){
-      postData.packageId = +this.route.snapshot.paramMap.get("id");
+    if(this.route.snapshot.queryParams.id){
+      postData.packageId = +this.route.snapshot.queryParams.id;
     }
 
     this.mainService