From d2be6e4afe1dba009b56f8555792f2823f9e4535 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 22 二月 2021 10:34:59 +0800
Subject: [PATCH] 订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

---
 src/main/webapp/warehouse_reagent_use_person.xhtml |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index ef3181e..d4def34 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -92,6 +92,10 @@
 					<h:outputText value="#{row.articleNumber}"></h:outputText>
 				</p:column>
 
+				<p:column headerText="申领人">
+					<h:outputText value="#{row.applyUserId}"></h:outputText>
+				</p:column>
+
 				<p:column headerText="申请数量">
 					<h:outputText value="#{row.num}"></h:outputText>
 				</p:column>
@@ -114,12 +118,12 @@
 		</p:panel>
 	</h:form>
 	<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
-		<div id="printTarget">
-			<div style=" margin: 11mm 27mm 0mm 30mm;">
+		<div id="printTarget" style="margin-right: -51px;">
+			<div style="margin: 25mm 17mm 0mm 15mm; ">
 				<h:form id="printDialog" style="width: 1100px">
 
-					<p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
-					<p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+					<p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+					<p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
 					<div>
 						<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
 							<div style="width: 98px;">单据编号:</div>

--
Gitblit v1.9.2