gdg
2020-11-06 89e4e43782d84b55ed3a4ab5d096b00d88f8f155
src/main/webapp/apply_mng_new.xhtml
@@ -68,7 +68,7 @@
                    </p:column>
                    <p:column headerText="含税售价">
                        <h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
                        <h:outputText value="#{row.reagent.price}"></h:outputText>
                    </p:column>
                    <p:column headerText="CAS号">
@@ -438,7 +438,7 @@
                    </h:form>
                </p:dialog>
            </p:tab>
            <p:tab title="申请履历">
            <p:tab title="申请履历">`
                <h:form id="applyMngNewHistoryForm">
                    <p:panelGrid styleClass="apply-mng-new-reagent-filter" columns="5" style="margin-left: -18px">
@@ -491,10 +491,14 @@
                            <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                        <p:column headerText="试剂单价">
                            <h:outputText value="#{row.reagent!=null?row.reagent.price:''}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                            <h:outputText value="#{row.applyPrice}"></h:outputText>
                        </p:column>
                        <p:column headerText="每箱数量">
                            <h:outputText value="#{row.reagent!=null?row.reagent.perBox:''}"></h:outputText>
                        </p:column>