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

gdg

2021-01-29 31ffbaf322685984516cfb284fa58741debf4e96

 src/main/webapp/laboratory_container_mng.xhtml

@@ -12,7 +12,7 @@
   <h:form id="laboratoryContainerMngForm">
      <p:panel styleClass="center-header">
         <p:outputLabel styleClass="title" value="实验室临时存储库管理"></p:outputLabel>
         <p:panelGrid styleClass="filter" columns="5">
         <p:panelGrid styleClass="filter" columns="9">
            <p:outputLabel value="实验室类型："></p:outputLabel>
            <p:selectOneMenu value="#{laboratoryContainerMngController.laboratoryType}">
               <f:selectItem itemLabel="全部" itemValue="#{null}" noSelectionOption="true"></f:selectItem>
@@ -24,6 +24,12 @@
            <p:outputLabel value="实验室名："></p:outputLabel>
            <p:inputText value="#{laboratoryContainerMngController.laboratoryName}"></p:inputText>

            <p:outputLabel value="课题名称："></p:outputLabel>
            <p:inputText value="#{laboratoryContainerMngController.project}"></p:inputText>

            <p:outputLabel value="主控名称："></p:outputLabel>
            <p:inputText value="#{laboratoryContainerMngController.controllerName}"></p:inputText>

            <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
         </p:panelGrid>
      </p:panel>