首页 探索 帮助
注册 登录
seimin
/
zy-pc
关注 1
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

打印内容调整

seimin 2 月之前
父节点
ea2881f5fc
当前提交
59557ea911
共有 2 个文件被更改，包括 58 次插入 和 67 次删除
分列视图 显示文件统计
  1. 29 33
      src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html
  2. 29 34
      src/app/views/batch-specimen/batch-specimen.component.html

+ 29 - 33
src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html
查看文件 

@@ -69,41 +69,37 @@
69 69
70 70 
 <!-- 打印的内容 -->
71 71 
 <div id="print-section-package" hidden>
72 
-  <ng-container *ngIf="configs.spePackageCodeSize">
73 
-    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;display: flex;" [ngStyle]="{'justify-content': configs.spePrintPosition == 2 ? 'center' : (configs.spePrintPosition == 3 ? 'right' : 'left')}">
74 
-      <!-- 80mm*80mm -->
75 
-      <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
76 
-        <div style="display: flex;">
77 
-          <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
78 
-          <div style="flex: 1;">
79 
-            <div>包号：{{package.packCode}}</div>
80 
-            <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
81 
-            <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
82 
-          </div>
83 
-        </div>
84 
-        <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
85 
-        <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
86 
-        <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
87 
-        <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
88 
-          <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
89 
-        </div>
72 
+  <!-- 80mm*80mm -->
73 
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
74 
+    <div style="display: flex;">
75 
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
76 
+      <div style="flex: 1;">
77 
+        <div>包号：{{package.packCode}}</div>
78 
+        <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
79 
+        <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
90 80 
       </div>
91 
-      <!-- 70mm*50mm -->
92 
-      <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
93 
-        <div style="display: flex;">
94 
-          <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
95 
-          <div style="flex: 1;">
96 
-            <div>包号:{{package.packCode}}</div>
97 
-            <div>{{package.packDeptDTO?.dept}}</div>
98 
-            <div>{{package.packTime | date: 'yyyy-MM-dd'}}</div>
99 
-            <div>标本总数:{{package.specimenNum}}</div>
100 
-          </div>
101 
-        </div>
102 
-        <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
103 
-          <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
104 
-        </div>
81 
+    </div>
82 
+    <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
83 
+    <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
84 
+    <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
85 
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
86 
+      <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
87 
+    </div>
88 
+  </div>
89 
+  <!-- 70mm*50mm -->
90 
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
91 
+    <div style="display: flex;">
92 
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
93 
+      <div style="flex: 1;">
94 
+        <div>包号:{{package.packCode}}</div>
95 
+        <div>{{package.packDeptDTO?.dept}}</div>
96 
+        <div>{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
97 
+        <div>{{package.specimenNum}};{{package.packUserDTO?.name}}</div>
105 98 
       </div>
106 99 
     </div>
107 
-  </ng-container>
100 
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
101 
+      <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
102 
+    </div>
103 
+  </div>
108 104 
 </div>
109 105 
 <button ngxPrint printSectionId="print-section-package" #printBtnPackage hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>

+ 29 - 34
src/app/views/batch-specimen/batch-specimen.component.html
查看文件 

@@ -79,42 +79,37 @@
79 79
80 80 
 <!-- 打印的内容 -->
81 81 
 <div id="print-section" hidden>
82 
-  <ng-container *ngIf="configs.spePackageCodeSize">
83 
-    <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;height: 80mm;display: flex;" [ngStyle]="{'justify-content': configs.spePrintPosition == 2 ? 'center' : (configs.spePrintPosition == 3 ? 'right' : 'left')}">
84 
-      <!-- 80mm*80mm -->
85 
-      <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
86 
-        <div style="display: flex;">
87 
-          <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
88 
-          <div style="flex: 1;">
89 
-            <div>包号：{{package.packCode}}</div>
90 
-            <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
91 
-            <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
92 
-          </div>
93 
-        </div>
94 
-        <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
95 
-        <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
96 
-        <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
97 
-        <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
98 
-          <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
99 
-        </div>
82 
+  <!-- 80mm*80mm -->
83 
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 80mm;max-height: 80mm;" *ngIf="configs.spePackageCodeSize == 1">
84 
+    <div style="display: flex;">
85 
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 3mm;">
86 
+      <div style="flex: 1;">
87 
+        <div>包号：{{package.packCode}}</div>
88 
+        <div style="margin-top: 3mm;">打包人：{{package.packUserDTO?.name}}</div>
89 
+        <div style="margin-top: 3mm;">标本总数：{{package.specimenNum}}</div>
100 90 
       </div>
101 
-
102 
-      <!-- 70mm*50mm -->
103 
-      <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
104 
-        <div style="display: flex;">
105 
-          <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 1mm;">
106 
-          <div style="flex: 1;">
107 
-            <div>包号:{{package.packCode}}</div>
108 
-            <div>{{package.packDeptDTO?.dept}}</div>
109 
-            <div>{{package.packTime | date: 'yyyy-MM-dd'}}</div>
110 
-            <div>标本总数:{{package.specimenNum}}</div>
111 
-          </div>
112 
-        </div>
113 
-        <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
114 
-          <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
115 
-        </div>
91 
+    </div>
92 
+    <div style="margin-top: 3mm;">打包时间：{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
93 
+    <div style="margin-top: 3mm;">打包科室：{{package.packDeptDTO?.dept}}</div>
94 
+    <div style="margin-top: 3mm;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">终点科室：{{package.targetDeptDTO?.dept}}</div>
95 
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
96 
+      <div style="width: 33.33%;margin-top: 3mm;" *ngFor="let item of typeSpecimentList | slice:0:9">{{item.name}}：{{item.size}}</div>
97 
+    </div>
98 
+  </div>
99 
+  <!-- 70mm*50mm -->
100 
+  <div style="overflow: hidden;padding: 4mm;font-size: 4mm;width: 70mm;max-height: 50mm;" *ngIf="configs.spePackageCodeSize == 2">
101 
+    <div style="display: flex;">
102 
+      <img [src]="base64" style="width: 23mm;height: 23mm;margin-right: 1mm;">
103 
+      <div style="flex: 1;">
104 
+        <div>包号:{{package.packCode}}</div>
105 
+        <div>{{package.packDeptDTO?.dept}}</div>
106 
+        <div>{{package.packTime | date: 'yyyy-MM-dd HH:mm'}}</div>
107 
+        <div>{{package.specimenNum}};{{package.packUserDTO?.name}}</div>
116 108 
       </div>
117 109 
     </div>
118 
-  </ng-container>
110 
+    <div style="display: flex;flex-wrap: wrap;" *ngIf="configs.spePrintTubeType == 1">
111 
+      <div *ngFor="let item of typeSpecimentList">{{item.name}}:{{item.size}}</div>
112 
+    </div>
113 
+  </div>
119 114 
 </div>
120 115 
 <button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>