From 8fca402ad743c884d106c0977cb792ca26bd5617 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 25 一月 2021 11:11:43 +0800
Subject: [PATCH] add

---
 src/main/webapp/warehouse_reagent_use.xhtml |   65 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/main/webapp/warehouse_reagent_use.xhtml b/src/main/webapp/warehouse_reagent_use.xhtml
index b787822..504a5eb 100644
--- a/src/main/webapp/warehouse_reagent_use.xhtml
+++ b/src/main/webapp/warehouse_reagent_use.xhtml
@@ -213,7 +213,10 @@
 				<div>
 					<div style="display: flex;flex-direction: row;justify-content: flex-end;">
 						<div style="width: 100px;">单据编号:</div>
-						<div style="width: 300px;"><input style="border: 0;" value=""/></div>
+						<div style="width: 300px;">
+							<p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
+							<p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}"  />
+						</p:inputText></div>
 					</div>
 				</div>
 
@@ -261,7 +264,7 @@
 		</p:column>
 
 		<p:column headerText="包装" width="90px;" style="text-align: center;">
-			<h:outputText value="#{row.mainMetering}" />
+			<h:outputText value="#{row.mainMetering==null?'':row.mainMetering}" />
 		</p:column>
 
 		<p:column headerText="数量" width="90px;" style="text-align: center;">
@@ -288,8 +291,32 @@
 			</div>
 
 			<p:panel styleClass="btn  no-print">
-			<div class="div-btn cancel" id="cancel">关闭</div>
-			<div class="div-btn print" id="print">打印</div>
+				<p:commandButton value="关闭"
+								 process="@this"
+								 styleClass="yes-btn"
+								 actionListener="#{warehouseStockMngController.onCancelBtnClick}"
+								 style="position: relative;left: 20px;"
+								 update=":centerRootPanel"
+								 oncomplete="PF('printDialog').hide()">
+				</p:commandButton>
+				<div style="display: none" id="indirectPrint"></div>
+				<p:commandButton value="打印"
+								 styleClass="yes-btn"
+								 actionListener="#{warehouseStockMngController.associatedFlowReceiptNumber2()}"
+								 style="position: relative;left: 20px;"
+				>
+				</p:commandButton>
+
+				<script type="text/javascript" src="resources/js/print.js"/>
+				<script type="text/javascript">
+					$(function () {
+						$("#indirectPrint").on("click", function () {
+							jQuery.print('#printTarget')
+						})
+					})
+
+
+				</script>
 			</p:panel>
 		</h:form>
 			</div>
@@ -308,24 +335,24 @@
 							<p:column><p:inputNumber value="#{warehouseStockMngController.useNum}"
 													 minValue="0" decimalPlaces="0"
 													 required="true" requiredMessage="请输入领用数量" id="useNum"/></p:column>
-							<p:column><p:outputLabel  value="条码情况" /></p:column>
-							<p:column><p:selectOneMenu id="advanced"   panelStyle="width:180px"
-											 effect="fade"  style="width:160px" filter="true" filterMatchMode="startsWith">
-								<f:selectItems value="#{warehouseStockMngController.showCodes}" var="code"  itemValue="#{code}" />
+<!--							<p:column><p:outputLabel  value="条码情况" /></p:column>-->
+<!--							<p:column><p:selectOneMenu id="advanced"   panelStyle="width:180px"-->
+<!--											 effect="fade"  style="width:160px" filter="true" filterMatchMode="startsWith">-->
+<!--								<f:selectItems value="#{warehouseStockMngController.showCodes}" var="code"  itemValue="#{code}" />-->
 
 
-								<p:column>
-									<f:facet name="header">
-										<h:outputText value="Name"/>
-									</f:facet>
-								</p:column>
+<!--								<p:column>-->
+<!--									<f:facet name="header">-->
+<!--										<h:outputText value="Name"/>-->
+<!--									</f:facet>-->
+<!--								</p:column>-->
 
-								<f:facet name="footer">
-									<p:separator />
-									<h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>
-								</f:facet>
-							</p:selectOneMenu>
-							</p:column>
+<!--								<f:facet name="footer">-->
+<!--									<p:separator />-->
+<!--									<h:outputText value="#{warehouseStockMngController.showCodes.size()} themes" style="font-weight:bold;"/>-->
+<!--								</f:facet>-->
+<!--							</p:selectOneMenu>-->
+<!--							</p:column>-->
 						</p:row>
 						<p:row>
 							<p:column><p:outputLabel value="条形码开始">

--
Gitblit v1.9.2