耗材无供应商也显示，申购管理试剂库、申请履历、收藏不显示无效试剂和无供应商试剂 可显示无供应商的耗材

李宇

2021-08-18 a1e90c3da21d88f994bac9c1feb91bf40e53a44d

 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;">
@@ -100,7 +100,7 @@
                    <h:outputText value="#{row.reagent!=null?(''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(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>

@@ -124,7 +124,7 @@
                    <!--<h:outputText value="#{row.reagent!=null?row.reagent.supplierName:''}"></h:outputText>-->
                <!--</p:column>-->

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

@@ -147,8 +147,11 @@
                    <h:outputText value="#{row.second}"></h:outputText>
                </p:column>
                <!--现在报销不按课题编号了，所以先注释掉-->
                <p:column headerText="课题编号" width="83px;">
                    <h:outputText value="#{row.objective}"></h:outputText>
<!--                <p:column headerText="课题编号" width="83px;">-->
<!--                    <h:outputText value="#{row.objective}"></h:outputText>-->
<!--                </p:column>-->
                <p:column headerText="备注" width="83px;">
                    <h:outputText value="#{row.memo}"></h:outputText>
                </p:column>
            </p:dataTable>
        </p:panel>
@@ -234,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>