From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/laboratory_container_mng.xhtml | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/main/webapp/laboratory_container_mng.xhtml b/src/main/webapp/laboratory_container_mng.xhtml
index e346ad3..767adfc 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,15 @@
<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: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,8 +46,9 @@
</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();
@@ -59,21 +64,12 @@
selection="#{laboratoryContainerMngController.selectedList}" rows="20"
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="#{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>
+ <h:outputText value="#{row.project}"></h:outputText>
</p:column>
<p:column headerText="临时存储库条码">
<h:outputText value="#{row.containerCode}"></h:outputText>
@@ -116,14 +112,6 @@
required="true" requiredMessage="请选择实验室">
<f:selectItems value="#{sysLaboratoryService.getAllSysLaboratoryList()}" var="item"
itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
- </p:selectOneMenu>
-
- <p:outputLabel value="主控名"></p:outputLabel>
- <p:selectOneMenu
- value="#{laboratoryContainerMngController.sysLaboratoryContainer.controllerCode}"
- required="true" requiredMessage="请选择主控设备">
- <f:selectItems value="#{laboratoryContainerMngController.controllers}" var="item"
- itemLabel="#{item.controllerName}" itemValue="#{item.controllerCode}"></f:selectItems>
</p:selectOneMenu>
<p:outputLabel value="临时存储库条码"></p:outputLabel>
@@ -182,11 +170,9 @@
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:outputLabel value="课题组"/>
+ <p:selectOneMenu value="#{laboratoryContainerMngController.sysLaboratoryContainer.project}" requiredMessage="请选择课题组">
+ <f:selectItems value="#{sysProjectServiceImpl.getAll()}" var="item" itemValue="#{item.project}" itemLabel="#{item.project}"/>
</p:selectOneMenu>
</p:panelGrid>
--
Gitblit v1.9.2