From 4f4898cc6e137ee5b47542cf8b1c73f3da3a1ee5 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期五, 08 一月 2021 14:57:32 +0800
Subject: [PATCH] 点击优化和Bug修改
---
src/main/webapp/laboratory_container_mng.xhtml | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index f00faa3..e346ad3 100644
--- a/src/main/webapp/laboratory_container_mng.xhtml
+++ b/src/main/webapp/laboratory_container_mng.xhtml
@@ -42,6 +42,8 @@
</p:commandButton>
<p:commandButton value="导入" styleClass="import-btn" onclick="importCon()"
></p:commandButton>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="${laboratoryContainerMngController.export2Excel}"
+ />
<script>
function importCon(){
$("#laboratoryContainerMngForm\\:importReagentBtn_input").click();
@@ -58,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).project}"></h:outputText>
+ </p:column>
+
<p:column headerText="主控名称">
<h:outputText value="#{row.controllerName}"></h:outputText>
</p:column>
@@ -174,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.project}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存"
--
Gitblit v1.9.2