From e21830598f6c55f1196c519fd9005704c82a0fb3 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Wed, 30 Dec 2020 15:49:09 +0800
Subject: [PATCH] 修改:idCard改成8位输入或者20位输入,转换大写 原因：扫码扫出8位，数据库和柜子使用的是20位 提出：秦老师
---
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