From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 15:48:28 +0800
Subject: [PATCH] 取消领用

---
 src/main/webapp/laboratory_mng.xhtml |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/laboratory_mng.xhtml b/src/main/webapp/laboratory_mng.xhtml
index 2624312..b93d58d 100644
--- a/src/main/webapp/laboratory_mng.xhtml
+++ b/src/main/webapp/laboratory_mng.xhtml
@@ -12,7 +12,7 @@
 	<h:form id="laboratoryMngForm">
 		<p:panel styleClass="center-header">
 			<p:outputLabel styleClass="title" value="实验室管理"></p:outputLabel>
-			<p:panelGrid styleClass="filter" columns="5">
+			<p:panelGrid styleClass="filter" columns="7">
 				<p:outputLabel value="实验室类型:"></p:outputLabel>
 				<p:selectOneMenu value="#{laboratoryMngController.type}">
 					<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -23,6 +23,9 @@
 
 				<p:outputLabel value="实验室名:"></p:outputLabel>
 				<p:inputText value="#{laboratoryMngController.name}"></p:inputText>
+
+				<p:outputLabel value="课题组:"></p:outputLabel>
+				<p:inputText value="#{laboratoryMngController.project}"></p:inputText>
 
 				<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
 			</p:panelGrid>
@@ -65,6 +68,10 @@
 
 				<p:column headerText="实验室名">
 					<h:outputText value="#{row.name}"></h:outputText>
+				</p:column>
+
+				<p:column headerText="课题组">
+					<h:outputText value="#{row.project}"></h:outputText>
 				</p:column>
 
 				<p:column headerText="状态码">
@@ -131,6 +138,13 @@
                     <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
                                    var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
                 </p:selectOneMenu>
+
+
+				<p:outputLabel value="所属课题组"  for="multiple"/>
+				<p:selectCheckboxMenu id="multiple" value="#{laboratoryMngController.sysLaboratory.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">
 				<p:commandButton value="保存"

--
Gitblit v1.9.2