大输液打印添加包装规格

src/app/views/admin-office-prescription/admin-office-prescription.component.html

@@ -151,6 +151,9 @@
 				<div style="margin-right: 15px;">批次号：{{rowData.batch?rowData.batch.batchNo:'-'}}</div>
 				<div style="margin-right: 15px;">单号：{{rowData.packingNo}}</div>
 			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">取药药房：{{rowData.pharmacyDTO?rowData.pharmacyDTO.dept:'-'}}</div>
+			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
 					<div style="width: 40%;display: flex;font-size: 12px;
@@ -172,26 +175,28 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
+					border-bottom: 1px solid #e7e7e7;">包装规格</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">临时增发</div>
+					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
-					border-bottom: 1px solid #e7e7e7;">箱数</div>
+					border-bottom: 1px solid #e7e7e7;">临时增发</div>
 					
-					<div style="width: 20%;display: flex;font-size: 12px;
+					<div style="width: 10%;display: flex;font-size: 12px;
 					align-items: center;
 					justify-content: center;
-					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">箱数</div>
 				</div>
 				<div *ngFor="let data of codes" style="display: flex;">
 					<div style="width: 40%;display: flex;font-size: 12px;
@@ -213,6 +218,13 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
@@ -234,10 +246,6 @@
 						</span>
 					</div>
 					
-					<div style="width: 20%;display: flex;font-size: 12px;
-					align-items: center;
-					justify-content: center;
-					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
 				</div>
 			</div>
 		</div>

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

@@ -143,6 +143,9 @@
 				<div style="margin-right: 15px;">批次号：{{item.batch.batchNo}}</div>
 				<div style="margin-right: 15px;">单号：{{item.packingNo}}</div>
 			</div>
+			<div class="monad-sign" style="display: flex;line-height: 23px;font-size: 14px;">
+				<div style="margin-right: 15px;">取药药房：{{item.pharmacyDTO?item.pharmacyDTO.dept:'-'}}</div>
+			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
 					<div style="width: 40%;display: flex;font-size: 12px;
@@ -164,6 +167,13 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">包装规格</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
@@ -180,10 +190,6 @@
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
-					<div style="width: 20%;display: flex;font-size: 12px;
-					align-items: center;
-					justify-content: center;
-					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">取药药房</div>
 				</div>
 				<div *ngFor="let data of item.drugsConfigureDTOS" style="display: flex;">
 					<div style="width: 40%;display: flex;font-size: 12px;
@@ -205,6 +211,13 @@
 					justify-content: center;
 					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
+					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.packingSpecs }}</div>
+					
+					<div style="width: 10%;display: flex;font-size: 12px;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
+					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
 					
 					<div style="width: 10%;display: flex;font-size: 12px;
@@ -227,10 +240,6 @@
 					</span>
 					</div>
 					
-					<div style="width: 20%;display: flex;font-size: 12px;
-					align-items: center;
-					justify-content: center;
-					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
 				</div>
 			</div>
 		</div>