From df47c9300bfe6c641c88707aa5b54591ab4c004c Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期五, 11 六月 2021 15:18:58 +0800
Subject: [PATCH] 订单领取：过期处理(确认和过期 状态处理),增加状态过期（需要将数据库字段加长） 实验室选中问题 仓库领取的仓库不存在问题
---
src/main/webapp/user_mng.xhtml | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/user_mng.xhtml b/src/main/webapp/user_mng.xhtml
index b133e54..4764996 100644
--- a/src/main/webapp/user_mng.xhtml
+++ b/src/main/webapp/user_mng.xhtml
@@ -15,39 +15,53 @@
<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>
</p:panel>
<p:panel styleClass="center-body">
- <p:panelGrid columns="5" styleClass="btn">
+ <p:panelGrid columns="6" styleClass="btn">
<p:commandButton value="新建" styleClass="new-btn"
- process="@this"
+ process="@form"
actionListener="#{userMngController.onNewBtnClick}"
oncomplete="PF('dialog').show();"
- update=":dialog,:dialogForm"></p:commandButton>
+ update=":dialog,:dialogForm"
+ rendered="#{userMngController.isAccess('新增')}"></p:commandButton>
<p:commandButton value="修改" styleClass="edit-btn"
process="@form"
actionListener="#{userMngController.onEditBtnClick}"
- update=":dialog,:dialogForm"></p:commandButton>
+ update=":dialog,:dialogForm"
+ rendered="#{userMngController.isAccess('修改')}"></p:commandButton>
<p:commandButton value="删除" styleClass="del-btn"
process="@form"
actionListener="#{userMngController.onDeleteBtnClick}"
- update="@form">
+ update="@form"
+ rendered="#{userMngController.isAccess('删除')}">
<p:confirm header="确认" message="确认操作？"></p:confirm>
</p:commandButton>
<p:commandButton value="导入" styleClass="import-btn" onclick="importUser()"
+ rendered="#{userMngController.isAccess('导入')}"
></p:commandButton>
- <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+ <p:outputLabel rendered="#{userMngController.isAccess('导入')}">
+ <a href="resources/template/用户导入模板.xlsx" style="display: inline-block;"><img src="resources/images/xlsx.png" width="30px;" alt=""/></a>
+ </p:outputLabel>
+ <p:commandButton value="导出" styleClass="new-btn" ajax="false" actionListener="#{userMngController.exportLab2Excel}"
+ />
<script>
function importUser(){
$("#userMngForm\\:importUserBtn_input").click();
@@ -183,7 +197,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