smartlab_promote.git

			@@ -7,7 +7,6 @@
			xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui"
			xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
			xmlns:c="http://java.sun.com/jsp/jstl/core">
			<head></head>
			<ui:composition>
			<p:tabView dynamic="true" id="tabView" activeIndex="#{warehouseStockMngController.tabValue}">
			<p:ajax event="tabChange" listener="#{warehouseStockMngController.onTabChange}"/>
			@@ -243,6 +242,95 @@
			</p:panel>
			</h:form>
			</div>
			<div id ="putInStorage" style="display: none">
			<h:form id="putInStorageTmpOrder" styleClass="inputStorageTmp">
			<p:panel styleClass="center-body">
			<p:panelGrid columns="3" styleClass="btn">
			<p:commandButton value="删除" styleClass="del-btn" process="@form"
			actionListener="#{warehouseStockMngController.cancelInputStorageTmp}"
			update="@(.inputStorageTmp)"
			/>
			<p:commandButton value="清空" styleClass="del-btn" process="@form"
			actionListener="#{warehouseStockMngController.clearInputStorageTmp}"
			update="@(.inputStorageTmp)"
			/>
			<p:commandButton value="提交" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.onUseBtnClickInputStorageTmp}"
			update=":centerRootPanel"/>
			</p:panelGrid>
			<p:dataTable id="putInStorageTmpOrderTable" styleClass="data-table"
			paginator="true" paginatorAlwaysVisible="false" paginatorPosition="bottom"
			lazy="true" value="#{warehouseStockMngController.selectedInputStorageTmpOrderList}" var="row"
			selection="#{warehouseStockMngController.trulyInputStorageTmpSelectedOrderList}"
			rowKey="#{row.id}"
			emptyMessage="无数据" rows="20" pageLinks="5">
			<p:column selectionMode="multiple" style="width: 30px;text-align: center;" />

			<p:column headerText="申购编号" width="170">
			<h:outputText value="#{row.applyCode}"/>
			</p:column>

			<p:column headerText="产品编号">
			<h:outputText value="#{row.reagent.productSn}"/>
			</p:column>

			<p:column headerText="试剂名称">
			<h:outputText value="#{row.reagent.name}"/>
			</p:column>

			<p:column headerText="管制品">
			<h:outputText value="#{row.reagent.controlProducts}"/>
			</p:column>

			<p:column headerText="规格">
			<h:outputText value="#{row.reagent.reagentFormat}"/>
			</p:column>

			<p:column headerText="包装">
			<h:outputText
			value="#{''.concat(row.reagent.mainMetering).concat(baseMetaService.getBaseMetaValue(row.reagent.reagentUnit))}"/>
			</p:column>

			<p:column headerText="价格">
			<h:outputText value="#{row.reagent.price}"/>
			</p:column>

			<p:column headerText="CAS">
			<h:outputText value="#{row.reagent.cas}"/>
			</p:column>

			<p:column headerText="危险性质">
			<h:outputText value="#{row.reagent.reagentCharacter}"/>
			</p:column>

			<p:column headerText="厂商">
			<h:outputText
			value="#{row.reagent.productHome}"/>
			</p:column>

			<p:column headerText="申请数量">
			<h:outputText
			value="#{row.num}"/>
			</p:column>

			<p:column headerText="已领用数量">
			<h:outputText
			value="#{row.used}"/>
			</p:column>

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

			<p:column headerText="订单状态">
			<h:outputText value="#{row.status.getText()}"/>
			</p:column>

			</p:dataTable>
			</p:panel>
			</h:form>
			</div>
			<h:form id="warehouseStockMngFormForPerson">
			<p:panel styleClass="center-header" style="border-bottom:none;">
			<p:panelGrid styleClass="filter" columns="5">
			@@ -259,11 +347,16 @@
			<p:panel styleClass="center-body">

			<p:panelGrid columns="2" styleClass="btn" rendered="#{warehouseStockMngController.editFlag==1}">

			<p:commandButton value="入库" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.addInputStorageOrder}"
			disabled="#{warehouseStockMngController.editFlag==0}"
			oncomplete="$('#putInStorage').css('display','block');$('#showTabOrder').css('display','none');"
			update="@(.inputStorageTmp)"
			></p:commandButton>
			<p:commandButton value="领用" styleClass="edit-btn" process="@form"
			actionListener="#{warehouseStockMngController.addOrder}"
			disabled="#{warehouseStockMngController.editFlag==0}"
			oncomplete="$('#showTabOrder').css('display','block');"
			oncomplete="$('#showTabOrder').css('display','block');$('#putInStorage').css('display','none');"
			update="@(.tmpOrder)"
			></p:commandButton>
			</p:panelGrid>
			@@ -331,6 +424,11 @@
			<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:dataTable>
			</p:panel>
			</h:form>