From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 15:48:28 +0800
Subject: [PATCH] 取消领用

---
 src/main/webapp/personal_use_info.xhtml |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index 5b4174d..438722f 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -72,8 +72,16 @@
 
 					<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>
@@ -196,13 +205,13 @@
 		</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>

--
Gitblit v1.9.2