From 61de83f769642ff7da3d7f32b39c5014167a2950 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 15 一月 2021 17:34:48 +0800
Subject: [PATCH] 修改试剂库、库存查询,登录超时,导出订单领取
---
src/main/webapp/laboratory_container_mng.xhtml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index f00faa3..b6ad4db 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="#{row.project}"></h:outputText>
+ </p:column>
+
<p:column headerText="主控名称">
<h:outputText value="#{row.controllerName}"></h:outputText>
</p:column>
@@ -174,6 +181,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