From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口
---
src/main/webapp/reagent_mng.xhtml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/reagent_mng.xhtml b/src/main/webapp/reagent_mng.xhtml
index 876d61e..93964e3 100644
--- a/src/main/webapp/reagent_mng.xhtml
+++ b/src/main/webapp/reagent_mng.xhtml
@@ -15,7 +15,7 @@
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="试剂管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="9">
+ <p:panelGrid styleClass="filter" columns="12">
<p:outputLabel value="名称："></p:outputLabel>
<p:inputText value="#{reagentMngController.name}"></p:inputText>
<p:outputLabel value="CAS："></p:outputLabel>
@@ -28,10 +28,13 @@
</p:selectOneMenu>
<p:outputLabel value="种类："></p:outputLabel>
<p:selectOneMenu value="#{reagentMngController.type}">
- <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
<f:selectItems value="#{reagentMngController.typeList}" var="item"
itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
</p:selectOneMenu>
+
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{reagentMngController.productSn}"></p:inputText>
+
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
</p:panel>
@@ -53,7 +56,7 @@
<p:confirm header="确认" message="确认操作？"></p:confirm>
</p:commandButton>
<p:commandButton value="试剂导入" styleClass="import-btn" onclick="importReagent()"
- ></p:commandButton>
+ ></p:commandButton>
<p:commandButton value="耗材导入" styleClass="import-btn" onclick="importReagent2()"
></p:commandButton>
<script>
@@ -86,6 +89,9 @@
</p:column>
<p:column headerText="名称">
<h:outputText value="#{row.name}"></h:outputText>
+ </p:column>
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.productSn}"></h:outputText>
</p:column>
<p:column headerText="CAS">
<h:outputText value="#{row.cas}"></h:outputText>
@@ -126,12 +132,12 @@
<p:column headerText="每箱数量">
<h:outputText value="#{row.perBox}"></h:outputText>
</p:column>
- <p:column headerText="库存">
- <h:outputText value="#{row.reserve}"></h:outputText>
- </p:column>
- <p:column headerText="货期">
- <h:outputText value="#{row.deadline}"></h:outputText>
- </p:column>
+<!-- <p:column headerText="库存">-->
+<!-- <h:outputText value="#{row.reserve}"></h:outputText>-->
+<!-- </p:column>-->
+<!-- <p:column headerText="货期">-->
+<!-- <h:outputText value="#{row.deadline}"></h:outputText>-->
+<!-- </p:column>-->
</p:dataTable>
</p:panel>
<div style="display: none" id='importDv'>
@@ -175,7 +181,7 @@
</p:column>
<p:column>
<p:inputText value="#{reagentMngController.sysReagent.cas}" maxlength="100"
- required="true" requiredMessage="请输入CAS"></p:inputText>
+ required="true" requiredMessage="请输入CAS" onkeyup="this.value=this.value.replace(/\s/g,'')"></p:inputText>
</p:column>
</p:row>
<p:row>
--
Gitblit v1.9.2