From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/webapp/sys_hazardous_waste.xhtml | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/sys_hazardous_waste.xhtml b/src/main/webapp/sys_hazardous_waste.xhtml
index c3ec6f4..58f27e9 100644
--- a/src/main/webapp/sys_hazardous_waste.xhtml
+++ b/src/main/webapp/sys_hazardous_waste.xhtml
@@ -15,13 +15,11 @@
<p:tab title="危废处理信息">
<h:form id="hazardousWasteForm">
<p:panel styleClass="center-header">
- <p:outputLabel styleClass="title" value="危废处理信息"/>
-
- <p:panelGrid styleClass="filter" columns="9">
+ <p:panelGrid styleClass="filter" columns="20" style="white-space: nowrap">
<p:outputLabel value="开始时间："/>
<p:calendar value="#{hazardousWasteController.startTime}"
converter="timestampConvert"
- pattern="yyyy-MM-dd" locale="zh_CN"/>
+ pattern="yyyy-MM-dd" locale="zh_CN" />
<p:outputLabel value="结束时间："/>
<p:calendar value="#{hazardousWasteController.endTime}"
@@ -31,16 +29,14 @@
<p:outputLabel value="状态："/>
<p:selectOneMenu value="#{hazardousWasteController.status}">
<f:selectItems value="#{hazardousWasteController.statusList}" var="item"
- itemLabel="#{item}" itemValue="#{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:inputText value="#{hazardousWasteController.tid}" style="width: 120px"/>
<p:outputLabel value="课题组"></p:outputLabel>
<p:selectOneMenu value="#{hazardousWasteController.project}" filter="true" filterMatchMode="startsWith">
<f:selectItem itemLabel="不选择课题组" />
@@ -57,6 +53,7 @@
<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">
@@ -102,10 +99,14 @@
<p:column headerText="确认者">
<h:outputText value="#{row.applyPerson}"/>
</p:column>
+ <p:column headerText="确认时间">
+ <h:outputText value="#{row.updatetime}">
+ <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss" locale="zh_CN"></f:convertDateTime>
+ </h:outputText>
+ </p:column>
<p:column headerText="课题组">
<h:outputText value="#{row.project}"/>
</p:column>
-
<p:column headerText="部门">
<h:outputText value="#{row.department}"/>
</p:column>
@@ -120,10 +121,9 @@
<p:column headerText="创建时间">
<h:outputText value="#{row.createTime}">
- <f:convertDateTime pattern="yyyy-MM-dd" locale="zh_CN"></f:convertDateTime>
+ <f:convertDateTime pattern="yyyy-MM-dd HH:mm:ss" locale="zh_CN"></f:convertDateTime>
</h:outputText>
</p:column>
-
</p:dataTable>
</p:panel>
</h:form>
@@ -131,8 +131,6 @@
<p:tab title="统计分析">
<h:form id="hazardousWasteAnalysisForm">
<p:panel styleClass="center-header">
- <p:outputLabel styleClass="title" value="危废处理信息"/>
-
<p:panelGrid styleClass="filter" columns="15">
<p:outputLabel value="开始时间："/>
<p:calendar value="#{hazardousWasteController.startTime}"
@@ -229,7 +227,11 @@
</p:panel>
</h:form>
</p:tab>
-
</p:tabView>
+ <style type="text/css">
+ .ui-selectonemenu.ui-widget.ui-state-default.ui-corner-all{
+ min-width: 100px !important;
+ }
+ </style>
</ui:composition>
</html>
--
Gitblit v1.9.2