From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/webapp/personal_use_info.xhtml | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index de19120..327e4e1 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -66,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}"
@@ -83,6 +91,7 @@
update=":dialog,:dialogForm"
actionListener="#{personalUseInfoController.detailInfo}"
oncomplete="PF('dialog').show()"/>
+
</p:panelGrid>
@@ -205,37 +214,37 @@
<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>
@@ -275,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