From d9f60308ed6aee9c4fbf9c073741dc78fc525b00 Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: Thu, 07 Jan 2021 10:58:24 +0800
Subject: [PATCH] 新增：账户查询 修改：用户导入判断
---
src/main/webapp/warehouse_stock_mng.xhtml | 96 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 85 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index a061ad9..d13c3f1 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -11,20 +11,21 @@
<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}">
+ <p:panelGrid columns="3" styleClass="btn">
<p:commandButton value="删除" styleClass="del-btn" process="@form"
actionListener="#{warehouseStockMngController.cancel}"
- disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
+ update="@(.tempTable)"/>
<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"
+ update="@(.tempTable)"/>
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
actionListener="#{warehouseStockMngController.onUseBtnClick}"
- disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
+ update=":centerRootPanel"/>
</p:panelGrid>
- <p:dataTable id="tempTable" styleClass="data-table"
+ <p:dataTable id="tempTable" styleClass="tempTable data-table"
paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
lazy="true" value="#{warehouseStockMngController.selectedTmpList}" var="row"
selection="#{warehouseStockMngController.trulySelectedList}"
@@ -69,6 +70,7 @@
</p:dataTable>
</p:panel>
</h:form>
+ </div>
<br/>
<h:form id="warehouseStockMngForm">
<p:panel styleClass="center-header">
@@ -89,11 +91,11 @@
</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}"
-
- update=":centerRootPanel"></p:commandButton>
+ oncomplete="$('#showTab').css('display','block');"
+ update="@(.tempTable)"></p:commandButton>
<p:commandButton value="入库" styleClass="ruku-btn"
process="@form"
disabled="#{warehouseStockMngController.editFlag==0}"
@@ -139,6 +141,10 @@
</p:column>
<p:column headerText="供应商">
<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="规格">
@@ -329,6 +335,70 @@
-->
<p:tab title="订单领取">
+ <div id ="showTabOrder" style="display: none">
+ <h:form id="tmpOrder" styleClass="tmpOrder">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="3" styleClass="btn">
+ <p:commandButton value="删除" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.cancelOrderTmp}"
+ update="@(.tmpOrder)"
+ />
+ <p:commandButton value="清空" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.clearOrderTmp}"
+ update="@(.tmpOrder)"
+ />
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.onUseBtnClickOrderTmp}"
+ update=":centerRootPanel"/>
+ </p:panelGrid>
+ <p:dataTable id="tempOrderTable" styleClass="data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.selectedTmpOrderList}" var="row"
+ selection="#{warehouseStockMngController.trulySelectedOrderList}"
+ rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"/>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
+ </p:column>
+
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"/>
+ </p:column>
+
+ <p:column headerText="规格">
+ <h:outputText value="#{row.reagent.reagentFormat}"/>
+ </p:column>
+
+ <p:column headerText="危险性质">
+ <h:outputText value="#{row.reagent.reagentCharacter}"/>
+ </p:column>
+ <p:column headerText="价格">
+ <h:outputText value="#{row.reagent.price}"/>
+ </p:column>
+
+ <p:column headerText="厂商">
+ <h:outputText
+ value="#{row.reagent.productHome}"/>
+ </p:column>
+
+ <p:column headerText="包装">
+ <h:outputText
+ value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
+ </p:column>
+
+ <p:column headerText="批号">
+ <h:outputText value="#{row.articleNumber}"/>
+ </p:column>
+
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </div>
<h:form id="warehouseStockMngFormForPerson">
<p:panel styleClass="center-header" style="border-bottom:none;">
<p:panelGrid styleClass="filter" columns="5">
@@ -345,9 +415,13 @@
<p:panel styleClass="center-body">
<p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
+
<p:commandButton value="领用" styleClass="edit-btn" process="@form"
- actionListener="#{warehouseStockMngController.onUseBtnClickForPerson}"
- update=":centerRootPanel"></p:commandButton>
+ actionListener="#{warehouseStockMngController.addOrder}"
+ disabled="#{warehouseStockMngController.editFlag==0}"
+ oncomplete="$('#showTabOrder').css('display','block');"
+ update="@(.tmpOrder)"
+ ></p:commandButton>
</p:panelGrid>
<p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
--
Gitblit v1.9.2