From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/warehouse_reagent_direct_store.xhtml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_direct_store.xhtml b/src/main/webapp/warehouse_reagent_direct_store.xhtml
index d22440c..d36987c 100644
--- a/src/main/webapp/warehouse_reagent_direct_store.xhtml
+++ b/src/main/webapp/warehouse_reagent_direct_store.xhtml
@@ -51,6 +51,10 @@
<h:outputText value="#{row.reagent!=null?row.reagent.name:''}"></h:outputText>
</p:column>
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
+ </p:column>
+
<p:column headerText="CAS" width="80">
<h:outputText value="#{row.reagent!=null?row.reagent.cas:''}"></h:outputText>
</p:column>
@@ -180,12 +184,15 @@
<p:tabView dynamic="true" style="margin-left: 26px">
<p:tab title="试剂库">
<h:form id="applyMngNewReagentForm">
- <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
+ <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="7" style="margin-left: -18px">
<p:outputLabel value="试剂名称："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.applyNewReagentName}"></p:inputText>
<p:outputLabel value="CAS："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.applyNewCas}"></p:inputText>
+
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
@@ -199,6 +206,9 @@
<p:column headerText="试剂名称">
<h:outputText value="#{row.name}"></h:outputText>
</p:column>
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.productSn}"/>
+ </p:column>
<p:column headerText="CAS">
<h:outputText value="#{row.cas}"></h:outputText>
</p:column>
--
Gitblit v1.9.2