change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/order_mng.xhtml

@@ -52,10 +52,7 @@
                                 process="@form"
                                 actionListener="#{orderMngController.onViewBtnClick}"
                                 update=":dialog,:dialogForm"></p:commandButton>
                <p:commandButton value="变更条形码" styleClass="edit-btn"
                                 process="@form"
                                 actionListener="#{orderMngController.onChangeCodeBtnClick}"
                                 update=":centerRootPanel" style="width: 148px; "></p:commandButton>

                <p:commandButton value="删除" styleClass="del-btn"
                                 process="@form"
                                 actionListener="#{orderMngController.onDeleteBtnClick}"
@@ -80,7 +77,7 @@
                </p:column>
                
                <p:column headerText="供应商">
                    <h:outputText value="#{row.supplyName}"></h:outputText>
                    <h:outputText value="#{row.supplierName}"></h:outputText>
                </p:column>

                <p:column headerText="下单时间">
@@ -160,15 +157,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="含税售价">
@@ -180,15 +177,15 @@
                </p:column>

                <p:column headerText="危险性质">
                    <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="#{baseMetaService.getBaseMetaValue(row.reagent.reagentType)}"></h:outputText>
                    <h:outputText value="#{row.reagent.reagentType}"></h:outputText>
                </p:column>

                <p:column headerText="申购人">