Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-01-26 f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4

 src/main/webapp/warehouse_reagent_use.xhtml

@@ -205,44 +205,53 @@

   <p:dialog id="apply-ui" header="领用单" widgetVar="printDialog" appendTo="@(body)" modal="true" resizable="false">
      <div id="printTarget">
         <div style=" margin: 10mm 10mm 0mm 2mm;">
      <h:form id="printDialog">
         <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;">
                  <div style="width: 100px;">单据编号:</div>
                  <div style="width: 300px;">
                     <p:inputText value="#{warehouseStockMngController.receiptNumber}" valueChangeListener="#{warehouseStockMngController.receiptNumberChange}">
         <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()}"  />
                  </p:inputText></div>
                  </p:inputText>
               </div>
            </div>
         </div>

         <div style="margin: 10px 0;">
            <div style="display: inline-flex;">
               <div style="width: 100px;margin-left: 10px;">部门:</div>
               <div style="width: 300px;">#{warehouseStockMngController.printTable['department']}</div>
            </div>
            <div style="display: inline-flex;">
               <div style="width: 100px;">申购人:</div>
               <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
            </div>
            <div style="display: inline-flex;float: right;">
               <div style="width: 100px;">日期:</div>
               <div style="width: 300px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
               <div style="width: 200px;padding-top: 1px;"><input style="border: 0;" value="#{warehouseStockMngController.printTable['date']}"/></div>
            </div>
         </div>

         <div style="margin-bottom: 20px;">
            <div style="display: inline-flex;">
               <div style="width: 100px;margin-left: 10px;">申购人:</div>
               <div style="width: 300px;">#{warehouseStockMngController.printTable['applyPerson']}</div>
               <div style="width: 100px;margin-left: 10px;">课题组</div>
               <div style="width: 300px;">#{warehouseStockMngController.printTable['project']}</div>
            </div>
            <div style="display: inline-flex;">
               <div style="width: 100px;">使用地点:</div>
               <div style="width: 200px;padding-top: 1px;">#{warehouseStockMngController.printTable['lab']}</div>
            </div>
            <div style="display: inline-flex;float: right;">
               <div style="width: 100px;">联系方式:</div>
               <div style="width: 300px;">
               <div style="width: 200px;">
                  <input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
            </div>
         </div>




@@ -264,7 +273,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;">