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

李宇

2021-08-18 a1e90c3da21d88f994bac9c1feb91bf40e53a44d

 src/main/webapp/warehouse_reagent_use_person.xhtml

@@ -92,6 +92,10 @@
               <h:outputText value="#{row.articleNumber}"></h:outputText>
            </p:column>

            <p:column headerText="申领人">
               <h:outputText value="#{row.applyUserId}"></h:outputText>
            </p:column>

            <p:column headerText="申请数量">
               <h:outputText value="#{row.num}"></h:outputText>
            </p:column>
@@ -114,16 +118,16 @@
      </p:panel>
   </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;">
            <h:form id="printDialog">
      <div id="printTarget" style="margin-right: -51px;">
         <div style="margin: 25mm 17mm 0mm 15mm; ">
            <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>
               <p:outputPanel style="text-align: center;font-size: 17px;font-weight: 700;">#{warehouseStockMngController.printTable['head']}</p:outputPanel>
               <p:outputPanel style="text-align: center;font-size: 16px;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;">
                  <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()}"  />
@@ -134,23 +138,31 @@

               <div style="margin: 10px 0;">
                  <div style="display: inline-flex;">
                     <div style="width: 100px;margin-left: 10px;">部门:</div>
                     <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: 100px;">日期：</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: 100px;">联系方式：</div>
                     <div style="width: 200px;">
                        <input style="border: 0;" value="#{warehouseStockMngController.printTable['phone']}"/></div>
                  </div>
               </div>
@@ -176,7 +188,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;">
@@ -188,17 +200,17 @@
                  </p:column>
               </p:dataTable>

               <div style="margin-top: 20px;">
               <div style="margin-top: 20px;margin-right: 94px;">
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                     <div style="width: 100px">签收人:</div>
                     <div style="width: 300px"></div>
                     <div style="width: 100px">签收人：</div>
                     <div style="width: 100px"></div>
                  </div>
               </div>

               <div style="margin: 10px 0">
               <div style="margin: 10px 94px 10px 0;">
                  <div style="display: flex;flex-direction: row;justify-content: flex-end;">
                     <div style="width: 100px">日期:</div>
                     <div style="width: 300px"></div>
                     <div style="width: 100px">日期：</div>
                     <div style="width: 100px"></div>
                  </div>
               </div>

@@ -208,7 +220,7 @@
                  <p:commandButton value="关闭"
                               process="@this"
                               styleClass="yes-btn"
                               actionListener="#{warehouseStockMngController.onCancelBtnClick}"
                               actionListener="#{warehouseStockMngController.closeDialog}"
                               style="position: relative;left: 20px;"
                               update=":centerRootPanel"
                               oncomplete="PF('printDialog').hide()">
@@ -237,7 +249,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">
@@ -265,13 +277,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"/>