Skip to content

H
hp-smart
Commit 2ec31d71 by 宋祥
Options

1.用户组调整为角色

parent c4082276
Showing with 506 additions and 13 deletions
src/main/webapp/HP/PZ/HPPZ009.jsp
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" checkMode="row">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/> <EF:EFColumn cname="企业编码" ename="companyCode" enable="false" width="120" align="center"/>
<EF:EFColumn cname="企业名称" ename="companyName" width="140" editType="textarea" required="true"/> <EF:EFColumn cname="企业名称" ename="companyName" width="140" required="true"/>
<EF:EFComboColumn cname="是否启用" ename="validFlag" width="80" align="center" required="true"> <EF:EFComboColumn cname="是否启用" ename="validFlag" width="80" align="center" required="true">
<EF:EFCodeOption codeName="hpjx.hppz.validFlag"/> <EF:EFCodeOption codeName="hpjx.hppz.validFlag"/>
</EF:EFComboColumn> </EF:EFComboColumn>
<EF:EFColumn cname="备注" ename="remark" width="150" editType="textarea"/> <EF:EFColumn cname="备注" ename="remark" width="150" editType="textarea"/>
<EF:EFColumn cname="创建人名称" ename="createdName" enable="false" align="center"/> <EF:EFColumn cname="创建人" ename="createdName" enable="false" align="center"/>
<EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center" <EF:EFColumn cname="创建时间" ename="createdTime" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/> editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
<EF:EFColumn cname="修改人名称" ename="updatedName" enable="false" align="center"/> <EF:EFColumn cname="修改人" ename="updatedName" enable="false" align="center"/>
<EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center" <EF:EFColumn cname="修改时间" ename="updatedTime" enable="false" width="140" align="center"
editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/> editType="datetime" parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"/>
</EF:EFGrid> </EF:EFGrid>
......
src/main/webapp/XS/XS30.jsp
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<span class="my-text" id="my-text1">用户管理</span> <span class="my-text" id="my-text1">用户管理</span>
</button> </button>
<button id="my-button-2" class="my-button" onclick="switchWindow(1)"> <button id="my-button-2" class="my-button" onclick="switchWindow(1)">
<span class="my-text" id="my-text2">用户组管理</span> <span class="my-text" id="my-text2">角色管理</span>
</button> </button>
</div> </div>
......
src/main/webapp/XS/XS3001.jsp
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
<div class="col-md-12" style="padding-left: 0;padding-right: 0"> <div class="col-md-12" style="padding-left: 0;padding-right: 0">
<EF:EFTab id="authInfo" showClose="false"> <EF:EFTab id="authInfo" showClose="false">
<div title="所属用户组"> <div title="所属角色">
<EF:EFInput blockId="inqu_status" row="0" ename="userIdForParentGroups" cname="登录账号" <EF:EFInput blockId="inqu_status" row="0" ename="userIdForParentGroups" cname="登录账号"
type="hidden"/> type="hidden"/>
<EF:EFGrid blockId="result1" queryMethod="queryUserParentGroups" autoDraw="no" autoBind="false"> <EF:EFGrid blockId="result1" queryMethod="queryUserParentGroups" autoDraw="no" autoBind="false">
......
src/main/webapp/XS/XS3002.js 0 → 100644
$(function () {
setTimeout(() => {
refreshQuery();
}, 500)
IPLATUI.EFGrid = {
"result": {
pageable: {
pageSize: 20
},
loadComplete: function () {
$('#QUERY').on('click', () => {
refreshQuery();
})
},
onRowClick: function (e) {
getSelectedModel(e)
flashUser(e)
},
onCheckRow: function (e) {
if (e.checked) {
getSelectedModel(e)
flashUser(e)
}
},
toolbarConfig: {
hidden: false
},
},
"resultB": {
pageable: {
pageSize: 20
},
exportGrid: false,
loadComplete: function (grid) {
/**
* 给用户组添加用户，打开弹窗
*/
$('#USERWINDOW').on('click', () => {
if (resultGrid?.getCheckedRows()?.length > 1 || (resultGrid?.getCheckedRows()?.length === 0 && resultGrid.getSelectedData().length !== 1)) {
IPLAT.alert("请在用户组信息中勾选需要添加的1个用户组");
return
}
if (resultGrid?.getCheckedRows()?.length === 1 && resultGrid?.getCheckedRows()[0].id !== lastUserGroupId) {
IPLAT.alert("请确保最后选择的用户组与勾选用户组相同");
return
}
queryUserOutOfUserGroup() && $("#insertUser").data("kendoWindow").open()
})
/**
* 用户组删除用户
*/
$('#DELETEUSER').on('click', () => {
if (resultGrid?.getCheckedRows()?.length > 1 || (resultGrid?.getCheckedRows()?.length === 0 && resultGrid.getSelectedData().length !== 1)) {
IPLAT.alert("请在用户组信息中勾选需要添加的1个用户组");
return
}
if (resultGrid?.getCheckedRows()?.length === 1 && resultGrid?.getCheckedRows()[0].id !== lastUserGroupId) {
IPLAT.alert("请确保最后选择的用户组与勾选用户组相同");
return
}
const parent = resultGrid.getRows(lastSelectedRow)[0];
const users = grid.getCheckedRows();
if (users?.length > 0) {
const okFunc = () => {
var eiInfo = new EiInfo();
var block = new EiBlock("result");
block.getBlockMeta().addMeta(new EiColumn("memberId"));
block.getBlockMeta().addMeta(new EiColumn("memberName"));
block.getBlockMeta().addMeta(new EiColumn("parentId"));
block.getBlockMeta().addMeta(new EiColumn("parentName"));
block.getBlockMeta().addMeta(new EiColumn("memberType"));
const parentId = parent.groupId;
const parentName = parent.groupCname;
const merberType = "USER";
for (let i = 0; i < users.length; i++) {
let user = users[i];
block.setCell(i, "memberId", user.get("userId"));
block.setCell(i, "memberName", user.get("userName"));
block.setCell(i, "parentId", parentId);
block.setCell(i, "parentName", parentName);
block.setCell(i, "memberType", merberType);
}
eiInfo.addBlock(block);
EiCommunicator.send("XS03", "delete", eiInfo, {
onSuccess: function (ei) {
if (-1 == ei.getStatus()) {
IPLAT.alert(ei.getMsg());
} else {
IPLAT.alert(ei.getMsg());
grid.dataSource.page(1);
}
}, onFail: function (ei) {
IPLAT.alert(ei.getMsg());
}
});
}
IPLAT.confirm({
message: '<b>确定删除勾选的用户吗？</b> \n\n <i style="font-size: 12px">注：请优先通知管理员。</i>',
okFn: okFunc,
cancelFn: function (e) {
}
});
} else {
IPLAT.alert("请在用户信息中勾选执行删除的用户")
}
})
},
toolbarConfig: {
add: false,
hidden: false
},
},
"resultC": {
exportGrid: false,
loadComplete: function (grid) {
/**
* 添加用户
*/
$("#ADDUSER").on("click", () => {
const users = grid.getCheckedRows();
if (users?.length > 0) {
const eiInfo = new EiInfo();
const block = new EiBlock("result");
block.getBlockMeta().addMeta(new EiColumn("memberId"));
block.getBlockMeta().addMeta(new EiColumn("memberName"));
block.getBlockMeta().addMeta(new EiColumn("parentId"));
block.getBlockMeta().addMeta(new EiColumn("parentName"));
block.getBlockMeta().addMeta(new EiColumn("memberType"));
const parent = resultGrid.getRows(lastSelectedRow)[0]
const parentId = parent.groupId;
const parentName = parent.groupCname;
const merberType = "USER";
for (let i = 0; i < users.length; i++) {
let user = users[i]
block.setCell(i, "memberId", user.get("userId"));
block.setCell(i, "memberName", user.get("userName"));
block.setCell(i, "parentId", parentId);
block.setCell(i, "parentName", parentName);
block.setCell(i, "memberType", merberType);
}
eiInfo.addBlock(block);
EiCommunicator.send("XS03", "insert", eiInfo, {
onSuccess: function (ei) {
if (-1 == ei.getStatus()) {
IPLAT.alert(ei.getMsg());
} else {
IPLAT.alert(ei.getMsg());
resultBGrid.dataSource.page(1);
}
}, onFail: function (ei) {
IPLAT.alert(ei.getMsg());
}
});
$("#insertUser").data("kendoWindow").close()
} else {
IPLAT.alert("请在用户信息中勾选需要添加的用户");
}
})
$("#QUERY_C").on("click", () => {
queryUserOutOfUserGroup()
})
},
toolbarConfig: {
add: false,
hidden: false
},
},
}
$("#resourceTab").addClass("i-fit-height");
$("#splitter").kendoSplitter({
panes: [
{size: "40%", min: "30%", max: "70%", collapsible: true},
{},
{collapsible: true}
]
});
// 当 EFRegion 的 fitHeight="true" 时，需要为 splitter 中的 k-splitbar 加上 class="i-fit-height"。
$("#splitter").find(".k-splitbar").addClass("i-fit-height");
//加下面的延迟是为了处理 OT数据管理门户下多界面同时刷新 界面展示不全的问题
var interval01 = setInterval(splitterInterval, 200);
function splitterInterval() {
if (document.getElementById("splitter").getElementsByClassName("k-splitbar").length !== 1) {
$("#splitter").kendoSplitter({
panes: [
{size: "40%", min: "30%", max: "70%", collapsible: true},
{},
{collapsible: true}
]
});
} else {
clearInterval(interval01);
}
}
});
function refreshQuery() {
resultGrid.dataSource.page(1);
}
const flashUser = (userGroup) => {
var item = userGroup.model;
$("#inqu_statusB-0-parentName").val(item.groupEname);
$("#inqu_statusB-0-parentId").val(item.groupId);
lastUserGroupId = item.groupId;
resultBGrid.dataSource.page(1);
}
/**
* 查询用户组中不包含的用户
*/
const queryUserOutOfUserGroup = () => {
$("#inqu_status-0-parentId").val(resultGrid.getRows(lastSelectedRow)[0].groupId)
resultCGrid.dataSource.page(1);
return true
}
/**
* 获取最后被点击/勾选的行信息
* @param e
*/
const getSelectedModel = (e) => {
lastUserGroupId = e.model.id;
lastSelectedRow = e.row;
}
let lastUserGroupId = '';// 最后被点击/勾选的用户组id
let lastSelectedRow = null;// 最后被点击/勾选的用户组行index
window.onload = ()=>{
const themeStr = document.body.className
/**
* 重设表格高度
*/
const resetGridHeight = () => {
const orgHeight = $("#usergrouptable")[0].offsetHeight;
if (orgHeight) {
if (~themeStr.indexOf("large")) {
$("#ef_grid_result").css("height", `72vh`)
$("#ef_grid_resultB").css("height", `84vh`)
} else {
$("#ef_grid_result").css("height", `80vh`)
$("#ef_grid_resultB").css("height", `88vh`)
}
$("#XS3002").css("padding","8px 16px 8px")
return
}
setTimeout(() => {
resetGridHeight()
}, 200)
}
resetGridHeight()
}
\ No newline at end of file
src/main/webapp/XS/XS3002.jsp 0 → 100644
<!DOCTYPE html>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
<c:set var="ctx" value="${pageContext.request.contextPath}"/>
<EF:EFPage>
<div id="splitter" class="i-fit-height">
<div id="left-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 8px">
<EF:EFRegion id="userGroupTable" title="角色信息" fitHeight="true">
<%-- <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%>
<%-- style="padding-left:0;padding-right:0">--%>
<div class="row" id="inquRegion">
<EF:EFInput ename="inqu_status-0-groupEname" cname="角色英文名" placeholder="请输入角色英文名"
colWidth="6"/>
<EF:EFInput ename="inqu_status-0-groupCname" cname="角色中文名" placeholder="请输入角色中文名"
colWidth="6"/>
</div>
<hr>
<%-- </EF:EFRegion>--%>
<%-- <EF:EFRegion id="userGroupTable" title="用户组信息" fitHeight="true">--%>
<EF:EFGrid blockId="result" autoDraw="no" personal="true" autoBind="true">
<EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true" primaryKey="true"/>
<EF:EFColumn ename="groupEname" cname="角色英文名" style="text-align:left;" readonly="true"
required="true" data-regex="/^[@_a-zA-Z0-9]{1,32}$/"
data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/>
<EF:EFColumn ename="groupCname" cname="角色中文名" required="true" style="text-align:left;"/>
<EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;" hidden="true"/>
<EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;" readonly="true"
hidden="true"/>
<EF:EFComboColumn ename="groupType" cname="群组类型" valueField="valueField" textField="textField"
defaultValue="NORMAL" columnTemplate="#=textField#" align="center"
required="true"
hidden="true">
<EF:EFCodeOption codeName="iplat.xs.userGroup"/>
</EF:EFComboColumn>
<EF:EFColumn ename="sortIndex" cname="排序" style="text-align:right;" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"/>
<EF:EFColumn ename="recCreateTime" cname="创建时间" enable="false" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss" displayType="datetime" style="text-align:right;"
hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"/>
<EF:EFColumn ename="recReviseTime" cname="修改时间" enable="false" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss" displayType="datetime" style="text-align:right;"
hidden="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"/>
</EF:EFGrid>
</EF:EFRegion>
</div>
</div>
<div id="right-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 0">
<EF:EFRegion id="inquB" title="用户查询" type="query" efRegionShowClear="true" efRegionSave="true"
style="display:none">
<div class="row">
<div style="display: none">
<EF:EFInput type="hidden" cname="父节点ID" ename="parentId" row="0" blockId="inqu_statusB"
name="inqu_statusB-0-parentId" value=""/>
<EF:EFInput type="hidden" cname="父节点名称" ename="parentName" row="0" blockId="inqu_statusB"
name="inqu_statusB-0-parentName" value=""/>
</div>
</div>
</EF:EFRegion>
<EF:EFRegion id="user" title="用户信息" fitHeight="true">
<EF:EFGrid blockId="resultB" autoDraw="no" autoBind="false" queryMethod="queryUserByGroup">
<EF:EFColumn ename="loginName" cname="登录账号" readonly="true" style="text-align:left;"/>
<EF:EFColumn ename="userName" cname="用户姓名" style="text-align:left;" readonly="true"/>
<EF:EFComboColumn ename="gender" cname="性别" valueField="valueField" textField="textField"
columnTemplate="#=textField#" align="center" readonly="true">
<EF:EFCodeOption codeName="xservices.xs.sex"/>
</EF:EFComboColumn>
<EF:EFColumn ename="mobile" style="text-align:right;" cname="手机" data-rules="mobile_phone"
readonly="true"/>
<EF:EFColumn ename="email" cname="邮箱" data-rules="email" style="text-align:left;"
readonly="true"/>
<EF:EFColumn ename="userId" cname="用户ID" readonly="false" primaryKey="true" hidden="true"/>
<EF:EFColumn ename="password" cname="用户密码" hidden="true" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="isLocked" cname="是否锁定" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userIsLocked" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="用户状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="userType" cname="用户类别" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userType" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFColumn ename="accountExpireDate" style="text-align:right;" cname="账号过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']" dateFormat="yyyy-MM-dd"
hidden="true" readonly="true"/>
<EF:EFColumn ename="pwdExpireDate" style="text-align:right;" cname="密码过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']" dateFormat="yyyy-MM-dd"
readonly="true" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recCreateTime" style="text-align:right;" cname="创建时间" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recReviseTime" style="text-align:right;" cname="修改时间" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="pwdReviseDate" cname="密码修改时间" readonly="true" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']" displayType="datetime"
enable="false" hidden="true"
style="text-align:right;"/>
<EF:EFColumn ename="pwdRevisor" cname="密码修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"
readonly="true"/>
</EF:EFGrid>
</EF:EFRegion>
<EF:EFWindow id="insertUser" top="100px" left="280px" width="58%" height="75%">
<EF:EFRegion id="inquC" title="查询条件" type="query" efRegionShowClear="true" efRegionSave="true">
<div class="row">
<EF:EFInput ename="inqu_status-0-loginName" cname="登录账号" placeholder="请输入登录账号"
colWidth="6"/>
<EF:EFInput ename="inqu_status-0-userName" cname="用户姓名" placeholder="请输入用户姓名" colWidth="6"/>
<div class="col-xs-9" style="text-align: right" id="inqu_inside"></div>
</div>
<EF:EFInput type="hidden" cname="父节点ID" ename="parentId" row="0" blockId="inqu_status"
name="inqu_status-0-parentId" value=""/>
</EF:EFRegion>
<EF:EFRegion id="resultC" title="用户信息">
<EF:EFGrid blockId="resultC" autoDraw="no" autoBind="false"
queryMethod="queryUserOutOfUserGroup">
<EF:EFColumn ename="loginName" cname="登录账号" readonly="true" style="text-align:left;"/>
<EF:EFColumn ename="userName" cname="用户姓名" style="text-align:left;" readonly="true"/>
<EF:EFComboColumn ename="gender" cname="性别" valueField="valueField" textField="textField"
columnTemplate="#=textField#" align="center" readonly="true">
<EF:EFCodeOption codeName="xservices.xs.sex"/>
</EF:EFComboColumn>
<EF:EFColumn ename="mobile" style="text-align:right;" cname="手机" data-rules="mobile_phone"
readonly="true"/>
<EF:EFColumn ename="email" cname="邮箱" data-rules="email" style="text-align:left;"
readonly="true"/>
<EF:EFColumn ename="userId" cname="用户ID" readonly="false" primaryKey="true" hidden="true"/>
<EF:EFColumn ename="password" cname="用户密码" hidden="true" readonly="true"/>
<EF:EFComboColumn ename="status" cname="状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="isLocked" cname="是否锁定" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userIsLocked" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="status" cname="用户状态" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userStatus" textField="label"
valueField="value"/>
</EF:EFComboColumn>
<EF:EFComboColumn ename="userType" cname="用户类别" style="text-align:center;" hidden="true"
readonly="true">
<EF:EFCodeOption codeName="xservices.xs.userType" textField="label" valueField="value"/>
</EF:EFComboColumn>
<EF:EFColumn ename="accountExpireDate" style="text-align:right;" cname="账号过期时间"
editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']"
dateFormat="yyyy-MM-dd"
hidden="true" readonly="true"/>
<EF:EFColumn ename="pwdExpireDate" style="text-align:right;" cname="密码过期时间" editType="date"
displayType="date" parseFormats="['yyyyMMdd','yyyy-MM-dd']"
dateFormat="yyyy-MM-dd"
readonly="true" hidden="true"/>
<EF:EFColumn ename="recCreator" cname="创建人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recCreateTime" style="text-align:right;" cname="创建时间"
editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="recRevisor" cname="修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="recReviseTime" style="text-align:right;" cname="修改时间"
editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']"
dateFormat="yyyy-MM-dd HH:mm:ss"
displayType="datetime" readonly="true" hidden="true"/>
<EF:EFColumn ename="pwdReviseDate" cname="密码修改时间" readonly="true" editType="datetime"
parseFormats="['yyyyMMddHHmmss','yyyy-MM-dd HH:mm:ss']" displayType="datetime"
enable="false" hidden="true"
style="text-align:right;"/>
<EF:EFColumn ename="pwdRevisor" cname="密码修改人" enable="false" style="text-align:left;"
hidden="true"
readonly="true"/>
<EF:EFColumn ename="archiveFlag" cname="归档标记" style="text-align:right;" hidden="true"
readonly="true"/>
</EF:EFGrid>
</EF:EFRegion>
</EF:EFWindow>
</div>
</div>
</div>
</EF:EFPage>
src/main/webapp/XS/XS32.jsp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="my-head"> <div class="my-head">
<div id="my-front"> <div id="my-front">
<button id="my-button-1" class="my-button" onclick="switchWindow(1)"> <button id="my-button-1" class="my-button" onclick="switchWindow(1)">
<span class="my-text" id="my-text1">用户组授权</span> <span class="my-text" id="my-text1">角色授权</span>
</button> </button>
<%--<button id="my-button-2" class="my-button" onclick="switchWindow(2)"> <%--<button id="my-button-2" class="my-button" onclick="switchWindow(2)">
<span class="my-text" id="my-text2">资源授权</span> <span class="my-text" id="my-text2">资源授权</span>
......
src/main/webapp/XS/XS3201.jsp
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<div id="splitter" class="i-fit-height"> <div id="splitter" class="i-fit-height">
<div id="left-pane" class="i-fit-height"> <div id="left-pane" class="i-fit-height">
<div class="col-md-12" style="padding-left: 0;padding-right: 8px"> <div class="col-md-12" style="padding-left: 0;padding-right: 8px">
<EF:EFRegion id="inqu" title="用户组信息" style="padding-left:0;padding-right:0" fitHeight="true"> <EF:EFRegion id="inqu" title="角色信息" style="padding-left:0;padding-right:0" fitHeight="true">
<%-- <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%> <%-- <EF:EFRegion id="inqu" title="用户组查询" type="query" efRegionShowClear="true" efRegionSave="true"--%>
<%-- style="padding-left:0;padding-right:0">--%> <%-- style="padding-left:0;padding-right:0">--%>
<div class="row" id="inquRegion"> <div class="row" id="inquRegion">
<EF:EFInput ename="inqu_status-0-groupEname" cname="用户组英文名" placeholder="请输入用户组英文名" <EF:EFInput ename="inqu_status-0-groupEname" cname="角色英文名" placeholder="请输入角色英文名"
colWidth="6"/> colWidth="6"/>
<EF:EFInput ename="inqu_status-0-groupCname" cname="用户组中文名" placeholder="请输入用户组中文名" <EF:EFInput ename="inqu_status-0-groupCname" cname="角色中文名" placeholder="请输入角色中文名"
colWidth="6"/> colWidth="6"/>
</div> </div>
<hr> <hr>
...@@ -44,10 +44,10 @@ ...@@ -44,10 +44,10 @@
<EF:EFGrid blockId="result" autoDraw="no" serviceName="XS02" personal="true" checkMode="single"> <EF:EFGrid blockId="result" autoDraw="no" serviceName="XS02" personal="true" checkMode="single">
<EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true" <EF:EFColumn ename="groupId" cname="用户群组ID" readonly="false" hidden="true"
primaryKey="true"/> primaryKey="true"/>
<EF:EFColumn ename="groupEname" cname="用户组英文名" style="text-align:left;" readonly="true" <EF:EFColumn ename="groupEname" cname="角色英文名" style="text-align:left;" readonly="true"
data-regex="/^[@_a-zA-Z0-9]{1,32}$/" data-regex="/^[@_a-zA-Z0-9]{1,32}$/"
data-errorprompt="对不起,用户组英文名只能是32位英文字母或数字字符或下划线或@符"/> data-errorprompt="对不起,角色英文名只能是32位英文字母或数字字符或下划线或@符"/>
<EF:EFColumn ename="groupCname" cname="用户组中文名" style="text-align:left;" readonly="true"/> <EF:EFColumn ename="groupCname" cname="角色中文名" style="text-align:left;" readonly="true"/>
<EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;" <EF:EFColumn ename="manageGroupEname" cname="管辖组英文名" style="text-align:left;"
hidden="true"/> hidden="true"/>
<EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;" <EF:EFColumn ename="manageGroupCname" cname="管辖组中文名" style="text-align:left;"
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
</EF:EFRegion> </EF:EFRegion>
<hr style="margin-top: 4px"> <hr style="margin-top: 4px">
<div class="i-region-header" style="padding-left: 8px; display: flex;"> <div class="i-region-header" style="padding-left: 8px; display: flex;">
<span>用户组成员</span> <span>角色成员</span>
</div> </div>
<%-- <EF:EFRegion id="userTable" title="用户组成员" style="overflow-y:auto">--%> <%-- <EF:EFRegion id="userTable" title="用户组成员" style="overflow-y:auto">--%>
<EF:EFGrid blockId="resultB" autoDraw="false" autoBind="false" serviceName="XS3002" <EF:EFGrid blockId="resultB" autoDraw="false" autoBind="false" serviceName="XS3002"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment