订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

gdg

2021-02-22 d2be6e4afe1dba009b56f8555792f2823f9e4535

 src/main/webapp/personal_use_info.xhtml

@@ -48,10 +48,16 @@
            }
         </style>
         <p:panel styleClass="center-header">
            <p:panelGrid styleClass="filter" columns="13">
            <p:panelGrid styleClass="filter" columns="10">

               <p:outputLabel value="单据编号："/>
               <p:inputText value="#{personalUseInfoController.receiptNumber}"/>

               <p:outputLabel value="试剂名称："/>
               <p:inputText value="#{personalUseInfoController.reagentName}"/>

               <p:outputLabel value="申领人："/>
               <p:inputText value="#{personalUseInfoController.applyPerson}"/>

               <p:outputLabel value="课题组："/>
               <p:inputText value="#{personalUseInfoController.project}"/>
@@ -66,8 +72,16 @@

               <p:commandLink styleClass="search" process="@form" update="@form"/>

               <p:commandButton value="生成领用单"
               <p:commandButton value="取消领用"
                            style="background: #b94a48; border: 1px solid #b94a48"
                            styleClass="store-btn"
                            process="@form"
                            actionListener="#{personalUseInfoController.reagentReturn}"
                            update="@this">
                  <p:confirm header="确认" message="是否确认取消领用？"/>
               </p:commandButton>

               <p:commandButton value="生成领用单"
                            styleClass="store-btn"
                            process="@form"
                            actionListener="#{personalUseInfoController.generateReceipt}"
@@ -77,6 +91,7 @@
                            update=":dialog,:dialogForm"
                            actionListener="#{personalUseInfoController.detailInfo}"
                            oncomplete="PF('dialog').show()"/>



         </p:panelGrid>
@@ -103,7 +118,7 @@
                   selectionMode="single"
                   emptyMessage="无数据"
                   selection="#{personalUseInfoController.selectOne}"
                   rows="20" pageLinks="5">
                   rows="10" pageLinks="5">

<!--            <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>-->
            <p:column headerText="单据编号">
@@ -115,7 +130,8 @@
            </p:column>

            <p:column headerText="领用数量" width="50">
               <h:outputText value="#{row.applyNum}"/>
               <h:outputText value="#{personalUseInfoController.reagentName eq null
               or personalUseInfoController.reagentName eq ''?row.applyNum:OpeUseFlowService.getApplyInfoSize(row.getReceiptNumber())}"/>
            </p:column>

            <p:column headerText="课题组">
@@ -189,13 +205,13 @@
      </h:form>
   </p:dialog>
   <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false"
           width="1380">
           width="1258">
      <div id="printTarget">
         <div style=" margin: 20mm 27mm 0mm 30mm;">
         <div style=" margin: 20mm 16mm 0mm 10mm;">
            <h:form id="printDialog" style="width: 1100px">

               <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
               <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
               <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{personalUseInfoController.printTable['head']}</p:outputPanel>
               <p:outputPanel style="text-align: center;font-size: 16px;margin: 20px;font-weight: 700;">#{personalUseInfoController.printTable['title']}</p:outputPanel>
               <div>
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
                     <div style="width: 98px;">单据编号:</div>