From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/personal_use_info.xhtml | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/personal_use_info.xhtml b/src/main/webapp/personal_use_info.xhtml
index 9f9d4a7..6689128 100644
--- a/src/main/webapp/personal_use_info.xhtml
+++ b/src/main/webapp/personal_use_info.xhtml
@@ -140,7 +140,7 @@
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{row.project}"/>
+ <h:outputText value="#{row.projectName}"/>
</p:column>
<p:column headerText="部门">
@@ -212,7 +212,7 @@
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
width="1258">
<div id="printTarget">
- <div style=" margin: 20mm 16mm 0mm 10mm;">
+ <div style="margin: 20mm 16mm 0mm 10mm;">
<h:form id="printDialog" style="width: 1100px">
<p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
@@ -294,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