拉取最新代码

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

@@ -153,57 +153,79 @@
 			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
-					<div style="text-align: center;width: 30%;height: 23px;
-					line-height: 23px;
+					<div style="width: 40%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
 					
-					<div style="text-align: center;width: 20%;height: 23px;
-					line-height: 23px;
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">临时增发</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
-					<div style="text-align: center;width: 20%;height: 23px;
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">取药药房</div>
 				</div>
 				<div *ngFor="let data of codes" style="display: flex;">
-					<div style="text-align: center;width: 30%;height: 23px;
-					line-height: 23px;
+					<div style="width: 40%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
 					
-					<div style="text-align: center;width: 20%;height: 23px;
-					line-height: 23px;
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">
 						<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
@@ -212,8 +234,10 @@
 						</span>
 					</div>
 					
-					<div style="text-align: center;width: 20%;height: 23px;
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+					<div style="width: 20%;display: flex;
+					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

@@ -145,57 +145,79 @@
 			</div>
 			<div style="border: 1px solid #e7e7e7;border-bottom: none;font-size: 14px;">
 				<div class="thead" style="display: flex;">
-					<div style="text-align: center;width: 30%;height: 23px;
-					line-height: 23px;
+					<div style="width: 40%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">药品名称</div>
 					
-					<div style="text-align: center;width: 25%;height: 23px;
-					line-height: 23px;
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">规格</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">实际消耗</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">临时增发</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">箱数</div>
 					
-					<div style="text-align: center;width: 25%;height: 23px;
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">取药药房</div>
+					<div style="width: 20%;display: flex;
+					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="text-align: center;width: 30%;height: 23px;
-					line-height: 23px;
+					<div style="width: 40%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.drugName }}</div>
 					
-					<div style="text-align: center;width: 25%;height: 23px;
-					line-height: 23px;
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.drugsInfoDTO.specs }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.expendCount }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">{{ data.addSub || 0 }}</div>
 					
-					<div style="text-align: center;width: 10%;height: 23px;
-					line-height: 23px;
+					<div style="width: 10%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;
 					border-right: 1px solid #e7e7e7;
 					border-bottom: 1px solid #e7e7e7;">
 					<span *ngIf="data.drugsInfoDTO.drugName!='合计'">
@@ -205,8 +227,10 @@
 					</span>
 					</div>
 					
-					<div style="text-align: center;width: 25%;height: 23px;
-					line-height: 23px;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
+					<div style="width: 20%;display: flex;
+					align-items: center;
+					justify-content: center;
+					flex-wrap: wrap;border-bottom: 1px solid #e7e7e7;">{{ data.deptName }}</div>
 				</div>
 			</div>
 		</div>