From 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 03 二月 2021 15:48:28 +0800
Subject: [PATCH] 取消领用

---
 src/main/webapp/warehouse_reagent_use.xhtml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index a32a5f1..1e1f563 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -204,16 +204,16 @@
 
 
 	<p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
-		<div id="printTarget">
-			<div style=" margin: 10mm 10mm 0mm 2mm;">
+		<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;margin-right: 17px;">
-					<div style="width: 100px;">单据编号:</div>
-					<div>
+				<div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
+					<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}">
 							<p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}"  />
@@ -273,7 +273,7 @@
 		</p:column>
 
 		<p:column headerText="包装" width="90px;" style="text-align: center;">
-			<h:outputText value="#{row.mainMetering==null?'':row.mainMetering}" />
+			<h:outputText value="#{row.mainMetering==null?'':row.mainMetering.replace('null','')}" />
 		</p:column>
 
 		<p:column headerText="数量" width="90px;" style="text-align: center;">
@@ -303,7 +303,7 @@
 				<p:commandButton value="关闭"
 								 process="@this"
 								 styleClass="yes-btn"
-								 actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+								 actionListener="#{warehouseStockMngController.closeDialog2}"
 								 style="position: relative;left: 20px;"
 								 update=":centerRootPanel"
 								 oncomplete="PF('printDialog').hide()">

--
Gitblit v1.9.2