From e8a3e262f0c129e02f08a2b1ba15bcbb9a733d51 Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 25 六月 2021 16:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/webapp/sys_hazardous_waste.xhtml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/sys_hazardous_waste.xhtml b/src/main/webapp/sys_hazardous_waste.xhtml
index 58f27e9..92ce344 100644
--- a/src/main/webapp/sys_hazardous_waste.xhtml
+++ b/src/main/webapp/sys_hazardous_waste.xhtml
@@ -58,6 +58,8 @@
                 <p:panel styleClass="center-body">
                     <p:panelGrid columns="5" styleClass="btn">
                         <p:commandButton value="导出" styleClass="new-btn"   ajax="false" actionListener="#{hazardousWasteController.export2Excel}" />
+                        <p:commandButton value="取消" styleClass="del-btn"   ajax="false" actionListener="#{hazardousWasteController.cancelOne}" />
+                        <p:commandButton value="恢复" styleClass="edit-btn"   ajax="false" actionListener="#{hazardousWasteController.recoverOne}" />
                     </p:panelGrid>
                     <p:dataTable id="hazardousWasteInfoMngDataTable"
                                  styleClass="data-table"
@@ -65,6 +67,7 @@
                                  paginatorAlwaysVisible="false"
                                  paginatorPosition="bottom"
                                  lazy="true" value="#{hazardousWasteController.dataModel}"
+                                 selection="#{hazardousWasteController.selectedOne}"
                                  var="row"
                                  rowKey="#{row.id}"
                                  emptyMessage="无数据"

--
Gitblit v1.9.2