From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/webapp/sys_hazardous_waste.xhtml | 112 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 94 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/sys_hazardous_waste.xhtml b/src/main/webapp/sys_hazardous_waste.xhtml
index 92ce344..ae003c3 100644
--- a/src/main/webapp/sys_hazardous_waste.xhtml
+++ b/src/main/webapp/sys_hazardous_waste.xhtml
@@ -37,12 +37,12 @@
<p:outputLabel value="单号："/>
<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="不选择课题组" />
- <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
- var="item" itemLabel="#{item.project}" itemValue="#{item.project}"/>
- </p:selectOneMenu>
+<!-- <p:outputLabel value="课题组"></p:outputLabel>-->
+<!-- <p:selectOneMenu value="#{hazardousWasteController.projectId}" filter="true" filterMatchMode="startsWith">-->
+<!-- <f:selectItem itemLabel="不选择课题组" />-->
+<!-- <f:selectItems value="#{sysProjectServiceImpl.getAll()}"-->
+<!-- var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"/>-->
+<!-- </p:selectOneMenu>-->
<p:outputLabel value="部门"></p:outputLabel>
<p:selectOneMenu value="#{hazardousWasteController.department}" requiredMessage="请选择部门">
@@ -57,6 +57,15 @@
</p:panel>
<p:panel styleClass="center-body">
<p:panelGrid columns="5" styleClass="btn">
+ <p:commandButton value="新增" styleClass="new-btn"
+ process="@form"
+ actionListener="#{hazardousWasteController.addHazardousWaste}"
+ oncomplete="PF('wastedialog').show();"
+ update=":wastedialog,:dialogForm"></p:commandButton>
+ <p:commandButton value="编辑" styleClass="edit-btn"
+ process="@form"
+ actionListener="#{hazardousWasteController.editHazardousWaste}"
+ update=":wastedialog,:dialogForm"></p:commandButton>
<p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{hazardousWasteController.export2Excel}" />
<p:commandButton value="取消" styleClass="del-btn" ajax="false" actionListener="#{hazardousWasteController.cancelOne}" />
<p:commandButton value="恢复" styleClass="edit-btn" ajax="false" actionListener="#{hazardousWasteController.recoverOne}" />
@@ -67,13 +76,14 @@
paginatorAlwaysVisible="false"
paginatorPosition="bottom"
lazy="true" value="#{hazardousWasteController.dataModel}"
- selection="#{hazardousWasteController.selectedOne}"
+ selection="#{hazardousWasteController.selectedList}"
var="row"
rowKey="#{row.id}"
emptyMessage="无数据"
rows="20"
- selectionMode="single"
- pageLinks="5">
+ pageLinks="5"
+ resizableColumns="true">
+ <p:column selectionMode="multiple" style="width: 30px;text-align: center;"/>
<p:column headerText="单号" width="150">
<h:outputText value="#{row.tid}"/>
</p:column>
@@ -100,7 +110,7 @@
<h:outputText value="#{row.medical}"/>
</p:column>
<p:column headerText="确认者">
- <h:outputText value="#{row.applyPerson}"/>
+ <h:outputText value="#{row.applyPersonName}"/>
</p:column>
<p:column headerText="确认时间">
<h:outputText value="#{row.updatetime}">
@@ -108,14 +118,14 @@
</h:outputText>
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{row.project}"/>
+ <h:outputText value="#{row.projectName}"/>
</p:column>
<p:column headerText="部门">
<h:outputText value="#{row.department}"/>
</p:column>
<p:column headerText="单位">
- <h:outputText value="#{row.unit}"/>
+ <h:outputText value="#{row.unitName}"/>
</p:column>
<p:column headerText="创建者">
@@ -130,6 +140,7 @@
</p:dataTable>
</p:panel>
</h:form>
+
</p:tab>
<p:tab title="统计分析">
<h:form id="hazardousWasteAnalysisForm">
@@ -154,12 +165,12 @@
<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.projectId}" filter="true">-->
+<!-- <f:selectItem itemLabel="不选择课题组" />-->
+<!-- <f:selectItems value="#{sysProjectServiceImpl.getAll()}"-->
+<!-- var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"/>-->
+<!-- </p:selectOneMenu>-->
<p:outputLabel value="部门"></p:outputLabel>
<p:selectOneMenu value="#{hazardousWasteController.department}" requiredMessage="请选择部门">
@@ -236,5 +247,70 @@
min-width: 100px !important;
}
</style>
+
+ <p:dialog modal="true"
+ header="#{hazardousWasteController.action==constants.ACTION_ADD?'新建':'修改'}"
+ appendTo="@(body)" id="wastedialog" widgetVar="wastedialog" resizable="false"
+ width="800">
+ <h:form id="dialogForm">
+ <p:panelGrid columns="4" styleClass="content2 grid-padding-bottom2">
+ <p:outputLabel value="确认者"></p:outputLabel>
+ <p:autoComplete value="#{hazardousWasteController.hazardousWaste.applyPerson}" completeMethod="#{hazardousWasteController.getUserSelectList()}"
+ var="item"
+ dropdown="true"
+ styleClass="apply-user-autocomplete"
+ itemLabel="#{!empty hazardousWasteController.hazardousWaste and !empty hazardousWasteController.hazardousWaste.applyPerson ? hazardousWasteController.getSelectedUserById(hazardousWasteController.hazardousWaste.applyPerson).name: (!empty item?item.name:'')}"
+ itemValue="#{!empty item ? item.id:''}" forceSelection="true">
+ <p:ajax event="itemSelect" process="@this" update="@this" />
+ <p:column>
+ <h:outputText value="#{item.name}" required="true" requiredMessage="请填写确认者"/>
+ </p:column>
+ </p:autoComplete>
+
+
+ <p:outputLabel value="部门"></p:outputLabel>
+ <p:selectOneMenu value="#{hazardousWasteController.hazardousWaste.department}"
+ required="true" requiredMessage="请选择部门">
+ <f:selectItems value="#{baseMetaService.getBaseMetaList(constants.BASE_META_GROUP_USER_DEPARTMENT)}"
+ var="item" itemLabel="#{item.metaValue}" itemValue="#{item.metaValue}"></f:selectItems>
+ </p:selectOneMenu>
+
+ <p:outputLabel value="课题组"></p:outputLabel>
+ <p:selectOneMenu value="#{hazardousWasteController.hazardousWaste.projectId}" filter="true" filterMatchMode="startsWith" required="true" requiredMessage="请选择课题组">
+ <f:selectItem itemLabel="不选择课题组" />
+ <f:selectItems value="#{sysProjectServiceImpl.getAll()}"
+ var="item" itemLabel="#{item.projectName}" itemValue="#{item.id}"></f:selectItems>
+ </p:selectOneMenu>
+
+
+ <p:outputLabel value="酸性废液"></p:outputLabel>
+ <p:inputText value="#{hazardousWasteController.hazardousWaste.acid}" maxlength="100"
+ required="true" requiredMessage="请输入酸性废液"></p:inputText>
+
+ <p:outputLabel value="碱性废液"></p:outputLabel>
+ <p:inputText value="#{hazardousWasteController.hazardousWaste.alkali}" maxlength="100"
+ required="true" requiredMessage="请输入碱性废液"></p:inputText>
+
+ <p:outputLabel value="有机废液"></p:outputLabel>
+ <p:inputText value="#{hazardousWasteController.hazardousWaste.organic}" maxlength="100"
+ required="true" requiredMessage="请输入有机废液"></p:inputText>
+
+ <p:outputLabel value="固体废弃物"></p:outputLabel>
+ <p:inputText value="#{hazardousWasteController.hazardousWaste.solid}" maxlength="100"
+ required="true" requiredMessage="请输入固体废弃物"></p:inputText>
+
+ <p:outputLabel value="医疗废弃物"></p:outputLabel>
+ <p:inputText value="#{hazardousWasteController.hazardousWaste.medical}" maxlength="100"
+ required="true" requiredMessage="请输入医疗废弃物"></p:inputText>
+ </p:panelGrid>
+ <p:panel styleClass="btn">
+ <p:commandButton value="保存"
+ actionListener="#{hazardousWasteController.onSaveBtnClick}" process="@form" >
+ <p:confirm header="确认" message="确认操作？"></p:confirm>
+ </p:commandButton>
+ </p:panel>
+ </h:form>
+ </p:dialog>
+
</ui:composition>
</html>
--
Gitblit v1.9.2