From b02535c9a99324823812f6c2d08f066d8e1ba75f Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 18 一月 2021 09:57:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/warehouse_stock_mng.xhtml | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index a97ef7d..f2adcf3 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -37,6 +37,10 @@
<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>
@@ -75,7 +79,7 @@
<br/>
<h:form id="warehouseStockMngForm">
<p:panel styleClass="center-header">
- <p:panelGrid styleClass="filter" columns="5">
+ <p:panelGrid styleClass="filter" columns="7">
<p:outputLabel value="试剂名称："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -86,6 +90,9 @@
<f:selectItems value="#{warehouseStockMngController.supplierSelectList}"
var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
+
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
@@ -131,6 +138,10 @@
<p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
<p:column headerText="试剂名称">
<h:outputText value="#{row.reagent.name}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
</p:column>
<p:column headerText="CAS">
@@ -245,12 +256,22 @@
</div>
<h:form id="warehouseStockMngFormForPerson">
<p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="5">
+ <p:panelGrid styleClass="filter" columns="12">
<p:outputLabel value="试剂名称："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
<p:outputLabel value="申领人："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.userName}"></p:inputText>
+ <p:outputLabel value="申购编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.applyCode}"></p:inputText>
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
+ <p:outputLabel value="状态："></p:outputLabel>
+ <p:selectOneMenu value="#{warehouseStockMngController.status}">
+ <f:selectItem itemLabel="全部" noSelectionOption="true"></f:selectItem>
+ <f:selectItems value="#{warehouseStockMngController.statusSelectList}" var="item"
+ itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
+ </p:selectOneMenu>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
@@ -266,6 +287,8 @@
oncomplete="$('#showTabOrder').css('display','block');"
update="@(.tmpOrder)"
></p:commandButton>
+ <p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickOrder}"
+ ajax="false" value="导出" styleClass="new-btn" />
</p:panelGrid>
<p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
@@ -331,6 +354,12 @@
<p:column headerText="订单状态">
<h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
</p:column>
+ <p:column headerText="课题组">
+ <h:outputText value="#{row.project}" />
+ </p:column>
+ <p:column headerText="课题组负责人">
+ <h:outputText value="#{row.projectManage}" />
+ </p:column>
</p:dataTable>
</p:panel>
</h:form>
--
Gitblit v1.9.2