change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/webapp/apply_mng_new.xhtml

@@ -56,15 +56,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="含税售价">
@@ -76,15 +76,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:dataTable>
@@ -107,7 +107,7 @@
                            <p:outputLabel value="厂商："></p:outputLabel>
                        </p:column>
                        <p:column>
                            <p:inputText value="#{applyMngController.opeApply.reagent.productHomeName}" disabled="true"></p:inputText>
                            <p:inputText value="#{applyMngController.opeApply.reagent.productHome}" disabled="true"></p:inputText>
                        </p:column>
                    </p:row>

@@ -116,13 +116,13 @@
                            <p:outputLabel value="规格："></p:outputLabel>
                        </p:column>
                        <p:column>
                            <p:inputText value="#{baseMetaService.getBaseMetaValue(applyMngController.opeApply.reagent.reagentFormat)}" disabled="true"></p:inputText>
                            <p:inputText value="#{applyMngController.opeApply.reagent.reagentFormat}" disabled="true"></p:inputText>
                        </p:column>
                        <p:column>
                            <p:outputLabel value="包装："></p:outputLabel>
                        </p:column>
                        <p:column>
                            <p:inputText value="#{''.concat(applyMngController.opeApply.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(applyMngController.opeApply.reagent.reagentUnit))}"
                            <p:inputText value="#{''.concat(applyMngController.opeApply.reagent.mainMetering).concat(applyMngController.opeApply.reagent.reagentUnit)}"
                                         disabled="true"></p:inputText>
                        </p:column>
                    </p:row>
@@ -180,10 +180,10 @@

                            </p:column>
                            <p:column>
                                <p:selectOneMenu value="#{applyMngController.opeApply.objective}"
                                <p:selectOneMenu value="#{applyMngController.opeApply.projectId}"
                                                 required="true" requiredMessage="请选则课题组" id="projectIdSel1">
                                    <f:selectItems value="#{applyMngController.sysProjectList}"
                                                   var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
                                                   var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
                                </p:selectOneMenu>
                            </p:column>
                            <p:column>
@@ -223,13 +223,13 @@
                    <p:inputText value="#{applyMngController.opeApply.reagent.name}" disabled="true"></p:inputText>

                    <p:outputLabel value="厂商："></p:outputLabel>
                    <p:inputText value="#{applyMngController.opeApply.reagent.productHomeName}" disabled="true"></p:inputText>
                    <p:inputText value="#{applyMngController.opeApply.reagent.productHome}" disabled="true"></p:inputText>

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

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


@@ -262,7 +262,7 @@
                    <p:selectOneMenu value="#{applyMngController.opeApply.objective}"
                                     required="true" requiredMessage="请选择课题组" id="projectIdSel">
                        <f:selectItems value="#{applyMngController.sysProjectList}"
                                       var="item" itemLabel="#{item.projectName}" itemValue="#{item.projectId}"></f:selectItems>
                                       var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
                    </p:selectOneMenu>
                </p:panelGrid>

@@ -312,22 +312,13 @@
                            <h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
                        </p:column>
                        <p:column headerText="管制品">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
                            <h:outputText value="#{row.controlProducts}"></h:outputText>
                        </p:column>
                        <!--<p:column headerText="试剂类型">-->
                            <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--<p:column headerText="危险性质">-->
                            <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--  <p:column headerText="供应商">
                            <h:outputText value="#{row.supplierName}"></h:outputText>
                        </p:column>-->
                        <p:column headerText="规格型号">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
                            <h:outputText value="#{row.reagentFormat}"></h:outputText>
                        </p:column>
                        <p:column headerText="包装">
                            <h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
                            <h:outputText value="#{''.concat(row.mainMetering).concat(row.reagentUnit)}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                            <h:outputText value="#{row.price}"></h:outputText>
@@ -336,13 +327,13 @@
                            <h:outputText value="#{row.cas}"></h:outputText>
                        </p:column>
                        <p:column headerText="危险性质">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
                            <h:outputText value="#{row.reagentCharacter}"></h:outputText>
                        </p:column>
                        <p:column headerText="厂家">
                            <h:outputText value="#{row.productHomeName}"></h:outputText>
                            <h:outputText value="#{row.productHome}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂类型">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
                            <h:outputText value="#{row.reagentType}"></h:outputText>
                        </p:column>
                        <p:column headerText="操作" style="text-align: center;">
                            <h:commandButton  styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}"  value="#{row.favor == null?'加入收藏':'取消收藏'}"  update="@this">
@@ -477,11 +468,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="试剂单价">
@@ -542,22 +533,13 @@
                            <h:outputText value="收藏" readonly="true" rendered="#{row.favor!=null}" styleClass="favor"></h:outputText>
                        </p:column>
                        <p:column headerText="管制品">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.controlProducts)}"></h:outputText>
                            <h:outputText value="#{row.controlProducts}"></h:outputText>
                        </p:column>
                        <!--<p:column headerText="试剂类型">-->
                        <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--<p:column headerText="危险性质">-->
                        <!--<h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>-->
                        <!--</p:column>-->
                        <!--  <p:column headerText="供应商">
                            <h:outputText value="#{row.supplierName}"></h:outputText>
                        </p:column>-->
                        <p:column headerText="规格型号">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentFormat)}"></h:outputText>
                            <h:outputText value="#{row.reagentFormat}"></h:outputText>
                        </p:column>
                        <p:column headerText="包装">
                            <h:outputText value="#{''.concat(row.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagentUnit))}"></h:outputText>
                            <h:outputText value="#{''.concat(row.mainMetering).concat(row.reagentUnit)}"></h:outputText>
                        </p:column>
                        <p:column headerText="含税售价">
                            <h:outputText value="#{row.price}"></h:outputText>
@@ -566,13 +548,13 @@
                            <h:outputText value="#{row.cas}"></h:outputText>
                        </p:column>
                        <p:column headerText="危险性质">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentCharacter)}"></h:outputText>
                            <h:outputText value="#{row.reagentCharacter}"></h:outputText>
                        </p:column>
                        <p:column headerText="厂家">
                            <h:outputText value="#{row.productHomeName}"></h:outputText>
                            <h:outputText value="#{row.productHome}"></h:outputText>
                        </p:column>
                        <p:column headerText="试剂类型">
                            <h:outputText value="#{baseMetaService.getBaseMetaValue(row.reagentType)}"></h:outputText>
                            <h:outputText value="#{row.reagentType}"></h:outputText>
                        </p:column>
                        <p:column headerText="操作" style="text-align: center;">
                            <p:commandButton  styleClass="favor-btn-common #{row.favor == null?'favor-btn':'not-favor-btn'}"