代码提交
This commit is contained in:
parent
2ed27bdd65
commit
90c5829241
|
|
@ -58,5 +58,9 @@ public class Role extends PageEntity {
|
|||
* 角色级别
|
||||
*/
|
||||
private Integer level;
|
||||
/**
|
||||
* 角色级别名称
|
||||
*/
|
||||
private String levelName;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -100,14 +100,14 @@ public class UserController {
|
|||
try {
|
||||
SysUser u = userService.getUser(data.getData().getLoginName());
|
||||
if (u != null) {
|
||||
return ServerResponse.createErroe("登录名"+data.getData().getLoginName() + "已存在");
|
||||
return ServerResponse.createErroe("登录账号"+data.getData().getLoginName() + "已存在");
|
||||
}
|
||||
if(StringHelper.isNotEmpty(data.getData().getPhone())){
|
||||
/* if(StringHelper.isNotEmpty(data.getData().getPhone())){
|
||||
SysUser u2 = userService.getPhone(data.getData().getPhone());
|
||||
if (u2 != null) {
|
||||
return ServerResponse.createErroe("手机号"+data.getData().getPhone() + "已存在");
|
||||
}
|
||||
}
|
||||
}*/
|
||||
ServerResponse response=userService.saveUser(data.getData());
|
||||
return response;
|
||||
}catch (Exception e){
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
</insert>
|
||||
<!--登录查询用户-->
|
||||
<select id="getUser" parameterType="String" resultType="com.bonus.imgTool.model.SysUser">
|
||||
select t.id,t.user_name as username,t.login_name as loginName,t.phone,t.org_id as orgId,so.org_name as orgName,
|
||||
select t.id,t.user_name as username,t.login_name as loginName,t.org_id as orgId,so.org_name as orgName,
|
||||
t.password,t.state,t.role_id as roleId,t.login_type loginType,t.new_user newUser,
|
||||
sr.role_code AS roleCode,sr.role_name AS roleName,t.team_id AS teamId
|
||||
from sys_user t
|
||||
|
|
@ -131,7 +131,6 @@
|
|||
t.org_id as orgId,
|
||||
so.org_name as orgName,
|
||||
sr.role_name roleName,
|
||||
t.phone AS phone,
|
||||
t.team_id as teamId,
|
||||
CASE
|
||||
t.user_type
|
||||
|
|
@ -214,7 +213,12 @@
|
|||
</select>
|
||||
<select id="getRoleAll" resultType="com.bonus.imgTool.model.Role">
|
||||
select t.role_id as id,
|
||||
t.role_name as name
|
||||
t.role_name as name,
|
||||
t.level,
|
||||
case when t.level = 0 then '项目部级'
|
||||
when t.level = 1 then '公司级'
|
||||
else ''
|
||||
end as levelName
|
||||
from sys_role t
|
||||
where t.del_flag = 0
|
||||
and t.state = 1
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ let data = [], appResList = [];
|
|||
let roleList;
|
||||
let orgData;
|
||||
let teamList;
|
||||
|
||||
function setParams(params) {
|
||||
console.log(params)
|
||||
idParam = JSON.parse(params).id;
|
||||
|
|
@ -20,38 +21,50 @@ function setParams(params) {
|
|||
dtree = layui.dtree;
|
||||
var $ = layui.jquery;
|
||||
roleList = getRoleSelected();
|
||||
teamList = getTeamSelected();
|
||||
orgData = getOrgTree();
|
||||
projectList = getProSelected();
|
||||
// teamList = getTeamSelected();
|
||||
// orgData = getOrgTree();
|
||||
console.log(idParam + "idParam")
|
||||
if (idParam) {
|
||||
getUserById();
|
||||
}
|
||||
|
||||
// form.render();
|
||||
form.render("checkbox","select");//重新渲染页面checkbox控件
|
||||
form.render("checkbox", "select");//重新渲染页面checkbox控件
|
||||
form.on('submit(formData)', function (data) {
|
||||
data.field.id = $('#id').val();
|
||||
console.log( data.field.orgId_select_nodeId);
|
||||
if(!data.field.orgId_select_nodeId){
|
||||
return layer.alert("请选择组织机构!", {icon: 2})
|
||||
}
|
||||
let phone = $('#phone').val();
|
||||
if(phone){
|
||||
if (!(/^1[3456789]\d{9}$/.test(phone))) {
|
||||
/* console.log( data.field.orgId_select_nodeId);
|
||||
if(!data.field.orgId_select_nodeId){
|
||||
return layer.alert("请选择组织机构!", {icon: 2})
|
||||
}*/
|
||||
let loginName = $('#loginName').val();
|
||||
if (loginName) {
|
||||
if (!(/^1[3456789]\d{9}$/.test(loginName))) {
|
||||
return layer.alert("请输入正确的手机号", {icon: 2})
|
||||
}
|
||||
}
|
||||
if (!validatePassword(data.field.password)){
|
||||
if (!validatePassword(data.field.password)) {
|
||||
return layer.alert("密码必须包含大、小写字母 、数字、 特殊字符四种里至少三种,且密码长度不低于8位", {icon: 2})
|
||||
}
|
||||
saveData(data);
|
||||
});
|
||||
|
||||
// 监听角色下拉框的 change 事件
|
||||
form.on('select(roleId)', function (data) {
|
||||
const roleName = $('#roleId option:selected').text();
|
||||
if (roleName.includes('项目部级')) {
|
||||
$('#projectDiv').removeClass('layui-hide'); // 显示 div
|
||||
} else {
|
||||
$('#projectDiv').addClass('layui-hide'); // 隐藏 div
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
var a = 0;
|
||||
$(".secreteyesk1").hide();
|
||||
$(".secreteyesk2").hide();
|
||||
$('.eyes1').click(function() {
|
||||
$('.eyes1').click(function () {
|
||||
a += 1;
|
||||
if (a % 2 == 0) {
|
||||
$('.secreteyesk1').hide();
|
||||
|
|
@ -70,7 +83,7 @@ function setParams(params) {
|
|||
* 校验密码
|
||||
*/
|
||||
function validatePassword(password) {
|
||||
console.log("password:",password)
|
||||
console.log("password:", password)
|
||||
// 定义正则表达式来检测不同的字符类型
|
||||
const hasUpperCase = /[A-Z]/.test(password);
|
||||
const hasLowerCase = /[a-z]/.test(password);
|
||||
|
|
@ -82,7 +95,7 @@ function validatePassword(password) {
|
|||
|
||||
// 计算符合要求的字符类型数量
|
||||
const typesCount = [hasUpperCase, hasLowerCase, hasDigit, hasSpecialChar].filter(Boolean).length;
|
||||
console.log("typesCount:",typesCount)
|
||||
console.log("typesCount:", typesCount)
|
||||
|
||||
// 验证密码:长度合法且包含至少三种字符类型
|
||||
return isLengthValid && typesCount >= 3;
|
||||
|
|
@ -105,10 +118,28 @@ function getRoleSelected() {
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取工程数据
|
||||
*/
|
||||
function getProSelected() {
|
||||
let url = dataUrl + '/users/getRoleAll';
|
||||
ajaxRequest(url, "POST", null, true, function () {
|
||||
}, function (result) {
|
||||
if (result.code === 200) {
|
||||
setSelectValue(result.data, 'roleId');
|
||||
} else {
|
||||
layer.alert(result.msg, {icon: 2})
|
||||
}
|
||||
}, function (xhr) {
|
||||
error(xhr)
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取班组数据
|
||||
*/
|
||||
function getTeamSelected() {
|
||||
|
||||
/*function getTeamSelected() {
|
||||
let url = dataUrl + '/testReport/getTeamSelected';
|
||||
ajaxRequest(url, "POST", null, true, function () {
|
||||
}, function (result) {
|
||||
|
|
@ -120,26 +151,40 @@ function getTeamSelected() {
|
|||
}, function (xhr) {
|
||||
error(xhr)
|
||||
});
|
||||
}*/
|
||||
|
||||
function setSelectValue(list, selectName) {
|
||||
let html = '<option value="" selected>请选择</option>';
|
||||
$.each(list, function (index, item) {
|
||||
html += '<option value="' + item.id + '">' + item.name + '(' + item.levelName + ')' + '</option>';
|
||||
})
|
||||
$('#' + selectName).empty().append(html);
|
||||
layui.form.render();
|
||||
}
|
||||
function setOrgTree(data){
|
||||
orgTree = dtree.renderSelect({
|
||||
elem: "#orgId",
|
||||
data: data,
|
||||
dataFormat: "list",
|
||||
skin: "laySimple",
|
||||
line: true, // 显示树线
|
||||
checkbar: false, //开启复选框
|
||||
done: function (data, url, first) {
|
||||
console.log($('#orgId').val())
|
||||
if(first) {
|
||||
var params = dtree.dataInit("orgId", $('#orgId').val());
|
||||
var selectParam = dtree.selectVal("orgId");
|
||||
console.log(params)
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
function getOrgTree() {
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
// function setOrgTree(data){
|
||||
// orgTree = dtree.renderSelect({
|
||||
// elem: "#orgId",
|
||||
// data: data,
|
||||
// dataFormat: "list",
|
||||
// skin: "laySimple",
|
||||
// line: true, // 显示树线
|
||||
// checkbar: false, //开启复选框
|
||||
// done: function (data, url, first) {
|
||||
// console.log($('#orgId').val())
|
||||
// if(first) {
|
||||
// var params = dtree.dataInit("orgId", $('#orgId').val());
|
||||
// var selectParam = dtree.selectVal("orgId");
|
||||
// console.log(params)
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// }
|
||||
/*function getOrgTree() {
|
||||
let data = [];
|
||||
let url = dataUrl + '/users/getOrg';
|
||||
ajaxRequest(url, "POST", null, true, function () {
|
||||
|
|
@ -155,7 +200,8 @@ function getOrgTree() {
|
|||
error(xhr)
|
||||
});
|
||||
return data;
|
||||
}
|
||||
}*/
|
||||
|
||||
// 根据id获取用户信息
|
||||
function getUserById() {
|
||||
let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
|
||||
|
|
@ -164,8 +210,8 @@ function getUserById() {
|
|||
id: idParam
|
||||
}
|
||||
console.log(params)
|
||||
params={
|
||||
encryptedData:encryptCBC(JSON.stringify(params))
|
||||
params = {
|
||||
encryptedData: encryptCBC(JSON.stringify(params))
|
||||
}
|
||||
ajaxRequest(url, "POST", params, true, function () {
|
||||
}, function (result) {
|
||||
|
|
@ -184,10 +230,10 @@ function getUserById() {
|
|||
|
||||
// 设置表单内容
|
||||
function setFormData(data) {
|
||||
console.log("data:",data)
|
||||
console.log("data:", data)
|
||||
if (data) {
|
||||
$("#password").removeAttr("lay-verify");
|
||||
$("#pwd").css("display","none");
|
||||
$("#pwd").css("display", "none");
|
||||
$('#id').val(data.id)
|
||||
// $('#userCode').val(data.userCode)
|
||||
$('#username').val(data.username)
|
||||
|
|
@ -212,7 +258,7 @@ function setFormData(data) {
|
|||
} else if (data.state === 0) {
|
||||
document.getElementById('state_0').checked = true;
|
||||
}
|
||||
$('#type_'+data.type).attr('checked', true)
|
||||
$('#type_' + data.type).attr('checked', true)
|
||||
$('#orgId').val(data.orgId)
|
||||
$('#roleId').val(data.roleId)
|
||||
$('#roleId option[value=' + data.roleId + ']').attr('selected', true)
|
||||
|
|
@ -248,12 +294,12 @@ function saveData(data) {
|
|||
console.log(arr_box)
|
||||
params.loginType = arr_box.join()
|
||||
params.orgId = params.orgId_select_nodeId;
|
||||
if(params.id !=""){
|
||||
if (params.id != "") {
|
||||
url = dataUrl + "/users/update";
|
||||
}
|
||||
console.log(params)
|
||||
params={
|
||||
encryptedData:encryptCBC(JSON.stringify(params))
|
||||
params = {
|
||||
encryptedData: encryptCBC(JSON.stringify(params))
|
||||
}
|
||||
ajaxRequest(url, "POST", params, true, function () {
|
||||
$('.save').addClass("layui-btn-disabled").attr("disabled", true);
|
||||
|
|
@ -298,7 +344,8 @@ function isRepeat(paramName, phone) {
|
|||
|
||||
function getPasswordConfig(callback) {
|
||||
let url = dataUrl + "/users/getPasswordConfig"
|
||||
ajaxRequest(url, "POST", null, true, function () {}, function (result) {
|
||||
ajaxRequest(url, "POST", null, true, function () {
|
||||
}, function (result) {
|
||||
// layer.close(loadingMsg); // 关闭提示层
|
||||
if (result.status === 200) {
|
||||
callback(result.data);
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
let form, layer, dtree, table, tableIns;
|
||||
let pageNum = 1, limitSize = 10; // 默认第一页,分页数量为10
|
||||
let orgData,selectOrgId="";
|
||||
let orgData, selectOrgId = "";
|
||||
|
||||
layui.config({
|
||||
base: "../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径
|
||||
}).extend({
|
||||
dtree: 'dtree'
|
||||
}).use(['form', 'layer', 'table','dtree', 'laydate'], function () {
|
||||
}).use(['form', 'layer', 'table', 'dtree', 'laydate'], function () {
|
||||
form = layui.form;
|
||||
layer = layui.layer;
|
||||
table = layui.table;
|
||||
|
|
@ -21,10 +21,11 @@ layui.config({
|
|||
'id': this.value,
|
||||
'state': obj.elem.checked ? 1 : 0
|
||||
}
|
||||
params={
|
||||
encryptedData:encryptCBC(JSON.stringify(params))
|
||||
params = {
|
||||
encryptedData: encryptCBC(JSON.stringify(params))
|
||||
}
|
||||
ajaxRequest(url, "POST", params, true, function () {}, function (result) {
|
||||
ajaxRequest(url, "POST", params, true, function () {
|
||||
}, function (result) {
|
||||
console.log(result)
|
||||
reloadData();
|
||||
if (result.status === 200) {
|
||||
|
|
@ -90,15 +91,15 @@ function initTable(dataList, limit, page) {
|
|||
cols: [
|
||||
[
|
||||
//表头
|
||||
{title: "序号", width: 80, unresize: true, align: "center",
|
||||
{
|
||||
title: "序号", width: 80, unresize: true, align: "center",
|
||||
templet: function (d) {
|
||||
return (page - 1) * limit + d.LAY_INDEX;
|
||||
}
|
||||
},
|
||||
{field: "loginName", title: "登录名", unresize: true, align: "center"},
|
||||
{field: "username", title: "用户名", unresize: true, align: "center"},
|
||||
// {field: "userCode", title: "工号", unresize: true, align: "center"},
|
||||
{field: "sex", title: "性别", unresize: true, align: "center",
|
||||
{field: "loginName", title: "登录账号", unresize: true, align: "center"},
|
||||
{field: "username", title: "姓名", unresize: true, align: "center"},
|
||||
/*{field: "sex", title: "性别", unresize: true, align: "center",
|
||||
templet: function (d) {
|
||||
if (d.sex == 0) {
|
||||
return "女";
|
||||
|
|
@ -106,21 +107,23 @@ function initTable(dataList, limit, page) {
|
|||
return "男";
|
||||
}
|
||||
}
|
||||
},
|
||||
{field: "orgName", title: "单位部门", unresize: true, align: "center"},
|
||||
},*/
|
||||
// {field: "orgName", title: "单位部门", unresize: true, align: "center"},
|
||||
{field: "roleName", title: "角色", unresize: true, align: "center"},
|
||||
{field: "phone", title: "联系电话", unresize: true, align: "center"},
|
||||
{field: "userType", title: "用户类型", unresize: true, align: "center"},
|
||||
{field: "state", title: "启用状态", align: "center",templet: '#is-state'},
|
||||
{title: "操作", unresize: true, width: 300, align: "center",
|
||||
// {field: "phone", title: "联系电话", unresize: true, align: "center"},
|
||||
{field: "userType", title: "用户级别", unresize: true, align: "center"},
|
||||
{field: "state", title: "启用状态", align: "center", templet: '#is-state'},
|
||||
{field: "createTime", title: "创建时间", unresize: true, align: "center"},
|
||||
{
|
||||
title: "操作", unresize: true, width: 300, align: "center",
|
||||
templet: function (d) {
|
||||
|
||||
let html = '';
|
||||
// let updaetpwd="<a class=\"layui-icon layui-icon-password\" style='cursor:pointer;' title='修改密码' onclick=\"resetPwd('" + d.id + "')\"></a>";
|
||||
let del="<a class=\"layui-icon layui-icon-delete\" style='cursor:pointer;' title='删除' onclick=\"delData('" + d.id + "')\"></a>"
|
||||
let edit="<a class=\"layui-icon layui-icon-edit\" style='cursor:pointer;' title='修改' onclick=\"addData('" + d.id + "')\"></a>";
|
||||
html=edit+del;
|
||||
if(d.delFlag==1){
|
||||
let updaetpwd = "<a class=\"layui-icon layui-icon-password\" style='cursor:pointer;' title='重置密码' onclick=\"resetPwd('" + d.id + "')\"></a>";
|
||||
let del = "<a class=\"layui-icon layui-icon-delete\" style='cursor:pointer;' title='删除' onclick=\"delData('" + d.id + "')\"></a>"
|
||||
let edit = "<a class=\"layui-icon layui-icon-edit\" style='cursor:pointer;' title='修改' onclick=\"addData('" + d.id + "')\"></a>";
|
||||
html = updaetpwd + edit + del;
|
||||
if (d.delFlag == 1) {
|
||||
return '';
|
||||
}
|
||||
return html;
|
||||
|
|
@ -155,14 +158,14 @@ function getReqParams(page, limit, type) {
|
|||
page: '1',
|
||||
limit: '10',
|
||||
userName: '',
|
||||
phone:'',
|
||||
orgId:'',
|
||||
phone: '',
|
||||
orgId: '',
|
||||
userType: '',
|
||||
};
|
||||
}
|
||||
console.log(obj)
|
||||
obj={
|
||||
encryptedData:encryptCBC(JSON.stringify(obj))
|
||||
obj = {
|
||||
encryptedData: encryptCBC(JSON.stringify(obj))
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
|
|
@ -229,8 +232,8 @@ function delData(id) {
|
|||
let params = {
|
||||
'id': id
|
||||
}
|
||||
params={
|
||||
encryptedData:encryptCBC(JSON.stringify(params))
|
||||
params = {
|
||||
encryptedData: encryptCBC(JSON.stringify(params))
|
||||
}
|
||||
ajaxRequest(url, "POST", params, true, function () {
|
||||
}, function (result) {
|
||||
|
|
@ -259,7 +262,7 @@ function editUserAccountStatus(id, status, type) {
|
|||
ajaxRequest(url, "POST", params, true, function () {
|
||||
}, function (result) {
|
||||
if (result.code === 200) {
|
||||
if(type){
|
||||
if (type) {
|
||||
reloadData();
|
||||
}
|
||||
parent.layer.msg(result.msg, {icon: 1})
|
||||
|
|
@ -286,7 +289,7 @@ function getOrgTree() {
|
|||
ajaxRequest(url, "POST", null, false, function () {
|
||||
}, function (result) {
|
||||
if (result.code === 200) {
|
||||
console.log(result,"getOrgTree")
|
||||
console.log(result, "getOrgTree")
|
||||
data = result.data;
|
||||
setOrgTree(data)
|
||||
} else {
|
||||
|
|
@ -298,25 +301,25 @@ function getOrgTree() {
|
|||
return data;
|
||||
}
|
||||
|
||||
function setOrgTree(data){
|
||||
console.log("data",data)
|
||||
var af=0,bf=0;
|
||||
function setOrgTree(data) {
|
||||
console.log("data", data)
|
||||
var af = 0, bf = 0;
|
||||
$.each(data, function (i, item) {
|
||||
if(item.id==0){
|
||||
item.id="99999";
|
||||
item.parentId="0";
|
||||
item.title="请选择组织机构";
|
||||
af=1;
|
||||
if (item.id == 0) {
|
||||
item.id = "99999";
|
||||
item.parentId = "0";
|
||||
item.title = "请选择组织机构";
|
||||
af = 1;
|
||||
}
|
||||
if(item.id==1){
|
||||
item.parentId="99999";
|
||||
bf=1;
|
||||
if (item.id == 1) {
|
||||
item.parentId = "99999";
|
||||
bf = 1;
|
||||
}
|
||||
if(af==1&&bf==1){
|
||||
if (af == 1 && bf == 1) {
|
||||
return
|
||||
}
|
||||
})
|
||||
orgTree =dtree.renderSelect({
|
||||
orgTree = dtree.renderSelect({
|
||||
elem: "#orgId",
|
||||
width: "100%", // 指定树的宽度
|
||||
dataFormat: "list",
|
||||
|
|
@ -329,11 +332,11 @@ function setOrgTree(data){
|
|||
}
|
||||
});
|
||||
dtree.on('node(orgId)', function (obj) {
|
||||
console.log("obj.param.nodeId",obj.param.nodeId); // 打印选中节点的值
|
||||
if(obj.param.nodeId=="99999"){
|
||||
selectOrgId="";
|
||||
}else{
|
||||
selectOrgId=obj.param.nodeId;
|
||||
console.log("obj.param.nodeId", obj.param.nodeId); // 打印选中节点的值
|
||||
if (obj.param.nodeId == "99999") {
|
||||
selectOrgId = "";
|
||||
} else {
|
||||
selectOrgId = obj.param.nodeId;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<input hidden id="id">
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录名</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录账号</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" id="loginName" name="loginName" autocomplete="off"
|
||||
lay-verify="required" maxlength="20">
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
</div>
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>用户名</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>姓名</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" id="username" name="username" autocomplete="off"
|
||||
lay-verify="required" maxlength="10">
|
||||
|
|
@ -44,12 +44,12 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>单位部门</label>
|
||||
<div class="layui-input-inline">
|
||||
<ul id="orgId" class="dtree" data-id="0"></ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>角色</label>
|
||||
|
|
@ -59,7 +59,15 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<div class="layui-form-item layui-hide" id="projectDiv">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>管理的工程</label>
|
||||
<div class="layui-input-inline">
|
||||
<select id="project" lay-verify="required" name="project" class="form-control input-sm">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label">班组</label>
|
||||
<div class="layui-input-inline">
|
||||
<select id="teamId" name="teamId" class="form-control input-sm">
|
||||
|
|
@ -73,10 +81,10 @@
|
|||
<input class="layui-input" autocomplete="off"
|
||||
lay-verify="isRepeat |required" maxlength="11" id="phone" name="phone">
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
|
||||
<div class="layui-form-item">
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 用户类型:</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="userType_1" name="userType" value="1" title="外部用户" checked>
|
||||
|
|
@ -90,9 +98,9 @@
|
|||
<input type="radio" id="state_1" name="state" value="1" title="启用" checked>
|
||||
<input type="radio" id="state_0" name="state" value="0" title="关闭">
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录权限</label>
|
||||
<div class="layui-input-inline" id="cbGuDing" >
|
||||
<input type="checkbox" name="loginType" value="1" title="后台" lay-skin="primary" checked>
|
||||
|
|
@ -100,7 +108,7 @@
|
|||
<input type="checkbox" name="loginType" value="3" title="app" lay-skin="primary">
|
||||
<input type="hidden" id="loginType" />
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;" id="pwd">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>密码</label>
|
||||
|
|
|
|||
|
|
@ -21,15 +21,16 @@
|
|||
<input hidden id="id">
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录名</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录账号</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" id="loginName" name="loginName" autocomplete="off"
|
||||
placeholder="请输入11位手机号"
|
||||
lay-verify="required" maxlength="20">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>用户名</label>
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>姓名</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" id="username" name="username" autocomplete="off"
|
||||
lay-verify="required" maxlength="10">
|
||||
|
|
@ -38,69 +39,80 @@
|
|||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 性别</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="sex_1" name="sex" value="1" title="男" checked>
|
||||
<input type="radio" id="sex_0" name="sex" value="0" title="女">
|
||||
<div class="layui-input-block">
|
||||
<input type="radio" id="sex_1" name="sex" value="1" title="男" checked>
|
||||
<input type="radio" id="sex_0" name="sex" value="0" title="女">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>单位部门</label>
|
||||
<div class="layui-input-inline">
|
||||
<ul id="orgId" class="dtree" data-id="0"></ul>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>单位部门</label>
|
||||
<div class="layui-input-inline">
|
||||
<ul id="orgId" class="dtree" data-id="0"></ul>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>角色</label>
|
||||
<div class="layui-input-inline">
|
||||
<select id="roleId" lay-verify="required" name="roleId" class="form-control input-sm">
|
||||
<select id="roleId" lay-verify="required" name="roleId" lay-filter="roleId"
|
||||
class="form-control input-sm">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="layui-form-item" style="margin-top: 2%;">-->
|
||||
<!-- <label class="layui-form-label"><i style="padding: 0 10px;">*</i>工号</label>-->
|
||||
<!-- <div class="layui-input-inline">-->
|
||||
<!-- <input class="layui-input" id="userCode" name="userCode" autocomplete="off"-->
|
||||
<!-- lay-verify="required" maxlength="20">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">班组</label>
|
||||
<div class="layui-form-item layui-hide" id="projectDiv">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>管理的工程</label>
|
||||
<div class="layui-input-inline">
|
||||
<select id="teamId" name="teamId" class="form-control input-sm">
|
||||
<select id="project" lay-verify="required" name="project" class="form-control input-sm">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>联系电话</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" autocomplete="off"
|
||||
lay-verify="isRepeat |required" maxlength="11" id="phone" name="phone">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 用户类型:</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="userType_1" name="userType" value="1" title="外部用户" checked>
|
||||
<input type="radio" id="userType_0" name="userType" value="0" title="内部用户">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 是否启用:</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="state_1" name="state" value="1" title="启用" checked>
|
||||
<input type="radio" id="state_0" name="state" value="0" title="关闭">
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="layui-form-item" style="margin-top: 2%;">-->
|
||||
<!-- <label class="layui-form-label"><i style="padding: 0 10px;">*</i>工号</label>-->
|
||||
<!-- <div class="layui-input-inline">-->
|
||||
<!-- <input class="layui-input" id="userCode" name="userCode" autocomplete="off"-->
|
||||
<!-- lay-verify="required" maxlength="20">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label">班组</label>
|
||||
<div class="layui-input-inline">
|
||||
<select id="teamId" name="teamId" class="form-control input-sm">
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
<!--
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>联系电话</label>
|
||||
<div class="layui-input-inline">
|
||||
<input class="layui-input" autocomplete="off"
|
||||
lay-verify="isRepeat |required" maxlength="11" id="phone" name="phone">
|
||||
</div>
|
||||
</div>
|
||||
-->
|
||||
|
||||
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 用户类型:</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="userType_1" name="userType" value="1" title="外部用户" checked>
|
||||
<input type="radio" id="userType_0" name="userType" value="0" title="内部用户">
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 是否启用:</label>
|
||||
<div class="layui-input-block" >
|
||||
<input type="radio" id="state_1" name="state" value="1" title="启用" checked>
|
||||
<input type="radio" id="state_0" name="state" value="0" title="关闭">
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<!-- <div class="layui-form-item">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录权限</label>
|
||||
<div class="layui-input-inline" id="cbGuDing" >
|
||||
<input type="checkbox" name="loginType" value="1" title="后台" lay-skin="primary" checked>
|
||||
|
|
@ -108,15 +120,15 @@
|
|||
<input type="checkbox" name="loginType" value="3" title="app" lay-skin="primary">
|
||||
<input type="hidden" id="loginType" />
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-form-item" style="margin-top: 2%;" id="pwd">
|
||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>密码</label>
|
||||
<div class="layui-input-inline password" >
|
||||
<input class="layui-input secret1" type="password" id="password" name="password" autocomplete="off"
|
||||
<div class="layui-input-inline password">
|
||||
<input class="layui-input secret1" type="password" id="password" name="password" autocomplete="off"
|
||||
lay-verify="required" maxlength="15">
|
||||
<span class="eyes1">
|
||||
<img class="secreteyes1 fa" src="../../../img/by.gif"> <!-- 闭眼 -->
|
||||
<img class="secreteyes1 fa" src="../../../img/by.gif"> <!-- 闭眼 -->
|
||||
<img class="secreteyesk1 none fa" src="../../../img/ky.gif">
|
||||
</span>
|
||||
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
<div class="layui-form-item">
|
||||
<div class="layui-inline" style="padding: 0 0 0 10px;">
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" id="userName" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入用户名">
|
||||
<input type="text" id="keyWord" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入关键字">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="layui-inline" style="padding: 0 0 0 10px;">
|
||||
<!-- <div class="layui-inline" style="padding: 0 0 0 10px;">
|
||||
<div class="layui-input-inline">
|
||||
<input type="text" id="phone" maxlength="30" class="layui-input" autocomplete="off" placeholder="请输入电话号码">
|
||||
</div>
|
||||
|
|
@ -45,13 +45,13 @@
|
|||
<option value="1"> 外部用户</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="layui-inline btns">
|
||||
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="query(1)">查询
|
||||
</button>
|
||||
<!-- <button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="reset()">重置-->
|
||||
<!-- </button>-->
|
||||
<button type="button" class="layui-btn layui-btn-normal layui-btn-sm btn-1" onclick="reset()">重置
|
||||
</button>
|
||||
<button type="button" class="layui-btn layui-btn-primary layui-btn-sm btn-2"
|
||||
onclick="addDataTemp(null)">
|
||||
<div class="layout" style="justify-content: space-around;"><img
|
||||
|
|
|
|||
Loading…
Reference in New Issue