From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
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