From c93ca1688e8685d1d81f313639c7523670153e70 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期三, 06 一月 2021 09:39:41 +0800
Subject: [PATCH] 模块：仓库库存管理》备货领取 修改：加入危险性质显示 提出：秦老师
---
src/main/webapp/warehouse_stock_mng.xhtml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index a061ad9..8b869c9 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -11,6 +11,7 @@
<ui:composition>
<p:tabView dynamic="true">
<p:tab title="备货领取">
+ <div id ="showTab" style="display: none">
<h:form id="tmp">
<p:panel styleClass="center-body">
<p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
@@ -20,7 +21,7 @@
<p:commandButton value="清空" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.clear}"
disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
- <p:commandButton value="领用" styleClass="edit-btn" process="@form"
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.onUseBtnClick}"
disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
</p:panelGrid>
@@ -69,6 +70,7 @@
</p:dataTable>
</p:panel>
</h:form>
+ </div>
<br/>
<h:form id="warehouseStockMngForm">
<p:panel styleClass="center-header">
@@ -89,10 +91,10 @@
</p:panel>
<p:panel styleClass="center-body">
<p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
- <p:commandButton value="添加" styleClass="edit-btn" process="@form"
+ <p:commandButton value="领用" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.add}"
disabled="#{warehouseStockMngController.editFlag==0}"
-
+ oncomplete="$('#showTab').css('display','block');"
update=":centerRootPanel"></p:commandButton>
<p:commandButton value="入库" styleClass="ruku-btn"
process="@form"
@@ -141,6 +143,10 @@
<h:outputText value="#{row.reagent.supplierName}"></h:outputText>
</p:column>
+ <p:column headerText="危险性质">
+ <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}"/>
+ </p:column>
+
<p:column headerText="规格">
<h:outputText
value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
--
Gitblit v1.9.2