From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 15:18:58 +0800
Subject: [PATCH] 订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题
---
src/main/webapp/warehouse_stock_mng.xhtml | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index de017d9..9978d02 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -360,7 +360,7 @@
<br/>
<h:form id="warehouseStockMngFormForPerson">
<p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="14">
+ <p:panelGrid styleClass="filter" columns="16">
<style type="text/css">
.ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
min-width: 60px !important;
@@ -384,6 +384,9 @@
<f:selectItems value="#{warehouseStockMngController.statusSelectList}" var="item"
itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
</p:selectOneMenu>
+ <p:outputLabel value="过期："></p:outputLabel>
+ <p:selectBooleanCheckbox value="#{warehouseStockMngController.isExpired}"
+ itemLabel=""/>
<p:outputLabel value="已领用："></p:outputLabel>
<p:selectOneMenu value="#{warehouseStockMngController.isAllApply}" style="width: 60px;">
@@ -398,7 +401,7 @@
<p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
+ <p:panelGrid columns="7" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
<p:commandButton value="入库" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.addInputStorageOrder}"
disabled="#{warehouseStockMngController.editFlag==0}"
@@ -411,6 +414,17 @@
oncomplete="$('#showTabOrder').css('display','block');$('#putInStorage').css('display','none');"
update="@(.tmpOrder)"
></p:commandButton>
+
+ <p:commandButton value="过期处理" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.expireOrder}"
+ disabled="#{warehouseStockMngController.editFlag==0}"
+ update=":centerRootPanel"
+ ></p:commandButton>
+ <p:commandButton value="恢复处理" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.recoverOrder}"
+ disabled="#{warehouseStockMngController.editFlag==0}"
+ update=":centerRootPanel"
+ ></p:commandButton>
<p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickOrder}"
ajax="false" value="导出" styleClass="new-btn" />
</p:panelGrid>
--
Gitblit v1.9.2