From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: Mon, 01 Jul 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/laboratory_mng.xhtml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/laboratory_mng.xhtml b/src/main/webapp/laboratory_mng.xhtml
index 601dedb..9a50116 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>
@@ -67,8 +70,8 @@
<h:outputText value="#{row.name}"></h:outputText>
</p:column>
- <p:column headerText="所属项目组">
- <h:outputText value="#{row.project}"></h:outputText>
+ <p:column headerText="课题组">
+ <h:outputText value="#{laboratoryMngController.getProjectName(row.project)}"></h:outputText>
</p:column>
<p:column headerText="状态码">
@@ -131,17 +134,18 @@
<p:outputLabel value="负责部门"></p:outputLabel>
<p:selectOneMenu value="#{laboratoryMngController.sysLaboratory.department}"
- required="true" requiredMessage="请选择负责部门">
+ requiredMessage="请选择负责部门">
<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:outputLabel value="所属课题组"/>
+ <p:selectOneMenu value="#{laboratoryMngController.sysLaboratory.project}"
+ requiredMessage="请选择课题组">
+ <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
+ var="item" itemLabel="#{item.project}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存"
--
Gitblit v1.9.2