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 |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index b133e54..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>
@@ -183,7 +189,7 @@
                 <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"

--
Gitblit v1.9.2