From a1e90c3da21d88f994bac9c1feb91bf40e53a44d Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期三, 18 八月 2021 13:01:21 +0800
Subject: [PATCH] 耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材
---
src/main/webapp/warehouse_stock_mng.xhtml | 570 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 410 insertions(+), 160 deletions(-)
diff --git a/src/main/webapp/warehouse_stock_mng.xhtml b/src/main/webapp/warehouse_stock_mng.xhtml
index a061ad9..9978d02 100644
--- a/src/main/webapp/warehouse_stock_mng.xhtml
+++ b/src/main/webapp/warehouse_stock_mng.xhtml
@@ -9,70 +9,80 @@
xmlns:c="http://java.sun.com/jsp/jstl/core">
<head></head>
<ui:composition>
- <p:tabView dynamic="true">
- <p:tab title="备货领取">
- <h:form id="tmp">
- <p:panel styleClass="center-body">
- <p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
- <p:commandButton value="删除" styleClass="del-btn" process="@form"
- actionListener="#{warehouseStockMngController.cancel}"
- disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
- <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"
- actionListener="#{warehouseStockMngController.onUseBtnClick}"
- disabled="#{warehouseStockMngController.editFlag==0}" update=":centerRootPanel"/>
- </p:panelGrid>
- <p:dataTable id="tempTable" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.selectedTmpList}" var="row"
- selection="#{warehouseStockMngController.trulySelectedList}"
- 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:tabView dynamic="true" id="tabView" activeIndex="#{warehouseStockMngController.tabValue}">
+ <p:ajax event="tabChange" listener="#{warehouseStockMngController.onTabChange}"/>
+ <p:tab title="备货领取" id="firstTab">
+ <div id ="showTab" style="display: none">
+ <h:form id="tmp">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hide}"
+ update="@(.tempTable)"/>
+ <p:commandButton value="删除" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.cancel}"
+ update="@(.tempTable)"/>
+ <p:commandButton value="清空" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.clear}"
+ update="@(.tempTable)"/>
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.onUseBtnClick}"
+ update=":centerRootPanel"/>
+ </p:panelGrid>
+ <p:dataTable id="tempTable" styleClass="tempTable data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.selectedTmpList}" var="row"
+ selection="#{warehouseStockMngController.trulySelectedList}"
+ 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="CAS">
- <h:outputText value="#{row.reagent.cas}"/>
- </p:column>
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
+ </p:column>
- <p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHomeName}"/>
- </p:column>
- <p:column headerText="供应商">
- <h:outputText value="#{row.reagent.supplierName}"/>
- </p:column>
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"/>
+ </p:column>
- <p:column headerText="规格">
- <h:outputText
- value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"/>
- </p:column>
+ <p:column headerText="厂家">
+ <h:outputText value="#{row.reagent.productHomeName}"/>
+ </p:column>
+ <p:column headerText="供应商">
+ <h:outputText value="#{row.reagent.supplierName}"/>
+ </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="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"/>
+ </p:column>
- <p:column headerText="批号">
- <h:outputText value="#{row.articleNumber}"/>
- </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.reserve}"/>
- </p:column>
- <p:column headerText="仓库">
- <h:outputText value="#{row.warehouseName}"/>
- </p:column>
- </p:dataTable>
- </p:panel>
- </h:form>
+ <p:column headerText="批号">
+ <h:outputText value="#{row.articleNumber}"/>
+ </p:column>
+
+ <p:column headerText="库存">
+ <h:outputText value="#{row.reserve}"/>
+ </p:column>
+ <p:column headerText="仓库">
+ <h:outputText value="#{row.warehouseName}"/>
+ </p:column>
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </div>
<br/>
<h:form id="warehouseStockMngForm">
<p:panel styleClass="center-header">
- <p:panelGrid styleClass="filter" columns="5">
+ <p:panelGrid styleClass="filter" columns="9">
<p:outputLabel value="试剂名称："></p:outputLabel>
<p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -81,24 +91,30 @@
<p:selectOneMenu value="#{warehouseStockMngController.supplierId}">
<f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
<f:selectItems value="#{warehouseStockMngController.supplierSelectList}"
- var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
+ var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
</p:selectOneMenu>
+
+ <p:outputLabel value="仓库名："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.warehouseName}"></p:inputText>
+
+ <p:outputLabel value="产品编号："></p:outputLabel>
+ <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
</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"
- actionListener="#{warehouseStockMngController.add}"
+ <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"
+ process="@form"
disabled="#{warehouseStockMngController.editFlag==0}"
- actionListener="#{warehouseStockMngController.onDStoreBtnClick}"
- update=":centerRootPanel"></p:commandButton>
+ actionListener="#{warehouseStockMngController.onDStoreBtnClick}"
+ update=":centerRootPanel"></p:commandButton>
<p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickNew}"
ajax="false" value="导出" styleClass="new-btn" />
<!--<p:commandButton value="导入" styleClass="import-btn" onclick="importStock()"
@@ -121,13 +137,17 @@
</p:panelGrid>
<p:dataTable id="warehouseStockMngDataTable" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.dataModel}" var="row"
- selection="#{warehouseStockMngController.selectedList}" rowKey="#{row.id}"
- emptyMessage="无数据" rows="20" pageLinks="5">
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.dataModel}" var="row"
+ selection="#{warehouseStockMngController.selectedList}" 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}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
</p:column>
<p:column headerText="CAS">
@@ -141,14 +161,18 @@
<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>
+ value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}"></h:outputText>
</p:column>
<p:column headerText="包装">
<h:outputText
- value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
+ value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"></h:outputText>
</p:column>
<p:column headerText="批号">
@@ -171,6 +195,323 @@
</div>
</h:form>
</p:tab>
+ <p:tab title="订单领取" id="secondTab">
+ <div id ="showTabOrder" style="display: none">
+ <h:form id="tmpOrder" styleClass="tmpOrder">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hideOrderTmp}"
+ update="@(.tmpOrder)"
+ />
+ <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>
+ <div id ="putInStorage" style="display: none">
+ <h:form id="putInStorageTmpOrder" styleClass="inputStorageTmp">
+ <p:panel styleClass="center-body">
+ <p:panelGrid columns="4" styleClass="btn">
+ <p:commandButton value="返回" styleClass="import-btn" process="@form"
+ actionListener="#{warehouseStockMngController.hideInputStorageTmp}"
+ update="@(.inputStorageTmp)"
+ />
+ <p:commandButton value="删除" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.cancelInputStorageTmp}"
+ update="@(.inputStorageTmp)"
+ />
+ <p:commandButton value="清空" styleClass="del-btn" process="@form"
+ actionListener="#{warehouseStockMngController.clearInputStorageTmp}"
+ update="@(.inputStorageTmp)"
+ />
+ <p:commandButton value="提交" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.onUseBtnClickInputStorageTmp}"
+ update=":centerRootPanel"/>
+ </p:panelGrid>
+ <p:dataTable id="putInStorageTmpOrderTable" styleClass="data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.selectedInputStorageTmpOrderList}" var="row"
+ selection="#{warehouseStockMngController.trulyInputStorageTmpSelectedOrderList}"
+ rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+
+ <p:column headerText="申购编号" width="170">
+ <h:outputText value="#{row.applyCode}"/>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"/>
+ </p:column>
+
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"/>
+ </p:column>
+
+ <p:column headerText="管制品">
+ <h:outputText value="#{row.reagent.controlProducts}"/>
+ </p:column>
+
+ <p:column headerText="规格">
+ <h:outputText value="#{row.reagent.reagentFormat}"/>
+ </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.reagent.price}"/>
+ </p:column>
+
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"/>
+ </p:column>
+
+ <p:column headerText="危险性质">
+ <h:outputText value="#{row.reagent.reagentCharacter}"/>
+ </p:column>
+
+ <p:column headerText="厂商">
+ <h:outputText
+ value="#{row.reagent.productHome}"/>
+ </p:column>
+
+ <p:column headerText="申请数量">
+ <h:outputText
+ value="#{row.num}"/>
+ </p:column>
+
+ <p:column headerText="已领用数量">
+ <h:outputText
+ value="#{row.used}"/>
+ </p:column>
+
+ <p:column headerText="申领人">
+ <h:outputText
+ value="#{row.applyUserId}"/>
+ </p:column>
+
+ <p:column headerText="订单状态">
+ <h:outputText value="#{row.status.getText()}"/>
+ </p:column>
+
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </div>
+ <br/>
+ <h:form id="warehouseStockMngFormForPerson">
+ <p:panel styleClass="center-header" style="border-bottom:none;">
+ <p:panelGrid styleClass="filter" columns="16">
+ <style type="text/css">
+ .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
+ min-width: 60px !important;
+ }
+ .ui-selectonemenu-items.ui-selectonemenu-list.ui-widget-content.ui-widget.ui-corner-all.ui-helper-reset{
+ width: 77px !important;
+ }
+ </style>
+
+ <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}" style="width: 60px;">
+ <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:outputLabel value="过期："></p:outputLabel>
+ <p:selectBooleanCheckbox value="#{warehouseStockMngController.isExpired}"
+ itemLabel=""/>
+
+ <p:outputLabel value="已领用："></p:outputLabel>
+ <p:selectOneMenu value="#{warehouseStockMngController.isAllApply}" style="width: 60px;">
+ <f:selectItem itemLabel="否" itemValue="0"/>
+ <f:selectItem itemLabel="是" itemValue="1"/>
+ <f:selectItem itemLabel="全部" noSelectionOption="true"/>
+ </p:selectOneMenu>
+
+ <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
+ </p:panelGrid>
+ </p:panel>
+
+ <p:panel styleClass="center-body">
+
+ <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}"
+ oncomplete="$('#putInStorage').css('display','block');$('#showTabOrder').css('display','none');"
+ update="@(.inputStorageTmp)"
+ ></p:commandButton>
+ <p:commandButton value="领用" styleClass="edit-btn" process="@form"
+ actionListener="#{warehouseStockMngController.addOrder}"
+ disabled="#{warehouseStockMngController.editFlag==0}"
+ 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>
+
+ <p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
+ paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
+ lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
+ selection="#{warehouseStockMngController.selectedListForPerson}" rowKey="#{row.id}"
+ emptyMessage="无数据" rows="20" pageLinks="5">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />
+
+ <p:column headerText="申购编号" width="150">
+ <h:outputText value="#{row.applyCode}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="产品编号">
+ <h:outputText value="#{row.reagent.productSn}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="试剂名称">
+ <h:outputText value="#{row.reagent.name}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="管制品">
+ <h:outputText value="#{row.reagent.controlProducts}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="规格型号">
+ <h:outputText
+ value="#{row.reagent.reagentFormat}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="包装">
+ <h:outputText
+ value="#{row.reagent.mainMetering}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="价格">
+ <h:outputText value="#{row.reagent.price}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="CAS">
+ <h:outputText value="#{row.reagent.cas}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="危险性质">
+ <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="厂家">
+ <h:outputText value="#{row.reagent.productHome}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="申请数量">
+ <h:outputText value="#{row.num}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="已领用数量">
+ <h:outputText value="#{row.used}"></h:outputText>
+ </p:column>
+
+ <p:column headerText="申领人">
+ <h:outputText value="#{row.applyUserId}" />
+ </p:column>
+ <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:column headerText="到货时间">
+ <h:outputText value="#{row.arrivalTime}">
+ <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
+ </h:outputText>
+ </p:column>
+ </p:dataTable>
+ </p:panel>
+ </h:form>
+ </p:tab>
+
+
+
<!-- 目前领取记录查询是最新状态试剂表，应该是试剂履历表。目前客户不太需要这个画面，所以先去掉了 -->
<!--
<p:tab title="领取记录">
@@ -327,97 +668,6 @@
</p:tab>
-->
-
- <p:tab title="订单领取">
- <h:form id="warehouseStockMngFormForPerson">
- <p:panel styleClass="center-header" style="border-bottom:none;">
- <p:panelGrid styleClass="filter" columns="5">
-
- <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:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
- </p:panelGrid>
- </p:panel>
-
- <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>
- </p:panelGrid>
-
- <p:dataTable id="warehouseStockMngDataTableForPerson" styleClass="data-table"
- paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
- lazy="true" value="#{warehouseStockMngController.dataModelForPerson}" var="row"
- selection="#{warehouseStockMngController.selectedListForPerson}" 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.applyCode}"></h:outputText>
- </p:column>
-
- <p:column headerText="产品编号">
- <h:outputText value="#{row.reagent.productSn}"></h:outputText>
- </p:column>
-
- <p:column headerText="试剂名称">
- <h:outputText value="#{row.reagent.name}"></h:outputText>
- </p:column>
-
- <p:column headerText="管制品">
- <h:outputText value="#{row.reagent.controlProducts}"></h:outputText>
- </p:column>
-
- <p:column headerText="规格型号">
- <h:outputText
- value="#{row.reagent.reagentFormat}"></h:outputText>
- </p:column>
-
- <p:column headerText="包装">
- <h:outputText
- value="#{row.reagent.mainMetering}"></h:outputText>
- </p:column>
-
- <p:column headerText="价格">
- <h:outputText value="#{row.reagent.price}"></h:outputText>
- </p:column>
-
- <p:column headerText="CAS">
- <h:outputText value="#{row.reagent.cas}"></h:outputText>
- </p:column>
-
- <p:column headerText="危险性质">
- <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
- </p:column>
-
- <p:column headerText="厂家">
- <h:outputText value="#{row.reagent.productHome}"></h:outputText>
- </p:column>
-
- <p:column headerText="申请数量">
- <h:outputText value="#{row.num}"></h:outputText>
- </p:column>
-
- <p:column headerText="已领用数量">
- <h:outputText value="#{row.used}"></h:outputText>
- </p:column>
-
- <p:column headerText="申领人">
- <h:outputText value="#{row.applyUserId}" />
- </p:column>
- <p:column headerText="订单状态">
- <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
- </p:column>
- </p:dataTable>
- </p:panel>
- </h:form>
- </p:tab>
-
</p:tabView>
</ui:composition>
</html>
--
Gitblit v1.9.2