purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化系统配置

Browse Source
This commit is contained in:
季圣华
2020-06-12 11:39:31 +08:00
parent 07b489356b
commit 2600e4f4f5
3 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
erp_web/pages/manage/systemConfig.html
View File

@@ -235,83 +235,85 @@
function deleteSystemConfig(systemConfigId) {
if(checkIsTestUser()) {
return;
}
$.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
if (r) {
$.ajax({
type: "post",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
data: ({
ids: systemConfigId
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
} else {
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
} else {
$.messager.confirm('删除确认', '确定要删除此系统配置信息吗？', function (r) {
if (r) {
$.ajax({
type: "post",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
data: ({
ids: systemConfigId
}),
success: function (res) {
if(res && res.code == 200) {
$("#searchBtn").click();
} else {
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
return;
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
return;
}
});
}
});
});
}
});
}
}
//批量删除系统配置
function batDeleteSystemConfig() {
if(checkIsTestUser()) {
return;
}
var row = $('#tableData').datagrid('getChecked');
if (row.length == 0) {
$.messager.alert('删除提示', '没有记录被选中！', 'warning');
return;
}
if (row.length > 0) {
$.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条系统配置信息吗？', function (r) {
if (r) {
var ids = "";
for (var i = 0; i < row.length; i++) {
if (i == row.length - 1) {
ids += row[i].id;
break;
}
ids += row[i].id + ",";
}
if(row[i].loginame == "jsh"){
$.messager.alert('提示', '管理员jsh不能删除！', 'warning');
return;
} else {
$.ajax({
type: "post",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
async: false,
data: ({
ids: ids
}),
success: function (res) {
if(res && res.code === 200) {
$("#searchBtn").click();
$(":checkbox").attr("checked", false);
} else {
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
return;
} else {
var row = $('#tableData').datagrid('getChecked');
if (row.length == 0) {
$.messager.alert('删除提示', '没有记录被选中！', 'warning');
return;
}
if (row.length > 0) {
$.messager.confirm('删除确认', '确定要删除选中的' + row.length + '条系统配置信息吗？', function (r) {
if (r) {
var ids = "";
for (var i = 0; i < row.length; i++) {
if (i == row.length - 1) {
ids += row[i].id;
break;
}
});
ids += row[i].id + ",";
}
if(row[i].loginName == "jsh"){
$.messager.alert('提示', '管理员jsh不能删除！', 'warning');
return;
} else {
$.ajax({
type: "post",
url: "/systemConfig/batchDeleteSystemConfigByIds",
dataType: "json",
async: false,
data: ({
ids: ids
}),
success: function (res) {
if(res && res.code === 200) {
$("#searchBtn").click();
$(":checkbox").attr("checked", false);
} else {
$.messager.alert('删除提示', '删除系统配置信息失败，请稍后再试！', 'error');
}
},
//此处添加错误处理
error: function () {
$.messager.alert('删除提示', '删除系统配置信息异常，请稍后再试！', 'error');
return;
}
});
}
}
}
});
});
}
}
}

4
erp_web/pages/manage/user.html
View File

@@ -313,7 +313,7 @@
}
ids += row[i].id + ",";
}
if(row[i].loginame == "jsh"){
if(row[i].loginName == "jsh"){
$.messager.alert('提示', '租户jsh不能删除！', 'warning');
return;
} else if(row[i].id == row[i].tenantId) {
@@ -363,7 +363,7 @@
var row = {};
$('#usernameFM').form('load', row);
$("#username").focus();
$("#loginame").removeAttr("readonly");
$("#loginName").removeAttr("readonly");
userID = 0;
/**机构选择*/
$("#selectType").val("org");

4
src/main/resources/mapper_xml/TenantMapperEx.xml
View File

@@ -6,7 +6,7 @@
FROM jsh_tenant
where 1=1
<if test="loginName != null">
and loginame like '%${loginName}%'
and login_name like '%${loginName}%'
</if>
<if test="offset != null and rows != null">
limit #{offset},#{rows}
@@ -18,7 +18,7 @@
FROM jsh_tenant
WHERE 1=1
<if test="loginName != null">
and loginame like '%${loginName}%'
and login_name like '%${loginName}%'
</if>
</select>
</mapper>