From 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期四, 21 一月 2021 11:20:53 +0800
Subject: [PATCH] 修改处理报警接口
---
src/main/webapp/user_mng.xhtml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index 2bf9136..09ccb1b 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -85,7 +85,7 @@
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).project}"></h:outputText>
+ <h:outputText value="#{row.project}"></h:outputText>
</p:column>
<p:column headerText="ARP">
@@ -128,6 +128,10 @@
<h:outputText value="#{row.seeFlag!=null?row.seeFlag.text:''}"></h:outputText>
</p:column>
+ <p:column headerText="危废人员">
+ <h:outputText value="#{row.waster!=null?row.waster.text:''}"></h:outputText>
+ </p:column>
+
<p:column headerText="更新时间">
<h:outputText value="#{row.updateTime!=null?row.updateTime:''}">
<f:convertDateTime pattern="yyyy-M-d HH:mm" /></h:outputText>
@@ -166,10 +170,10 @@
required="true" requiredMessage="请输入ARP号"></p:inputText>
<p:outputLabel value="课题组"></p:outputLabel>
- <p:selectOneMenu value="#{userMngController.sysUser.projectId}">
- <f:selectItem itemLabel="不选择课题组" />
+ <p:selectOneMenu value="#{userMngController.sysUser.project}" filter="true" filterMatchMode="startsWith">
+ <f:selectItem itemLabel="不选择课题组" />
<f:selectItems value="#{sysProjectServiceImpl.getAll()}"
- var="item" itemLabel="#{item.project}" itemValue="#{item.id}"></f:selectItems>
+ var="item" itemLabel="#{item.project}" itemValue="#{item.project}"></f:selectItems>
</p:selectOneMenu>
<p:outputLabel value="姓名"></p:outputLabel>
@@ -225,6 +229,14 @@
<p:inputTextarea autoResize="false" style="height: 80px"
value="#{userMngController.sysUser.memo}"
maxlength="200"></p:inputTextarea>
+
+ <p:outputLabel value="危废角色"></p:outputLabel>
+ <p:selectOneMenu value="#{userMngController.sysUser.waster}"
+ required="true" requiredMessage="请选择危废角色">
+ <f:converter converterId="wasterConvert"></f:converter>
+ <f:selectItems value="#{userMngController.wasterSelectList}"
+ var="item" itemLabel="#{item.text}" itemValue="#{item}"></f:selectItems>
+ </p:selectOneMenu>
</p:panelGrid>
<p:panel styleClass="btn">
<p:commandButton value="保存" actionListener="#{userMngController.onSaveBtnClick}"
--
Gitblit v1.9.2