From 8b6a2a67a0bf081252648ba46fffd5591b3afc98 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 11:46:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/laboratory_container_mng.xhtml | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index f00faa3..51dd735 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -12,7 +12,7 @@
<h:form id="laboratoryContainerMngForm">
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="实验室临时存储库管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="5">
+ <p:panelGrid styleClass="filter" columns="9">
<p:outputLabel value="实验室类型："></p:outputLabel>
<p:selectOneMenu value="#{laboratoryContainerMngController.laboratoryType}">
<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -24,11 +24,17 @@
<p:outputLabel value="实验室名："></p:outputLabel>
<p:inputText value="#{laboratoryContainerMngController.laboratoryName}"></p:inputText>
+ <p:outputLabel value="课题名称："></p:outputLabel>
+ <p:inputText value="#{laboratoryContainerMngController.project}"></p:inputText>
+
+ <p:outputLabel value="主控名称："></p:outputLabel>
+ <p:inputText value="#{laboratoryContainerMngController.controllerName}"></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="@form"
actionListener="#{laboratoryContainerMngController.onNewBtnClick}"
update=":dialog,:dialogForm"></p:commandButton>
@@ -42,6 +48,10 @@
</p:commandButton>
<p:commandButton value="导入" styleClass="import-btn" onclick="importCon()"
></p:commandButton>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="${laboratoryContainerMngController.export2Excel}"
+ />
+ <a href="resources/template/实验室临时存储库导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+
<script>
function importCon(){
$("#laboratoryContainerMngForm\\:importReagentBtn_input").click();
@@ -58,13 +68,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>
@@ -174,6 +189,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