diff --git a/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs b/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs index 8ae7947..aa2b5af 100644 --- a/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs +++ b/Code/src/MineTec.ProManager.Application/UserInfo/UserInfoAppService.cs @@ -46,7 +46,7 @@ namespace MineTec.ProManager.UserInfo var result = new UserInfoOutput(); try { - var query = base.CreateFilteredQuery(input).WhereIf(!string.IsNullOrEmpty(input.Account), t => t.Account.Contains(input.Account)).WhereIf(!string.IsNullOrEmpty(input.UserName), t => t.UserName.Contains(input.UserName)); + var query = base.CreateFilteredQuery(input).Where(t => t.IsDelete != 1 && t.IsLeaving != 1).WhereIf(!string.IsNullOrEmpty(input.Account), t => t.Account.Contains(input.Account)).WhereIf(!string.IsNullOrEmpty(input.UserName), t => t.UserName.Contains(input.UserName)); var usercount = query.Count(); var userlist = query.ToList(); var list = ObjectMapper.Map>(userlist); diff --git a/Pages/js/PublicParameters/PublicParameters.js b/Pages/js/PublicParameters/PublicParameters.js index 54836db..51762bf 100644 --- a/Pages/js/PublicParameters/PublicParameters.js +++ b/Pages/js/PublicParameters/PublicParameters.js @@ -7,4 +7,30 @@ var apiUrl = 'http://localhost:21021'; //返回WebApiUrl公共部分 function GetWebApiUrl(s) { return apiUrl; +} + +// 获取当前日期时间 +function getDatetime() { + var now = new Date(); + var year = now.getFullYear(); + var month = now.getMonth() + 1; + var day = now.getDate(); + var hh = now.getHours(); + var mm = now.getMinutes(); + var ss = now.getSeconds(); + var clock = year + "-"; + if (month < 10) + clock += "0"; + clock += month + "-"; + if (day < 10) + clock += "0"; + clock += day + " "; + if (hh < 10) + clock += "0"; + clock += hh + ":"; + if (mm < 10) clock += '0'; + clock += mm + ":"; + if (ss < 10) clock += '0'; + clock += ss; + return clock; } \ No newline at end of file diff --git a/Pages/page/UserList.html b/Pages/page/UserList.html index 644ff21..ed20582 100644 --- a/Pages/page/UserList.html +++ b/Pages/page/UserList.html @@ -66,7 +66,7 @@ table = layui.table; var apiUrl = GetWebApiUrl(); - + table.render({ elem: '#UserList', url: apiUrl + '/api/services/app/UserInfo/GetAllUsers', @@ -92,8 +92,12 @@ { field: 'cellPhoneNum', width: 150, title: '手机号' }, { title: '操作', width: 200, toolbar: '#currentTableBar', align: "center" } ]], + initSort: { + field: 'workNo', //排序字段，对应 cols 设定的各字段名 + type: 'asc' //排序方式 asc: 升序、desc: 降序、null: 默认排序 + }, limits: [10, 15, 20, 25, 50, 100], - limit: 20, + limit: 15, page: true, skin: 'line' }); @@ -133,9 +137,14 @@ layer.full(index); }); } else if (obj.event === 'delete') { // 监听删除操作 - var checkStatus = table.checkStatus('UserList') - , data = checkStatus.data; - layer.alert(JSON.stringify(data)); + var checkStatus = table.checkStatus('UserList'), + data = checkStatus.data; + if (data.length == 0) { + layer.alert('请选择至少一个用户！'); + return false; + } + delUser(data); + return false; } }); @@ -162,13 +171,78 @@ }); return false; } else if (obj.event === 'delete') { - layer.confirm('真的删除行么', function (index) { - obj.del(); - layer.close(index); - }); + delSingleUser(data); + return false; } }); + + //批量删除用户 + function delUser(data) { + //弹出确认弹窗 + layer.confirm('确认删除吗？', function () { + var apiUrl = GetWebApiUrl(); + //删除所选的账户信息，更新isdelete字段为1 + for (let index = 0; index < data.length; index++) { + $.ajax({ + url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址 + dataType: "json", //返回格式为json + //async: false,//请求是否异步，默认为异步，这也是ajax重要特性 + contentType: 'application/json', + data: JSON.stringify({ + id: data[index].id, + isDelete: 1 + }), //参数值 + type: "PUT", //请求方式 + success: function (req) { + //请求成功时处理 + layer.msg('删除成功', { time: 1000 }, function () { + window.location.reload(); + }); + }, + error: function () { + /*错误信息处理*/ + layer.alert("用户名：" + data[index].userName + " 删除失败，请重试！"); + return false; + }, + }); + } + return false; + }); + } + + //删除单个用户 + function delSingleUser(data) { + //弹出确认弹窗 + layer.confirm('确认删除吗？', function () { + var apiUrl = GetWebApiUrl(); + //删除所选的账户信息，更新isdelete字段为1 + $.ajax({ + url: apiUrl + "/api/services/app/UserInfo/Update", //请求的url地址 + dataType: "json", //返回格式为json + //async: false,//请求是否异步，默认为异步，这也是ajax重要特性 + contentType: 'application/json', + data: JSON.stringify({ + id: data.id, + isDelete: 1 + }), //参数值 + type: "PUT", //请求方式 + success: function (req) { + //请求成功时处理 + layer.msg('删除成功', { time: 1000 }, function () { + window.location.reload(); + }); + }, + error: function () { + /*错误信息处理*/ + layer.alert("用户名：" + data.userName + " 删除失败，请重试！"); + return false; + }, + }); + + return false; + }); + } });