change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/require_mng.xhtml

@@ -66,15 +66,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="规格型号" width="66px;">
                    <h:outputText value="#{row.reagent!=null?baseMetaService.getBaseMetaValue(row.reagent.reagentFormat):''}"  style="font-size:13px"></h:outputText>
                    <h:outputText value="#{row.reagent!=null?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="含税售价">
@@ -86,11 +86,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="厂家" width="64px;">
                    <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="92px;">
@@ -98,7 +98,7 @@
                </p:column>

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

                <p:column headerText="申购数量" width="29px;">
@@ -147,10 +147,10 @@
                <p:inputText value="#{requireMngController.opeApply.reagent.supplierName}" disabled="true"></p:inputText>

                <p:outputLabel value="规格"></p:outputLabel>
                <p:inputText value="#{baseMetaService.getBaseMetaValue(requireMngController.opeApply.reagent.reagentFormat)}" disabled="true"></p:inputText>
                <p:inputText value="#{requireMngController.opeApply.reagent.reagentFormat}" disabled="true"></p:inputText>

                <p:outputLabel value="包装"></p:outputLabel>
                <p:inputText value="#{''.concat(requireMngController.opeApply.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(requireMngController.opeApply.reagent.reagentUnit))}"
                <p:inputText value="#{''.concat(requireMngController.opeApply.reagent.mainMetering).concat(requireMngController.opeApply.reagent.reagentUnit)}"
                             disabled="true"></p:inputText>

                <p:outputLabel value="含税价格"></p:outputLabel>
@@ -171,7 +171,7 @@
                <p:inputText value="#{requireMngController.opeApply.applyUserName}" disabled="true"></p:inputText>

                <p:outputLabel value="申购目的"></p:outputLabel>
                <p:inputText value="#{baseMetaService.getBaseMetaValue(requireMngController.opeApply.objective)}" disabled="true"></p:inputText>
                <p:inputText value="#{requireMngController.getProjectName(requireMngController.opeApply.projectId)}" disabled="true"></p:inputText>

                <p:outputLabel value="申购日期"></p:outputLabel>
                <p:inputText value="#{requireMngController.opeApply.createTime}" disabled="true">