取消领用

gdg

2021-02-03 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73

 src/main/webapp/warehouse_stock_mng.xhtml

@@ -79,7 +79,7 @@
         <br/>
         <h:form id="warehouseStockMngForm">
            <p:panel styleClass="center-header">
               <p:panelGrid styleClass="filter" columns="7">
               <p:panelGrid styleClass="filter" columns="9">

                  <p:outputLabel value="试剂名称："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -90,6 +90,9 @@
                     <f:selectItems value="#{warehouseStockMngController.supplierSelectList}"
                                 var="item" itemLabel="#{item.name}" itemValue="#{item.id}"></f:selectItems>
                  </p:selectOneMenu>

                  <p:outputLabel value="仓库名："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.warehouseName}"></p:inputText>

                  <p:outputLabel value="产品编号："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
@@ -345,7 +348,15 @@
         </div>
         <h:form id="warehouseStockMngFormForPerson">
            <p:panel styleClass="center-header" style="border-bottom:none;">
               <p:panelGrid styleClass="filter" columns="12">
               <p:panelGrid styleClass="filter" columns="14">
                  <style type="text/css">
                     .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
                        min-width: 60px !important;
                     }
                     .ui-selectonemenu-items.ui-selectonemenu-list.ui-widget-content.ui-widget.ui-corner-all.ui-helper-reset{
                        width: 77px !important;
                     }
                  </style>

                  <p:outputLabel value="试剂名称："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.reagentId}"></p:inputText>
@@ -356,10 +367,17 @@
                  <p:outputLabel value="产品编号："></p:outputLabel>
                  <p:inputText value="#{warehouseStockMngController.productSn}"></p:inputText>
                  <p:outputLabel value="状态："></p:outputLabel>
                  <p:selectOneMenu value="#{warehouseStockMngController.status}">
                  <p:selectOneMenu value="#{warehouseStockMngController.status}" style="width: 60px;">
                     <f:selectItem itemLabel="全部" noSelectionOption="true"></f:selectItem>
                     <f:selectItems value="#{warehouseStockMngController.statusSelectList}" var="item"
                                 itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
                  </p:selectOneMenu>

                  <p:outputLabel value="已领用："></p:outputLabel>
                  <p:selectOneMenu value="#{warehouseStockMngController.isAllApply}" style="width: 60px;">
                     <f:selectItem itemLabel="否" itemValue="0"/>
                     <f:selectItem itemLabel="是"  itemValue="1"/>
                     <f:selectItem itemLabel="全部" noSelectionOption="true"/>
                  </p:selectOneMenu>

                  <p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
@@ -368,7 +386,7 @@

            <p:panel styleClass="center-body">

               <p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
               <p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
                  <p:commandButton value="入库" styleClass="edit-btn" process="@form"
                               actionListener="#{warehouseStockMngController.addInputStorageOrder}"
                               disabled="#{warehouseStockMngController.editFlag==0}"
@@ -448,17 +466,19 @@
                  <p:column headerText="订单状态">
                     <h:outputText value="#{row.status!=null?row.status.text:''}"></h:outputText>
                  </p:column>
                  <p:column headerText="到货时间">
                     <h:outputText value="#{row.arrivalTime}">
                        <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
                     </h:outputText>
                  </p:column>

                  <p:column headerText="课题组">
                     <h:outputText value="#{row.project}" />
                  </p:column>
                  <p:column headerText="课题组负责人">
                     <h:outputText value="#{row.projectManage}" />
                  </p:column>

                  <p:column headerText="到货时间">
                     <h:outputText value="#{row.arrivalTime}">
                        <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"/>
                     </h:outputText>
                  </p:column>
               </p:dataTable>
            </p:panel>
         </h:form>