取消领用

gdg

2021-02-03 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73

 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>
@@ -84,6 +90,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 +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>
@@ -160,6 +174,13 @@
                <p:outputLabel value="ARP号"></p:outputLabel>
                <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"
@@ -214,6 +235,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}"