耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材

李宇

2021-08-18 a1e90c3da21d88f994bac9c1feb91bf40e53a44d

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -15,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)"/>
@@ -196,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)"
@@ -260,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)"
@@ -346,9 +357,18 @@
               </p:panel>
            </h:form>
         </div>
         <br/>
         <h:form id="warehouseStockMngFormForPerson">
            <p:panel styleClass="center-header" style="border-bottom:none;">
               <p:panelGrid styleClass="filter" columns="12">
               <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>
@@ -359,10 +379,20 @@
                  <p:outputLabel value="产品编号："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
                  <p:outputLabel value="状态："></p:outputLabel>
                  <p:selectOneMenu value="#{warehouseStockMngController.status}">
                  <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>
@@ -371,7 +401,7 @@

            <p:panel styleClass="center-body">

               <p:panelGrid columns="3" 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}"
@@ -384,6 +414,17 @@
                               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>