From d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 27 一月 2021 16:54:34 +0800
Subject: [PATCH] 合并
---
src/main/webapp/warehouse_reagent_use.xhtml | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index a32a5f1..5232d75 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -205,15 +205,15 @@
<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 style="margin: 11mm 27mm 0mm 30mm;">
<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>
<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;">
--
Gitblit v1.9.2