From 8b6a2a67a0bf081252648ba46fffd5591b3afc98 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 11:46:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/warehouse_stock_mng.xhtml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index c5d2f4d..71d49af 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -15,7 +15,10 @@
<div id ="showTab" style="display: none">
<h:form id="tmp">
<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.hide}"
+ update="@(.tempTable)"/>
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancel}"
update="@(.tempTable)"/>
@@ -196,7 +199,11 @@
<div id ="showTabOrder" style="display: none">
<h:form id="tmpOrder" styleClass="tmpOrder">
<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.hideOrderTmp}"
+ update="@(.tmpOrder)"
+ />
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancelOrderTmp}"
update="@(.tmpOrder)"
--
Gitblit v1.9.2