smartlab_promote.git

			@@ -360,7 +360,7 @@
			<br/>
			<h:form id="warehouseStockMngFormForPerson">
			<p:panel styleClass="center-header" style="border-bottom:none;">
			<p:panelGrid styleClass="filter" columns="14">
			<p:panelGrid styleClass="filter" columns="16">
			<style type="text/css">
			.ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
			min-width: 60px !important;
			@@ -384,6 +384,9 @@
			<f:selectItems value="#{warehouseStockMngController.statusSelectList}" var="item"
			itemLabel="#{item.text}" itemValue="#{item.key}"></f:selectItems>
			</p:selectOneMenu>
			<p:outputLabel value="过期："></p:outputLabel>
			<p:selectBooleanCheckbox value="#{warehouseStockMngController.isExpired}"
			itemLabel=""/>

			<p:outputLabel value="已领用："></p:outputLabel>
			<p:selectOneMenu value="#{warehouseStockMngController.isAllApply}" style="width: 60px;">
			@@ -398,7 +401,7 @@

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

			<p:panelGrid columns="3" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
			<p:panelGrid columns="7" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">
			<p:commandButton value="入库" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.addInputStorageOrder}"
			disabled="#{warehouseStockMngController.editFlag==0}"
			@@ -411,6 +414,17 @@
			oncomplete="$('#showTabOrder').css('display','block');$('#putInStorage').css('display','none');"
			update="@(.tmpOrder)"
			></p:commandButton>

			<p:commandButton value="过期处理" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.expireOrder}"
			disabled="#{warehouseStockMngController.editFlag==0}"
			update=":centerRootPanel"
			></p:commandButton>
			<p:commandButton value="恢复处理" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.recoverOrder}"
			disabled="#{warehouseStockMngController.editFlag==0}"
			update=":centerRootPanel"
			></p:commandButton>
			<p:commandButton update=":centerRootPanel" actionListener="#{warehouseStockMngController.onExportFileBtnClickOrder}"
			ajax="false" value="导出" styleClass="new-btn" />
			</p:panelGrid>