From 5eaa5ee48d6b55246ec47c1c75ba00f8ddc0fb8f Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期二, 02 二月 2021 17:17:30 +0800
Subject: [PATCH] 修改危废状态

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

diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index 0b319b0..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>
@@ -23,6 +23,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>
@@ -69,7 +75,7 @@
 				</p:column>
 
 				<p:column headerText="课题组">
-					<h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).project}"></h:outputText>
+					<h:outputText value="#{row.project}"></h:outputText>
 				</p:column>
 
 				<p:column headerText="主控名称">
@@ -182,12 +188,11 @@
 						var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
 				</p:selectOneMenu>
 
-				<p:outputLabel value="课题组"></p:outputLabel>
-				<p:selectOneMenu value="#{laboratoryContainerMngController.sysLaboratoryContainer.projectId}">
-					<f:selectItem itemLabel="不选择课题组"  />
-					<f:selectItems value="#{sysProjectServiceImpl.getAll()}"
-								   var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
-				</p:selectOneMenu>
+				<p:outputLabel value="课题组" for="multiple"/>
+				<p:selectCheckboxMenu id="multiple" value="#{laboratoryContainerMngController.sysLaboratoryContainer.projects}" label="Cities" multiple="true"
+									  filter="true" filterMatchMode="startsWith" panelStyle="width:250px">
+					<f:selectItems value="#{sysProjectServiceImpl.getAll()}" var="item" itemValue="#{item.project}" itemLabel="#{item.project}"/>
+				</p:selectCheckboxMenu>
 
 			</p:panelGrid>
 			<p:panel styleClass="btn">

--
Gitblit v1.9.2