From 760e53aeef80c287ced8b6716336733867fc7565 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期四, 07 三月 2024 08:30:57 +0800
Subject: [PATCH] 新增需求

---
 src/main/webapp/personal_use_info.xhtml |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index 327e4e1..9b9c981 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -93,6 +93,11 @@
 									 oncomplete="PF('dialog').show()"/>
 
 
+					<p:commandButton value="导出"
+									 styleClass="store-btn"
+									 ajax="false"
+									 actionListener="#{personalUseInfoController.exportDetail}" />
+
 
 			</p:panelGrid>
 			</p:panel>
@@ -234,7 +239,7 @@
 						</div>
 					</div>
 
-					<div style="margin-bottom: 20px;">
+					<div style="margin-bottom: 10px;">
 						<div style="display: inline-flex;">
 							<div style="width: 100px;margin-left: 10px;">课题组:</div>
 							<div style="width: 300px;">#{personalUseInfoController.printTable['project']}</div>
@@ -246,6 +251,13 @@
 						<div style="display: inline-flex;float: right;">
 							<div style="width: 100px;">联系方式:</div>
 							<div style="width: 200px;">#{personalUseInfoController.printTable['phone']}</div>
+						</div>
+					</div>
+
+					<div style="margin-bottom: 20px;">
+						<div style="display: inline-flex;">
+							<div style="width: 100px;margin-left: 10px;">备注:</div>
+							<div>#{personalUseInfoController.printTable['note']}</div>
 						</div>
 					</div>
 
@@ -282,17 +294,28 @@
 						</p:column>
 					</p:dataTable>
 
-					<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>
-					</div>
+					<div style="display: flex;flex-direction: row;justify-content: space-between;margin-top:20px; ">
+						<div style="margin-left: 94px;">
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;">
+								<div style="width: 100px">出库人:</div>
+								<div style="width: 100px"></div>
+							</div>
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px; ">
+								<div style="width: 100px">日期:</div>
+								<div style="width: 100px"></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>
+						<div style="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>
+							<div style="display: flex;flex-direction: row;justify-content: flex-end;margin-top:10px;">
+								<div style="width: 100px">日期:</div>
+								<div style="width: 100px"></div>
+							</div>
+
 						</div>
 					</div>
 

--
Gitblit v1.9.2