From 3ef5a9d0aba195d77aa22591b55a9ce9e43372ca Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 22 四月 2021 14:02:00 +0800
Subject: [PATCH] 实验室库存 新增查询条件:实验室名称

---
 src/main/webapp/reagent_user_flow_info.xhtml |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/reagent_user_flow_info.xhtml b/src/main/webapp/reagent_user_flow_info.xhtml
index 02ca1f0..8622ef6 100644
--- a/src/main/webapp/reagent_user_flow_info.xhtml
+++ b/src/main/webapp/reagent_user_flow_info.xhtml
@@ -14,7 +14,7 @@
 			<p:outputLabel styleClass="title" value="试剂流向追踪"></p:outputLabel>
 
 			<p:panel styleClass="center-header">
-				<p:panelGrid styleClass="filter" columns="11">
+				<p:panelGrid styleClass="filter" columns="13">
 					<p:outputLabel value="开始时间:"></p:outputLabel>
 					<p:calendar value="#{opeUseFlowInfoController.startDate}"></p:calendar>
 
@@ -26,6 +26,9 @@
 
 					<p:outputLabel value="条形码:"></p:outputLabel>
 					<p:inputText value="#{opeUseFlowInfoController.reagentCode}"></p:inputText>
+
+					<p:outputLabel value="柜号:"></p:outputLabel>
+					<p:inputText value="#{opeUseFlowInfoController.containerCode}"></p:inputText>
 
 					<p:outputLabel value="场所名:"></p:outputLabel>
 					<p:inputText value="#{opeUseFlowInfoController.houseName}"></p:inputText>
@@ -45,18 +48,18 @@
 							<p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{opeUseFlowInfoController.printTable['title']}</p:outputPanel>
 							<div>
 								<div style="display: flex;flex-direction: row;justify-content: flex-end;">
-									<div style="width: 100px;">单据编号:</div>
+									<div style="width: 100px;">单据编号:</div>
 									<div style="width: 300px;">#{opeUseFlowInfoController.printTable['receiptNumber']}</div>
 								</div>
 							</div>
 
 							<div style="margin: 10px 0;">
 								<div style="display: inline-flex;">
-									<div style="width: 100px;margin-left: 10px;">部门:</div>
+									<div style="width: 100px;margin-left: 10px;">部门:</div>
 									<div style="width: 300px;">#{opeUseFlowInfoController.printTable['department']}</div>
 								</div>
 								<div style="display: inline-flex;float: right;">
-									<div style="width: 100px;">日期:</div>
+									<div style="width: 100px;">日期:</div>
 									<div style="width: 300px;padding-top: 1px;">
 										<div>#{opeUseFlowInfoController.printTable['date']}</div>
 									</div>
@@ -65,11 +68,11 @@
 
 							<div style="margin-bottom: 20px;">
 								<div style="display: inline-flex;">
-									<div style="width: 100px;margin-left: 10px;">申购人:</div>
+									<div style="width: 100px;margin-left: 10px;">申购人:</div>
 									<div style="width: 300px;">#{opeUseFlowInfoController.printTable['applyPerson']}</div>
 								</div>
 								<div style="display: inline-flex;float: right;">
-									<div style="width: 100px;">联系方式:</div>
+									<div style="width: 100px;">联系方式:</div>
 									<div style="width: 300px;">
 										<div >#{opeUseFlowInfoController.printTable['phone']}</div>
 									</div>
@@ -111,14 +114,14 @@
 
 							<div style="margin-top: 20px;">
 								<div style="display: flex;flex-direction: row;justify-content: flex-end;">
-									<div style="width: 100px">签收人:</div>
+									<div style="width: 100px">签收人:</div>
 									<div style="width: 300px"></div>
 								</div>
 							</div>
 
 							<div style="margin: 10px 0">
 								<div style="display: flex;flex-direction: row;justify-content: flex-end;">
-									<div style="width: 100px">日期:</div>
+									<div style="width: 100px">日期:</div>
 									<div style="width: 300px"></div>
 								</div>
 							</div>

--
Gitblit v1.9.2