Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-01 1cbac7aa20a183a9a893651bf0cef24b1909eb5c

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -348,7 +348,15 @@
         </div>
         <h:form id="warehouseStockMngFormForPerson">
            <p:panel styleClass="center-header" style="border-bottom:none;">
               <p:panelGrid styleClass="filter" columns="12">
               <p:panelGrid styleClass="filter" columns="14">
                  <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,12 +367,19 @@
                  <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: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>