From 7435b78aa64bb9fdfdc8e89787a0b88ef54ac8ef Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 29 一月 2021 16:20:13 +0800
Subject: [PATCH] 修改危废页面

---
 src/main/webapp/user_mng.xhtml |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index 71022e0..b133e54 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -84,6 +84,10 @@
                     <h:outputText value="#{baseMetaService.getBaseMetaValue(row.department)}"></h:outputText>
                 </p:column>
 
+                <p:column headerText="课题组">
+                    <h:outputText value="#{row.project}"></h:outputText>
+                </p:column>
+
                 <p:column headerText="ARP">
                     <h:outputText value="#{row.arp}"></h:outputText>
                 </p:column>
@@ -124,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>
@@ -161,6 +169,13 @@
                 <p:inputText value="#{userMngController.sysUser.arp}" maxlength="100"
                              required="true" requiredMessage="请输入ARP号"></p:inputText>
 
+                <p:outputLabel value="课题组"></p:outputLabel>
+                <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.project}"></f:selectItems>
+                </p:selectOneMenu>
+
                 <p:outputLabel value="姓名"></p:outputLabel>
                 <p:inputText value="#{userMngController.sysUser.name}" maxlength="100"
                              required="true" requiredMessage="请输入姓名"></p:inputText>
@@ -172,8 +187,7 @@
 
                 <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>
@@ -214,6 +228,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