Merge remote-tracking branch 'origin/master'

李宇

2021-02-04 1afdf3622484b9a54c4cc4642e38bbf5c815884f

 src/main/webapp/warehouse_reagent_use.xhtml

@@ -24,7 +24,7 @@
                           var="item"
                           dropdown="true"
                           styleClass="apply-user-autocomplete"
                           itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : null}"
                           itemLabel="#{!empty warehouseStockMngController.userId ?warehouseStockMngController.getSelectedUserById(warehouseStockMngController.userId).name : ' '}"
                           itemValue="#{item.id}" forceSelection="true">
                  <p:ajax event="itemSelect" listener="#{warehouseStockMngController.resetLaboratory()}" process="@this" update="@this,experments,stacks" />
                  <p:column>
@@ -43,7 +43,7 @@
                   id="experments">
                  <f:selectItems value="#{warehouseStockMngController.laboratory}"
                     var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                  <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" update="stacks"/>
                  <f:ajax listener="#{warehouseStockMngController.resetLaboratoryContainers}" render="stacks"/>
               </p:selectOneMenu>
               <p:outputLabel value="实验室试剂柜："></p:outputLabel>
               <p:selectOneMenu value="#{warehouseStockMngController.laboratoryContainerId}" id="stacks"