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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 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>
@@ -23,6 +23,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>
@@ -69,7 +75,7 @@
            </p:column>

            <p:column headerText="课题组">
               <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).project}"></h:outputText>
               <h:outputText value="#{row.project}"></h:outputText>
            </p:column>

            <p:column headerText="主控名称">
@@ -182,12 +188,11 @@
                  var="item" itemLabel="#{item.metaValue}" itemValue="#{item.id}"></f:selectItems>
            </p:selectOneMenu>

            <p:outputLabel value="课题组"></p:outputLabel>
            <p:selectOneMenu value="#{laboratoryContainerMngController.sysLaboratoryContainer.projectId}">
               <f:selectItem itemLabel="不选择课题组"  />
               <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
                           var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
            </p:selectOneMenu>
            <p:outputLabel value="课题组" for="multiple"/>
            <p:selectCheckboxMenu id="multiple" value="#{laboratoryContainerMngController.sysLaboratoryContainer.projects}" label="Cities" multiple="true"
                             filter="true" filterMatchMode="startsWith" panelStyle="width:250px">
               <f:selectItems value="#{sysProjectServiceImpl.getAll()}" var="item" itemValue="#{item.project}" itemLabel="#{item.project}"/>
            </p:selectCheckboxMenu>

         </p:panelGrid>
         <p:panel styleClass="btn">