改成原有案例(试剂库全显示)

gdg

2020-12-07 fcd69377936660dc4315d2e64117a2cf3299d662

 src/main/webapp/apply_mng_new.xhtml

@@ -283,68 +283,7 @@
        </h:form>
      <br/>
        <p:tabView dynamic="true" style="margin-left: 26px">
            <p:tab title="我的收藏">
                <h:form id="myFavor">
                    <p:panelGrid style="margin: 5px">
                        <div class="label-tip" style="margin-left: 5px; ">注意：已经收藏的试剂不会再出现在<span style="font-weight: 900;">*试剂库*</span>页面中</div>
                    </p:panelGrid>
                    <p:dataTable id="favorDataTable" styleClass="data-table" style="margin-left: 2px"
                                 resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
                                 lazy="true" value="#{applyMngController.reagentFavorDataModel}" var="row" rowKey="#{row.id}"
                                 emptyMessage="请添加收藏" selectionMode="single"
                                 rows="50" pageLinks="5">

                        <p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
                        <p:column headerText="产品编号">
                            <h:outputText value="#{row.productSn}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂名称">
                            <h:outputText value="#{row.name}"></h:outputText>
                            <h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
                        </p:column>
                        <p:column headerText="管制品">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
                        </p:column>
                        <!--<p:column headerText="试剂类型">-->
                            <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--<p:column headerText="危险性质">-->
                            <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--  <p:column headerText="供应商">
                            <h:outputText value="#{row.supplierName}"></h:outputText>
                        </p:column>-->
                        <p:column headerText="规格型号">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
                        </p:column>
                        <p:column headerText="包装">
                            <h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                            <h:outputText value="#{row.price}"></h:outputText>
                        </p:column>
                        <p:column headerText="CAS号">
                            <h:outputText value="#{row.cas}"></h:outputText>
                        </p:column>
                        <p:column headerText="危险性质">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
                        </p:column>
                        <p:column headerText="厂家">
                            <h:outputText value="#{row.productHomeName}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂类型">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
                        </p:column>
                        <p:column headerText="操作" style="text-align: center;">
                            <h:commandButton  styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}"  value="#{row.favor == null?'加入收藏':'取消收藏'}"  update="@this">
                                <f:setPropertyActionListener value="#{row}" target="#{applyMngController.selectReagent}" />
                            </h:commandButton>

                        </p:column>
                    </p:dataTable>
                </h:form>

            </p:tab>
            <p:tab title="试剂库">
                <h:form id="applyMngNewReagentForm">
                    <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="9" style="margin-left: -18px">
@@ -589,6 +528,68 @@
                    </p:dataTable>
                </h:form>
            </p:tab>
            <p:tab title="我的收藏">
                <h:form id="myFavor">
                    <!--                    <p:panelGrid style="margin: 5px">-->
                    <!--                        <div class="label-tip" style="margin-left: 5px; ">注意：已经收藏的试剂不会再出现在<span style="font-weight: 900;">*试剂库*</span>页面中</div>-->
                    <!--                    </p:panelGrid>-->
                    <p:dataTable id="favorDataTable" styleClass="data-table" style="margin-left: 2px"
                                 resizableColumns="true" paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
                                 lazy="true" value="#{applyMngController.reagentFavorDataModel}" var="row" rowKey="#{row.id}"
                                 emptyMessage="请添加收藏" selectionMode="single"
                                 rows="50" pageLinks="5">

                        <p:ajax event="rowDblselect" listener="#{applyMngController.onReagentRowSelect}" update=":applyMngNewForm,:applyDialog"></p:ajax>
                        <p:column headerText="产品编号">
                            <h:outputText value="#{row.productSn}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂名称">
                            <h:outputText value="#{row.name}"></h:outputText>
                            <h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
                        </p:column>
                        <p:column headerText="管制品">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
                        </p:column>
                        <!--<p:column headerText="试剂类型">-->
                        <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--<p:column headerText="危险性质">-->
                        <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--  <p:column headerText="供应商">
                            <h:outputText value="#{row.supplierName}"></h:outputText>
                        </p:column>-->
                        <p:column headerText="规格型号">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
                        </p:column>
                        <p:column headerText="包装">
                            <h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                            <h:outputText value="#{row.price}"></h:outputText>
                        </p:column>
                        <p:column headerText="CAS号">
                            <h:outputText value="#{row.cas}"></h:outputText>
                        </p:column>
                        <p:column headerText="危险性质">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
                        </p:column>
                        <p:column headerText="厂家">
                            <h:outputText value="#{row.productHomeName}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂类型">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
                        </p:column>
                        <p:column headerText="操作" style="text-align: center;">
                            <h:commandButton  styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}"  value="#{row.favor == null?'加入收藏':'取消收藏'}"  update="@this">
                                <f:setPropertyActionListener value="#{row}" target="#{applyMngController.selectReagent}" />
                            </h:commandButton>

                        </p:column>
                    </p:dataTable>
                </h:form>

            </p:tab>
        </p:tabView>
    </p:panel>
</ui:composition>