From 1cbac7aa20a183a9a893651bf0cef24b1909eb5c Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:19:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/personal_use_info.xhtml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index ff71fb3..5b4174d 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -48,10 +48,16 @@
}
</style>
<p:panel styleClass="center-header">
- <p:panelGrid styleClass="filter" columns="13">
+ <p:panelGrid styleClass="filter" columns="10">
<p:outputLabel value="单据编号："/>
<p:inputText value="#{personalUseInfoController.receiptNumber}"/>
+
+ <p:outputLabel value="试剂名称："/>
+ <p:inputText value="#{personalUseInfoController.reagentName}"/>
+
+ <p:outputLabel value="申领人："/>
+ <p:inputText value="#{personalUseInfoController.applyPerson}"/>
<p:outputLabel value="课题组："/>
<p:inputText value="#{personalUseInfoController.project}"/>
@@ -103,7 +109,7 @@
selectionMode="single"
emptyMessage="无数据"
selection="#{personalUseInfoController.selectOne}"
- rows="20" pageLinks="5">
+ rows="10" pageLinks="5">
<!-- <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>-->
<p:column headerText="单据编号">
@@ -115,7 +121,8 @@
</p:column>
<p:column headerText="领用数量" width="50">
- <h:outputText value="#{row.applyNum}"/>
+ <h:outputText value="#{personalUseInfoController.reagentName eq null
+ or personalUseInfoController.reagentName eq ''?row.applyNum:OpeUseFlowService.getApplyInfoSize(row.getReceiptNumber())}"/>
</p:column>
<p:column headerText="课题组">
--
Gitblit v1.9.2