From 19ff5993c13a86934fe29b3a58a88d29258dfda5 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 13 十二月 2021 10:28:47 +0800
Subject: [PATCH] 货柜预警:判断重复插入

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

diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index 438722f..cc56000 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"/>
 
@@ -214,38 +214,45 @@
 					<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: 10px;">
+						<div style="display: inline-flex;">
+							<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: 200px;padding-top: 1px;">#{personalUseInfoController.printTable['lab']}</div>
+						</div>
+						<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 style="width: 300px;">#{personalUseInfoController.printTable['project']}</div>
-						</div>
-						<div style="display: inline-flex;">
-							<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: 200px;">#{personalUseInfoController.printTable['phone']}</div>
+							<div style="width: 100px;margin-left: 10px;">备注:</div>
+							<div>#{personalUseInfoController.printTable['note']}</div>
 						</div>
 					</div>
 
@@ -284,14 +291,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