change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/approval_mng.xhtml

@@ -88,16 +88,16 @@
                </p:column>

                <p:column headerText="管制品">
                    <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.controlProducts):''}"></h:outputText>
                    <h:outputText value="#{row.reagent!=null?row.reagent.controlProducts:''}"></h:outputText>
                </p:column>

                <p:column headerText="规格型号" width="84px;">
                    <h:outputText
                            value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentFormat)}" style="font-size:13px"></h:outputText>
                            value="#{row.reagent.reagentFormat}" style="font-size:13px"></h:outputText>
                </p:column>

                <p:column headerText="包装">
                    <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
                    <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"></h:outputText>
                </p:column>

                <p:column headerText="含税售价" width="60px;">
@@ -113,11 +113,11 @@
                </p:column>

                <p:column headerText="危险性质" width="85px;">
                    <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}"></h:outputText>
                    <h:outputText value="#{row.reagent.reagentCharacter}"></h:outputText>
                </p:column>

                <p:column headerText="厂家">
                    <h:outputText value="#{row.reagent!=null?row.reagent.productHomeName:''}"></h:outputText>
                    <h:outputText value="#{row.reagent!=null?row.reagent.productHome:''}"></h:outputText>
                </p:column>

                <!--<p:column headerText="供应商">-->
@@ -125,7 +125,7 @@
                <!--</p:column>-->

                <p:column headerText="试剂类型" width="60px;">
                    <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
                    <h:outputText value="#{row.reagent.reagentType}"></h:outputText>
                </p:column>

                <p:column headerText="申购人" style="text-align: center">
@@ -175,11 +175,11 @@
                   </p:column>-->

                   <p:column headerText="规格">
                       <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.reagentFormat):''}"></h:outputText>
                       <h:outputText value="#{row.reagent!=null?row.reagent.reagentFormat:''}"></h:outputText>
                   </p:column>

                   <p:column headerText="包装">
                       <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))):''}"></h:outputText>
                       <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(row.reagent.reagentUnit)):''}"></h:outputText>
                   </p:column>

                   <p:column headerText="参考价格">