From 25eca015c9edb5a8ab3fd9d68a8fd785619c1372 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 28 二月 2022 11:24:48 +0800
Subject: [PATCH] 仓库状态温湿度阈值警报字段
---
src/main/webapp/reagent_mng.xhtml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/reagent_mng.xhtml b/src/main/webapp/reagent_mng.xhtml
index e4c1195..01a8c83 100644
--- a/src/main/webapp/reagent_mng.xhtml
+++ b/src/main/webapp/reagent_mng.xhtml
@@ -39,7 +39,7 @@
</p:panelGrid>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="8" styleClass="btn">
+ <p:panelGrid columns="9" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
process="@this"
actionListener="#{reagentMngController.onNewBtnClick}"
@@ -66,7 +66,9 @@
<p:commandButton value="耗材导入" styleClass="import-btn" onclick="importReagent2()"
></p:commandButton>
<a href="resources/template/耗材导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
- <script>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" id="exportButton" widgetVar="exportButton"
+ actionListener="#{reagentMngController.export2Excel}" />
+ <script type="text/javascript">
function importReagent(){
$("#reagentMngForm\\:importReagentBtn_input").click();
}
@@ -142,6 +144,9 @@
<p:column headerText="安全库存" rendered="#{reagentMngController.type == 1}">
<h:outputText value="#{row.safetynum}" ></h:outputText>
</p:column>
+ <p:column headerText="管制品" rendered="#{reagentMngController.type == 1}">
+ <h:outputText value="#{row.controlProductsName}" ></h:outputText>
+ </p:column>
<!-- <p:column headerText="库存">-->
<!-- <h:outputText value="#{row.reserve}"></h:outputText>-->
<!-- </p:column>-->
@@ -162,6 +167,7 @@
update="@form" auto="true" sizeLimit="5000000"
mode="advanced"/>
</div>
+
</h:form>
<p:dialog modal="true" header="#{reagentMngController.action==constants.ACTION_ADD?'新建':'修改'}" appendTo="@(body)"
@@ -528,5 +534,7 @@
</p:panel>
</h:form>
</p:dialog>
+
+
</ui:composition>
</html>
--
Gitblit v1.9.2