Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-02-23 3cc43725fa2e4b8ed4b4b00b845a7dc83f99f39a

 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,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>