From 403810ccd68dedf1d93c4ad9e10b4f0de8eec8f8 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Tue, 05 Jan 2021 18:03:11 +0800
Subject: [PATCH] 修改：把危化品编码得memo加入到试剂表中字段reagent_character危险性质 目的：库存得时候显示危险信息 提出：秦老师
---
src/main/webapp/reagent_user_flow_info.xhtml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/reagent_user_flow_info.xhtml b/src/main/webapp/reagent_user_flow_info.xhtml
index 75f2000..91e413b 100644
--- a/src/main/webapp/reagent_user_flow_info.xhtml
+++ b/src/main/webapp/reagent_user_flow_info.xhtml
@@ -54,8 +54,12 @@
<h:outputText value="#{row.operatestateName}" />
</p:column>
<p:column headerText="残存量">
- <h:outputText value="#{row.remainder}" />
+ <h:outputText value="#{row.remainder == null?'':row.remainder}"
+ rendered="#{row.operatestateName ne '仓库领用'
+ and row.operatestateName ne '仓库入库'}"/>
</p:column>
+
+
<!--<p:column headerText="重量">
<h:outputText value="#{row.remainder}"></h:outputText>
</p:column>-->
--
Gitblit v1.9.2