From aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 02 二月 2021 18:07:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/laboratory_mng.xhtml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/laboratory_mng.xhtml b/src/main/webapp/laboratory_mng.xhtml
index 55fe43a..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>
@@ -24,11 +24,14 @@
<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>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="5" styleClass="btn">
+ <p:panelGrid columns="6" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn" process="@this"
actionListener="#{laboratoryMngController.onNewBtnClick}"
oncomplete="PF('dialog').show();" update=":dialog,:dialogForm"></p:commandButton>
@@ -41,6 +44,8 @@
</p:commandButton>
<p:commandButton value="导入" styleClass="import-btn" onclick="importLab()"
></p:commandButton>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{laboratoryMngController.exportLab2Excel}"
+ />
<a href="resources/template/实验室导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
<script>
function importLab(){
@@ -63,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="状态码">
@@ -129,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