change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/laboratory_container_mng.xhtml

@@ -27,8 +27,6 @@
            <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>
@@ -48,8 +46,7 @@
            </p:commandButton>
            <p:commandButton value="导入" styleClass="import-btn" onclick="importCon()"
            ></p:commandButton>
            <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="${laboratoryContainerMngController.export2Excel}"
            />

            <a href="resources/template/实验室临时存储库导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>

            <script>
@@ -67,21 +64,12 @@
            selection="#{laboratoryContainerMngController.selectedList}" rows="20"
            pageLinks="5">
            <p:column selectionMode="multiple" style="width: 30px;text-align: center;" />

<!--            <p:column headerText="实验室类型">-->
<!--               <h:outputText value="#{baseMetaService.getBaseMetaValue(row.laboratoryType)}"></h:outputText>-->
<!--            </p:column>-->

            <p:column headerText="实验室名">
               <h:outputText value="#{row.laboratoryName}"></h:outputText>
            </p:column>

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

            <p:column headerText="主控名称">
               <h:outputText value="#{row.controllerName}"></h:outputText>
            </p:column>
            <p:column headerText="临时存储库条码">
               <h:outputText value="#{row.containerCode}"></h:outputText>
@@ -124,14 +112,6 @@
               required="true" requiredMessage="请选择实验室">
               <f:selectItems value="#{sysLaboratoryService.getAllSysLaboratoryList()}" var="item"
                  itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
            </p:selectOneMenu>

            <p:outputLabel value="主控名"></p:outputLabel>
            <p:selectOneMenu
               value="#{laboratoryContainerMngController.sysLaboratoryContainer.controllerCode}"
               required="true" requiredMessage="请选择主控设备">
               <f:selectItems value="#{laboratoryContainerMngController.controllers}" var="item"
                  itemLabel="#{item.controllerName}" itemValue="#{item.controllerCode}"></f:selectItems>
            </p:selectOneMenu>

            <p:outputLabel value="临时存储库条码"></p:outputLabel>
@@ -190,11 +170,10 @@
                  var="item" itemLabel="#{item.metaValue}" 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">
            <p:outputLabel value="课题组"/>
            <p:selectOneMenu  value="#{laboratoryContainerMngController.sysLaboratoryContainer.project}" requiredMessage="请选择课题组">
               <f:selectItems value="#{sysProjectServiceImpl.getAll()}" var="item" itemValue="#{item.project}" itemLabel="#{item.project}"/>
            </p:selectCheckboxMenu>
            </p:selectOneMenu>

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