smartlab_promote.git

			@@ -28,13 +28,39 @@
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>
			<p:outputLabel value="状态："/>
			<p:selectOneMenu value="#{hazardousWasteController.status}">
			<f:selectItems value="#{hazardousWasteController.statusList}" var="item"
			itemLabel="#{item}" itemValue="#{item}"/>
			</p:selectOneMenu>

			<p:outputLabel value="确认者："/>
			<p:inputText value="#{hazardousWasteController.applyPerson}"/>
			</p:panelGrid>

			<p:panelGrid styleClass="filter" columns="8">
			<p:outputLabel value="单号："/>
			<p:inputText value="#{hazardousWasteController.tid}"/>
			<p:outputLabel value="课题组"></p:outputLabel>
			<p:selectOneMenu value="#{hazardousWasteController.project}" filter="true" filterMatchMode="startsWith">
			<f:selectItem itemLabel="不选择课题组" />
			<f:selectItems value="#{sysProjectServiceImpl.getAll()}"
			var="item" itemLabel="#{item.project}" itemValue="#{item.project}"/>
			</p:selectOneMenu>

			<p:outputLabel value="部门"></p:outputLabel>
			<p:selectOneMenu value="#{hazardousWasteController.department}" requiredMessage="请选择部门">
			<f:selectItem itemLabel="不选择部门"/>
			<f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
			var="item" itemLabel="#{item.metaValue}" itemValue="#{item.metaValue}"/>
			</p:selectOneMenu>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>
			</p:panelGrid>
			</p:panel>
			<p:panel styleClass="center-body">
			<p:panelGrid columns="5" styleClass="btn">
			<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{dangerousEncodeController.export2Excel}" />
			<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{hazardousWasteController.export2Excel}" />
			</p:panelGrid>
			<p:dataTable id="hazardousWasteInfoMngDataTable"
			styleClass="data-table"
			@@ -48,26 +74,34 @@
			rows="20"
			selectionMode="single"
			pageLinks="5">
			<p:column headerText="酸">
			<p:column headerText="单号" width="150">
			<h:outputText value="#{row.tid}"/>
			</p:column>
			<p:column headerText="状态">
			<h:outputText value="#{row.status}"/>
			</p:column>
			<p:column headerText="酸性废液">
			<h:outputText value="#{row.acid}"/>
			</p:column>

			<p:column headerText="碱">
			<p:column headerText="碱性废液">
			<h:outputText value="#{row.alkali}"/>
			</p:column>

			<p:column headerText="有机">
			<p:column headerText="有机废液">
			<h:outputText value="#{row.organic}"/>
			</p:column>

			<p:column headerText="固废">
			<p:column headerText="固体废弃物">
			<h:outputText value="#{row.solid}"/>
			</p:column>

			<p:column headerText="医疗">
			<p:column headerText="医疗废弃物">
			<h:outputText value="#{row.medical}"/>
			</p:column>

			<p:column headerText="确认者">
			<h:outputText value="#{row.applyPerson}"/>
			</p:column>
			<p:column headerText="课题组">
			<h:outputText value="#{row.project}"/>
			</p:column>
			@@ -78,6 +112,16 @@

			<p:column headerText="单位">
			<h:outputText value="#{row.unit}"/>
			</p:column>

			<p:column headerText="创建者">
			<h:outputText value="#{row.creator}"/>
			</p:column>

			<p:column headerText="创建时间">
			<h:outputText value="#{row.createTime}">
			<f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"></f:convertDateTime>
			</h:outputText>
			</p:column>

			</p:dataTable>
			@@ -89,7 +133,7 @@
			<p:panel styleClass="center-header">
			<p:outputLabel styleClass="title" value="危废处理信息"/>

			<p:panelGrid styleClass="filter" columns="9">
			<p:panelGrid styleClass="filter" columns="15">
			<p:outputLabel value="开始时间："/>
			<p:calendar value="#{hazardousWasteController.startTime}"
			converter="timestampConvert"
			@@ -100,46 +144,75 @@
			converter="timestampConvert"
			pattern="yyyy-MM-dd" locale="zh_CN"/>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelChange}"/>
			<p:outputLabel value="状态："/>
			<p:selectOneMenu value="#{hazardousWasteController.status}">
			<f:selectItems value="#{hazardousWasteController.statusList}" var="item"
			itemLabel="#{item}" itemValue="#{item}"/>
			</p:selectOneMenu>

			<p:outputLabel value="确认者："/>
			<p:inputText value="#{hazardousWasteController.applyPerson}"/>

			<p:outputLabel value="课题组"></p:outputLabel>
			<p:selectOneMenu value="#{hazardousWasteController.project}" filter="true" filterMatchMode="startsWith">
			<f:selectItem itemLabel="不选择课题组" />
			<f:selectItems value="#{sysProjectServiceImpl.getAll()}"
			var="item" itemLabel="#{item.project}" itemValue="#{item.project}"/>
			</p:selectOneMenu>

			<p:outputLabel value="部门"></p:outputLabel>
			<p:selectOneMenu value="#{hazardousWasteController.department}" requiredMessage="请选择部门">
			<f:selectItem itemLabel="不选择部门"/>
			<f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
			var="item" itemLabel="#{item.metaValue}" itemValue="#{item.metaValue}"/>
			</p:selectOneMenu>

			<p:commandLink styleClass="search" process="@form" update="@form" actionListener="#{hazardousWasteController.modelAnalysisChange}"/>

			</p:panelGrid>
			</p:panel>
			<p:panel styleClass="center-body">
			</p:panel>
			</h:form>

			<p:panelGrid columns="5" styleClass="btn">
			<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{hazardousWasteController.exportStatistics2Excel}" />
			</p:panelGrid>
			<p:dataTable id="hazardousWasteInfoAnalysisDataTable"
			styleClass="data-table"
			paginator="true"
			paginatorAlwaysVisible="false"
			paginatorPosition="bottom"
			lazy="true" value="#{hazardousWasteController.dataModel}"
			lazy="true" value="#{hazardousWasteController.analysisDataModel}"
			var="row"
			rowKey="#{row.id}"
			emptyMessage="无数据"
			rows="20"
			selectionMode="single"
			pageLinks="5">
			<p:column headerText="酸">

			<p:column headerText="状态">
			<h:outputText value="#{row.status}"/>
			</p:column>
			<p:column headerText="酸性废液">
			<h:outputText value="#{row.acid}"/>
			</p:column>

			<p:column headerText="碱">
			<p:column headerText="碱性废液">
			<h:outputText value="#{row.alkali}"/>
			</p:column>

			<p:column headerText="有机">
			<p:column headerText="有机废液">
			<h:outputText value="#{row.organic}"/>
			</p:column>

			<p:column headerText="固废">
			<p:column headerText="固体废弃物">
			<h:outputText value="#{row.solid}"/>
			</p:column>

			<p:column headerText="医疗">
			<p:column headerText="医疗废弃物">
			<h:outputText value="#{row.medical}"/>
			</p:column>

			<p:column headerText="确认者">
			<h:outputText value="#{row.applyPerson}"/>
			</p:column>
			<p:column headerText="课题组">
			<h:outputText value="#{row.project}"/>
			</p:column>
			@@ -153,6 +226,8 @@
			</p:column>

			</p:dataTable>
			</p:panel>
			</h:form>
			</p:tab>

			</p:tabView>