From d4934eb71ed33c9b07cb0dc7bbcbd27450e0e122 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期四, 10 十二月 2020 10:39:07 +0800
Subject: [PATCH] 模块:试剂流向追踪 修改：残余量增加单位 提出：秦老师
---
src/main/webapp/reagent_user_flow_info.xhtml | 5 ++++-
1 files changed, 4 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..72059d0 100644
--- a/src/main/webapp/reagent_user_flow_info.xhtml
+++ b/src/main/webapp/reagent_user_flow_info.xhtml
@@ -54,8 +54,11 @@
<h:outputText value="#{row.operatestateName}" />
</p:column>
<p:column headerText="残存量">
- <h:outputText value="#{row.remainder}" />
+ <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat(sysReagentService.getReagentUnitByReagentId(row.reagent.id))}" rendered="#{row.operatestateName eq '仓库领用' ||row.operatestateName eq '仓库入库' }"/>
+ <h:outputText value="#{row.remainder == null?'':''.concat(row.remainder).concat('g')}" 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