From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/webapp/reagent_user_flow_info.xhtml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/reagent_user_flow_info.xhtml b/src/main/webapp/reagent_user_flow_info.xhtml
index 02ca1f0..1519eeb 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>
 
@@ -27,6 +27,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>
 					<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>

--
Gitblit v1.9.2