change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/approval_mng.xhtml

@@ -72,7 +72,7 @@
                         emptyMessage="无数据" selection="#{approvalMngController.selectedList}"
                         rows="20" pageLinks="5">
                <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
                <p:column headerText="订单状态" width="58px;" style="text-align: center">
                <p:column headerText="订单状态" width="60px;" style="text-align: center">
                    <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
                </p:column>
                <p:column headerText="申购编号" width="118px;">
@@ -88,19 +88,19 @@
                </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="56px;">
                <p:column headerText="含税售价" width="60px;">
                    <h:outputText value="#{row.applyPrice}"></h:outputText>
                </p:column>

@@ -113,19 +113,19 @@
                </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="供应商">-->
                    <!--<h:outputText value="#{row.reagent!=null?row.reagent.supplierName:''}"></h:outputText>-->
                <!--</p:column>-->

                <p:column headerText="试剂类型" width="29px;">
                    <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
                <p:column headerText="试剂类型" width="60px;">
                    <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="参考价格">
@@ -237,12 +237,12 @@

            <p:panel styleClass="btn" style="text-align: right">
                <p:commandButton value="拒绝" actionListener="#{approvalMngController.onNoBtnClick}"
                                 process="@form" update=":approvalMngForm:approvalMngDataTable"
                                 process="@form"
                                 styleClass="no-btn">
                    <p:confirm header="确认" message="确认操作？"></p:confirm>
                </p:commandButton>
                <p:commandButton value="批准" actionListener="#{approvalMngController.onYesBtnClick}"
                                 process="@form" update=":approvalMngForm:approvalMngDataTable"
                                 process="@form"
                                 styleClass="yes-btn">
                    <p:confirm header="确认" message="确认操作？"></p:confirm>
                </p:commandButton>