Merge branch 'master' into develop

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

@@ -70,7 +70,7 @@
 <!-- 打印的内容 -->
 <div id="print-section-package" hidden>
   <!-- 80mm*80mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 75mm;height: 75mm;" *ngIf="configs.spePackageCodeSize == 1">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
@@ -87,7 +87,7 @@
     </div>
   </div>
   <!-- 70mm*50mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 65mm;height: 45mm;" *ngIf="configs.spePackageCodeSize == 2">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">

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

@@ -80,7 +80,7 @@
 <!-- 打印的内容 -->
 <div id="print-section" hidden>
   <!-- 80mm*80mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 75mm;height: 75mm;" *ngIf="configs.spePackageCodeSize == 1">
     <div style="display: flex;">
       <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
@@ -97,9 +97,9 @@
     </div>
   </div>
   <!-- 70mm*50mm -->
-  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
+  <div style="overflow: hidden;padding: 2mm;font-size: 4mm;width: 65mm;height: 45mm;" *ngIf="configs.spePackageCodeSize == 2">
     <div style="display: flex;">
-      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 1mm;">
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
       <div style="flex: 1;">
         <div>包号:{{package.packCode}}</div>
         <div>{{package.packDeptDTO?.dept}}</div>