src/main/webapp/warehouse_stock_mng.xhtml
@@ -7,6 +7,7 @@
   xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui"
   xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
   xmlns:c="http://java.sun.com/jsp/jstl/core">
<head></head>
<ui:composition>
   <p:tabView dynamic="true" id="tabView" activeIndex="#{warehouseStockMngController.tabValue}">
      <p:ajax event="tabChange" listener="#{warehouseStockMngController.onTabChange}"/>
@@ -14,7 +15,10 @@
         <div id ="showTab" style="display: none">
            <h:form id="tmp">
               <p:panel styleClass="center-body">
                  <p:panelGrid columns="3" styleClass="btn">
                  <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)"/>
@@ -34,6 +38,10 @@
                     <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">
@@ -74,7 +82,7 @@
         <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>
@@ -85,6 +93,12 @@
                     <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.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>
@@ -130,6 +144,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">
@@ -181,7 +199,11 @@
         <div id ="showTabOrder" style="display: none">
            <h:form id="tmpOrder" styleClass="tmpOrder">
               <p:panel styleClass="center-body">
                  <p:panelGrid columns="3" styleClass="btn">
                  <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)"
@@ -245,7 +267,11 @@
         <div id ="putInStorage" style="display: none">
            <h:form id="putInStorageTmpOrder" styleClass="inputStorageTmp">
               <p:panel styleClass="center-body">
                  <p:panelGrid columns="3" styleClass="btn">
                  <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)"
@@ -331,14 +357,43 @@
               </p:panel>
            </h:form>
         </div>
         <br/>
         <h:form id="warehouseStockMngFormForPerson">
            <p:panel styleClass="center-header" style="border-bottom:none;">
               <p:panelGrid styleClass="filter" columns="5">
               <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>
@@ -346,7 +401,7 @@
            <p:panel styleClass="center-body">
               <p:panelGrid columns="2" 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}"
@@ -359,6 +414,19 @@
                               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"
@@ -424,6 +492,14 @@
                  <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"/>