From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/warehouse_stock_mng.xhtml | 7 ++++++-
src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java | 6 ++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
index ec23705..2962b20 100644
--- a/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
+++ b/src/main/java/com/nanometer/smartlab/controller/WarehouseStockMngController.java
@@ -542,6 +542,12 @@
selectedInputStorageTmpOrderList = null;
}
+ public void hideInputStorageTmp(){
+ selectedInputStorageTmpOrderList = null;
+
+ RequestContext.getCurrentInstance().execute("document.getElementById('putInStorage').style.display='none'");
+ }
+
public void cancel(){
if (trulySelectedList == null || trulySelectedList.size()<=0){
FacesUtils.info("至少选择一个");
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index 71d49af..de017d9 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -267,7 +267,11 @@
<div id ="putInStorage" style="display: none">
<h:form id="putInStorageTmpOrder" styleClass="inputStorageTmp">
<p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hideInputStorageTmp}"
+ update="@(.inputStorageTmp)"
+ />
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancelInputStorageTmp}"
update="@(.inputStorageTmp)"
@@ -353,6 +357,7 @@
</p:panel>
</h:form>
</div>
+ <br/>
<h:form id="warehouseStockMngFormForPerson">
<p:panel styleClass="center-header" style="border-bottom:none;">
<p:panelGrid styleClass="filter" columns="14">
--
Gitblit v1.9.2