From 15c0421c864198b125c30589fa43c50eaa00b36e Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 10 二月 2023 10:30:02 +0800
Subject: [PATCH] 中国科学院重庆绿色智能技术研究院 配置

---
 src/main/webapp/personal_use_info.xhtml |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index ef84dc5..9f9d4a7 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -66,9 +66,9 @@
 					<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"/>
 
@@ -92,6 +92,11 @@
 									 actionListener="#{personalUseInfoController.detailInfo}"
 									 oncomplete="PF('dialog').show()"/>
 
+
+					<p:commandButton value="导出"
+									 styleClass="store-btn"
+									 ajax="false"
+									 actionListener="#{personalUseInfoController.exportDetail}" />
 
 
 			</p:panelGrid>
@@ -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>
@@ -249,6 +254,13 @@
 						</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>
+
 
 
 

--
Gitblit v1.9.2