合并

李宇

2021-01-27 d6c65a4e3d1ca7d9a7bd6806c99fee035d0a44eb

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -115,15 +115,15 @@
   </h:form>
   <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
      <div id="printTarget">
         <div style=" margin: 10mm 10mm 0mm 2mm;">
         <div style=" margin: 11mm 27mm 0mm 30mm;">
            <h:form id="printDialog" style="width: 1100px">

               <p:outputPanel style="text-align: center;font-size: 14px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
               <p:outputPanel style="text-align: center;font-size: 15px;margin: 20px;font-weight: 700;">#{warehouseStockMngController.printTable['title']}</p:outputPanel>
               <div>
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;margin-right: 17px;">
                     <div style="width: 100px;">单据编号:</div>
                     <div>
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;width: 1081px;">
                     <div style="width: 98px;">单据编号:</div>
                     <div style="width: 183px;">
<!--                                <input style="border: 0;" value="#{warehouseStockMngController.printTable['receiptNumber']}"/>-->
                                <p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
                           <p:ajax event="valueChange" listener="#{warehouseStockMngController.receiptNumberChange()}"  />
@@ -184,7 +184,7 @@
                  </p:column>

                  <p:column headerText="包装" width="90px;" style="text-align: center;">
                     <h:outputText value="#{row.mainMetering==null?'':row.mainMetering}" />
                     <h:outputText value="#{row.mainMetering==null?'':row.mainMetering.replace('null','')}" />
                  </p:column>

                  <p:column headerText="数量" width="90px;" style="text-align: center;">
@@ -245,7 +245,7 @@
      </div>
   </p:dialog>
   <p:dialog modal="true" header="领用详情" appendTo="@(body)" id="reagentCodeDialogForPerson"
      widgetVar="reagentCodeDialogForPerson" resizable="false" width="930" class="ui-dialog">
      widgetVar="reagentCodeDialogForPerson" resizable="false" width="1000" class="ui-dialog">
      <p:tabView dynamic="true" style="margin-left: 26px">
         <p:tab title="补贴条码" id="applyInOrder">
            <h:form id="reagentCodeDialogForm2">
@@ -273,13 +273,15 @@
                                        minValue="0" decimalPlaces="0"
                                        required="true" requiredMessage="请输入领用数量" id="useNum"/>
                     <p:column>
                        <p:panel styleClass="btn" style="text-align: right">
                       <p:commandButton value="添加"
                                    process="@this,useNum"
                                    styleClass="yes-btn"
                                    actionListener="#{warehouseStockMngController.add2()}"
                                    update="@(.reagentCode),endReagentCode"
                                    style="position: relative;left: 20px;width: 58px;height: 34px;">
                                    style="position: relative;left: -8px;width: 62px;height: 34px;font-size: 12px;background-color: #ee7135">
                       </p:commandButton>
                        </p:panel>
                     </p:column>
               </p:panelGrid>
               <p:separator style="margin: 15px"/>