From 4ad8653be79cb07fc7f450540ea20d82b3971b89 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 12 一月 2021 14:19:44 +0800
Subject: [PATCH] 模块:用户管理 修改:导入新增课题组,修改导入时插入的代码问题 提出:秦老师

---
 src/main/webapp/laboratory_container_mng.xhtml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index cedb6ed..b6ad4db 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -60,13 +60,18 @@
 				pageLinks="5">
 				<p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
 
-				<p:column headerText="实验室类型">
-					<h:outputText value="#{baseMetaService.getBaseMetaValue(row.laboratoryType)}"></h:outputText>
-				</p:column>
+<!--				<p:column headerText="实验室类型">-->
+<!--					<h:outputText value="#{baseMetaService.getBaseMetaValue(row.laboratoryType)}"></h:outputText>-->
+<!--				</p:column>-->
 
 				<p:column headerText="实验室名">
 					<h:outputText value="#{row.laboratoryName}"></h:outputText>
 				</p:column>
+
+				<p:column headerText="课题组">
+					<h:outputText value="#{row.project}"></h:outputText>
+				</p:column>
+
 				<p:column headerText="主控名称">
 					<h:outputText value="#{row.controllerName}"></h:outputText>
 				</p:column>
@@ -176,6 +181,13 @@
 						value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
 						var="item" itemLabel="#{item.metaValue}" 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">
 				<p:commandButton value="保存"

--
Gitblit v1.9.2