From fda4fbd2539b692969908238fc482efab88690ad Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 16 十二月 2020 16:55:44 +0800
Subject: [PATCH] 模块：实验室临时存储管理 修改：新增和修改的课题选项 提出：秦老师 注意: 新增字段sys_laboratory_controller(project_id)
---
src/main/webapp/laboratory_container_mng.xhtml | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index cedb6ed..132b56a 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="#{sysProjectServiceImpl.getSysProject(row.projectId).projectName}"></h:outputText>
+ </p:column>
+
<p:column headerText="主控名称">
<h:outputText value="#{row.controllerName}"></h:outputText>
</p:column>
@@ -176,6 +181,14 @@
value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_REAGENT_CHARACTER)}"
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:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存"
--
Gitblit v1.9.2