change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/apply_mng.xhtml

@@ -88,8 +88,8 @@
                <p:commandButton update=":centerRootPanel" actionListener="#{applyMngController.onExportFileBtnClickNew}"
                                 ajax="false" value="导出" styleClass="new-btn" />

                <p:commandButton  onclick="importApply()"  value="导入" styleClass="import-btn" />
                <a href="resources/template/申购导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
<!--                <p:commandButton  onclick="importApply()"  value="导入" styleClass="import-btn" />-->
<!--                <a href="resources/template/申购导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>-->
            </p:panelGrid>
            <script type="text/javascript">
                function importApply(){
@@ -125,15 +125,15 @@
                </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="规格型号">
                    <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="含税售价" width="50px;">
@@ -145,14 +145,14 @@
                </p:column>

                <p:column headerText="危险性质" width="79px;">
                    <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentCharacter)}" style="white-space: normal;font-size: 13px;"></h:outputText>
                    <h:outputText value="#{row.reagent.reagentCharacter}" style="white-space: normal;font-size: 13px;"></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="试剂类型" width="38px;" style="text-align: center;white-space: normal">
                    <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
                    <h:outputText value="#{row.reagent.reagentType}"></h:outputText>
                </p:column>

                <p:column headerText="申购数量" width="38px;" style="white-space: normal">