From 31ffbaf322685984516cfb284fa58741debf4e96 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 29 一月 2021 09:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master

---
 src/main/webapp/laboratory_container_mng.xhtml |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index b6ad4db..25fb1be 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -12,7 +12,7 @@
 	<h:form id="laboratoryContainerMngForm">
 		<p:panel styleClass="center-header">
 			<p:outputLabel styleClass="title" value="实验室临时存储库管理"></p:outputLabel>
-			<p:panelGrid styleClass="filter" columns="5">
+			<p:panelGrid styleClass="filter" columns="9">
 				<p:outputLabel value="实验室类型:"></p:outputLabel>
 				<p:selectOneMenu value="#{laboratoryContainerMngController.laboratoryType}">
 					<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -24,6 +24,12 @@
 				<p:outputLabel value="实验室名:"></p:outputLabel>
 				<p:inputText value="#{laboratoryContainerMngController.laboratoryName}"></p:inputText>
 
+				<p:outputLabel value="课题名称:"></p:outputLabel>
+				<p:inputText value="#{laboratoryContainerMngController.project}"></p:inputText>
+
+				<p:outputLabel value="主控名称:"></p:outputLabel>
+				<p:inputText value="#{laboratoryContainerMngController.controllerName}"></p:inputText>
+
 				<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
 			</p:panelGrid>
 		</p:panel>

--
Gitblit v1.9.2