From 12862728f6123b2a9a927f6bad97317bc651d8c2 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 23 四月 2021 15:43:39 +0800
Subject: [PATCH] 修改领用
---
src/main/webapp/warehouse_reagent_use_person.xhtml | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use_person.xhtml b/src/main/webapp/warehouse_reagent_use_person.xhtml
index bfdf613..cb9d1d0 100644
--- a/src/main/webapp/warehouse_reagent_use_person.xhtml
+++ b/src/main/webapp/warehouse_reagent_use_person.xhtml
@@ -45,6 +45,7 @@
<p:outputLabel value="实验室试剂柜："></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"
>
+ <f:ajax listener="#{warehouseStockMngController.setContainerId}"/>
<f:selectItems value="#{warehouseStockMngController.laboratoryContainers}"
var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
@@ -92,6 +93,10 @@
<h:outputText value="#{row.articleNumber}"></h:outputText>
</p:column>
+ <p:column headerText="申领人">
+ <h:outputText value="#{row.applyUserId}"></h:outputText>
+ </p:column>
+
<p:column headerText="申请数量">
<h:outputText value="#{row.num}"></h:outputText>
</p:column>
@@ -114,15 +119,15 @@
</p:panel>
</h:form>
<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
- <div id="printTarget">
- <div style=" margin: 11mm 27mm 0mm 30mm;">
+ <div id="printTarget" style="margin-right: -51px;">
+ <div style="margin: 25mm 17mm 0mm 15mm; ">
<h:form id="printDialog" style="width: 1100px">
- <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
- <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
+ <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.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;">
<!-- <input style="border: 0;" value="#{warehouseStockMngController.printTable['receiptNumber']}"/>-->
<p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
@@ -134,30 +139,30 @@
<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;">#{warehouseStockMngController.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;">#{warehouseStockMngController.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;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
</div>
</div>
<div style="margin-bottom: 20px;">
<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;">#{warehouseStockMngController.printTable['project']}</div>
</div>
<div style="display: inline-flex;">
- <div style="width: 100px;">使用地点:</div>
+ <div style="width: 100px;">使用地点：</div>
<div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
</div>
<div style="display: inline-flex;float: right;">
- <div style="width: 100px;">联系方式:</div>
+ <div style="width: 100px;">联系方式：</div>
<div style="width: 200px;">
<input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
</div>
@@ -198,14 +203,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>
@@ -216,7 +221,7 @@
<p:commandButton value="关闭"
process="@this"
styleClass="yes-btn"
- actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+ actionListener="#{warehouseStockMngController.closeDialog}"
style="position: relative;left: 20px;"
update=":centerRootPanel"
oncomplete="PF('printDialog').hide()">
--
Gitblit v1.9.2