From 0dfab938c5116c8fa0191cadf36a47f5bb4f2936 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期四, 16 九月 2021 15:50:52 +0800
Subject: [PATCH] 申购：管制品 搜索
---
src/main/webapp/personal_use_info.xhtml | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index ff71fb3..327e4e1 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}"/>
@@ -60,14 +66,22 @@
<p:inputText value="#{personalUseInfoController.department}"/>
<p:outputLabel for="startTime" value="开始时间:" />
- <p:calendar id="startTime" value="#{personalUseInfoController.startTime}" pattern="yyyy-MM-dd HH:mm" />
+ <p:calendar id="startTime" value="#{personalUseInfoController.startTime}" />
<p:outputLabel for="endTime" value="截止时间:" />
- <p:calendar id="endTime" value="#{personalUseInfoController.endTime}" pattern="yyyy-MM-dd HH:mm" />
+ <p:calendar id="endTime" value="#{personalUseInfoController.endTime}" />
<p:commandLink styleClass="search" process="@form" update="@form"/>
- <p:commandButton value="生成领用单"
+ <p:commandButton value="取消领用"
style="background: #b94a48; border: 1px solid #b94a48"
+ styleClass="store-btn"
+ process="@form"
+ actionListener="#{personalUseInfoController.reagentReturn}"
+ update="@this">
+ <p:confirm header="确认" message="是否确认取消领用？"/>
+ </p:commandButton>
+
+ <p:commandButton value="生成领用单"
styleClass="store-btn"
process="@form"
actionListener="#{personalUseInfoController.generateReceipt}"
@@ -77,6 +91,7 @@
update=":dialog,:dialogForm"
actionListener="#{personalUseInfoController.detailInfo}"
oncomplete="PF('dialog').show()"/>
+
</p:panelGrid>
@@ -103,7 +118,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 +130,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="课题组">
@@ -189,46 +205,46 @@
</h:form>
</p:dialog>
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
- width="1380">
+ width="1258">
<div id="printTarget">
- <div style=" margin: 20mm 27mm 0mm 30mm;">
+ <div style=" margin: 20mm 16mm 0mm 10mm;">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
<div>
<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
- <div style="width: 98px;">单据编号:</div>
+ <div style="width: 98px;">单据编号：</div>
<div style="width: 183px;">#{personalUseInfoController.printTable['receiptNumber']}</div>
</div>
</div>
<div style="margin: 10px 0;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">部门:</div>
+ <div style="width: 100px;margin-left: 10px;">部门：</div>
<div style="width: 300px;">#{personalUseInfoController.printTable['department']}</div>
</div>
<div style="display: inline-flex;">
- <div style="width: 100px;">申购人:</div>
+ <div style="width: 100px;">申购人：</div>
<div style="width: 200px;padding-top: 1px;">#{personalUseInfoController.printTable['applyPerson']}</div>
</div>
<div style="display: inline-flex;float: right;">
- <div style="width: 100px;">日期:</div>
+ <div style="width: 100px;">日期：</div>
<div style="width: 200px;padding-top: 1px;">#{personalUseInfoController.printTable['date']}</div>
</div>
</div>
<div style="margin-bottom: 20px;">
<div style="display: inline-flex;">
- <div style="width: 100px;margin-left: 10px;">课题组</div>
+ <div style="width: 100px;margin-left: 10px;">课题组：</div>
<div style="width: 300px;">#{personalUseInfoController.printTable['project']}</div>
</div>
<div style="display: inline-flex;">
- <div style="width: 100px;">使用地点:</div>
+ <div style="width: 100px;">使用地点：</div>
<div style="width: 200px;padding-top: 1px;">#{personalUseInfoController.printTable['lab']}</div>
</div>
<div style="display: inline-flex;float: right;">
- <div style="width: 100px;">联系方式:</div>
+ <div style="width: 100px;">联系方式：</div>
<div style="width: 200px;">#{personalUseInfoController.printTable['phone']}</div>
</div>
</div>
@@ -268,14 +284,14 @@
<div style="margin-top: 20px;margin-right: 94px;">
<div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">签收人:</div>
+ <div style="width: 100px">签收人：</div>
<div style="width: 100px"></div>
</div>
</div>
<div style="margin: 10px 94px 10px 0;">
<div style="display: flex;flex-direction: row;justify-content: flex-end;">
- <div style="width: 100px">日期:</div>
+ <div style="width: 100px">日期：</div>
<div style="width: 100px"></div>
</div>
</div>
--
Gitblit v1.9.2