From 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期二, 23 二月 2021 16:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/yufei' into master
---
src/main/webapp/user_mng.xhtml | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index c3c039a..674fe75 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -15,15 +15,21 @@
<p:panel styleClass="center-header">
<p:outputLabel styleClass="title" value="用户管理"></p:outputLabel>
- <p:panelGrid styleClass="filter" columns="7">
+ <p:panelGrid styleClass="filter" columns="11">
<p:outputLabel value="ARP号："></p:outputLabel>
<p:inputText value="#{userMngController.arp}"></p:inputText>
<p:outputLabel value="姓名："></p:outputLabel>
<p:inputText value="#{userMngController.name}"></p:inputText>
+ <p:outputLabel value="课题组："></p:outputLabel>
+ <p:inputText value="#{userMngController.project}"></p:inputText>
+
<p:outputLabel value="部门："></p:outputLabel>
<p:inputText value="#{userMngController.departmentName}"></p:inputText>
+
+ <p:outputLabel value="单位："></p:outputLabel>
+ <p:inputText value="#{userMngController.company}"></p:inputText>
<p:commandLink styleClass="search" process="@form" update="@form"></p:commandLink>
</p:panelGrid>
@@ -85,7 +91,7 @@
</p:column>
<p:column headerText="课题组">
- <h:outputText value="#{sysProjectServiceImpl.getSysProject(row.projectId).projectName}"></h:outputText>
+ <h:outputText value="#{row.project}"></h:outputText>
</p:column>
<p:column headerText="ARP">
@@ -128,6 +134,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 +176,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.projectName}" itemValue="#{item.id}"></f:selectItems>
+ var="item" itemLabel="#{item.project}" itemValue="#{item.project}"></f:selectItems>
</p:selectOneMenu>
<p:outputLabel value="姓名"></p:outputLabel>
@@ -179,12 +189,11 @@
<p:outputLabel value="账号"></p:outputLabel>
<p:inputText value="#{userMngController.sysUser.account}" maxlength="100"
required="true" requiredMessage="请输入账号"
- disabled="#{userMngController.action == constants.ACTION_EDIT}"></p:inputText>
+ disabled="#{userMngController.action == constants.ACTION_EDIT}" autocomplete="off"></p:inputText>
<p:outputLabel value="密码" ></p:outputLabel>
<p:password value="#{userMngController.sysUser.password}" maxlength="100"
- requiredMessage="请输入密码"
- ></p:password>
+ requiredMessage="请输入密码" autocomplete="off"></p:password>
<p:outputLabel value="电话"></p:outputLabel>
<p:inputText value="#{userMngController.sysUser.phone}" maxlength="30"></p:inputText>
@@ -225,6 +234,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