From 6f039191bb7dbdd2af7d74986459bbfd3ac54480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sun, 7 Jun 2020 22:37:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/customer.html | 14 +++++++------- erp_web/pages/manage/depot.html | 7 +++++-- erp_web/pages/manage/inOutItem.html | 5 ++++- erp_web/pages/manage/member.html | 16 ++++++++-------- erp_web/pages/manage/role.html | 3 +++ erp_web/pages/manage/vendor.html | 14 +++++++------- erp_web/pages/materials/person.html | 3 +++ .../com/jsh/erp/service/role/RoleComponent.java | 2 +- .../com/jsh/erp/service/role/RoleService.java | 12 ++++++++++++ 9 files changed, 50 insertions(+), 26 deletions(-) diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html index aab67eef..32f268c1 100644 --- a/erp_web/pages/manage/customer.html +++ b/erp_web/pages/manage/customer.html @@ -52,18 +52,18 @@
-
- - + - - + @@ -134,13 +134,13 @@
名称 + 名称 联系人 + 联系人
地址 - +
备注 - +
diff --git a/erp_web/pages/manage/depot.html b/erp_web/pages/manage/depot.html index 9e2e3212..0d82d6e5 100644 --- a/erp_web/pages/manage/depot.html +++ b/erp_web/pages/manage/depot.html @@ -457,11 +457,14 @@ //保存信息 $("#saveDepot").off("click").on("click", function () { - var infoObj = $("#depotFM").serializeObject(); - infoObj.type = 0; + if(!$('#depotFM').form('validate')){ + return; + } if (checkDepotName()) { return; } + var infoObj = $("#depotFM").serializeObject(); + infoObj.type = 0; $.ajax({ url: url, type: "post", diff --git a/erp_web/pages/manage/inOutItem.html b/erp_web/pages/manage/inOutItem.html index 711d4b70..d76a78c9 100644 --- a/erp_web/pages/manage/inOutItem.html +++ b/erp_web/pages/manage/inOutItem.html @@ -353,13 +353,16 @@ //保存收支项目 $("#saveInOutItem").off("click").on("click", function () { - if (checkInOutItemName()) { + if(!$('#inOutItemFM').form('validate')){ return; } if (!$("#type").val()) { $.messager.alert('提示', '请选择类型！', 'warning'); return; } + if (checkInOutItemName()) { + return; + } $.ajax({ url: url, type: "post", diff --git a/erp_web/pages/manage/member.html b/erp_web/pages/manage/member.html index ea8efd4a..16b1d3e3 100644 --- a/erp_web/pages/manage/member.html +++ b/erp_web/pages/manage/member.html @@ -52,18 +52,18 @@
-
- - + - - + @@ -116,7 +116,7 @@ - + @@ -134,13 +134,13 @@
名称 + 名称 联系人 + 联系人
税率税率(%)
地址 - +
备注 - +
diff --git a/erp_web/pages/manage/role.html b/erp_web/pages/manage/role.html index 58087c30..576e5e3a 100644 --- a/erp_web/pages/manage/role.html +++ b/erp_web/pages/manage/role.html @@ -272,6 +272,9 @@ //保存信息 $("#saveRole").off("click").on("click", function () { + if(!$('#roleFM').form('validate')){ + return; + } if (checkRoleName()) { return; } diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html index 780aa197..5b537ded 100644 --- a/erp_web/pages/manage/vendor.html +++ b/erp_web/pages/manage/vendor.html @@ -52,18 +52,18 @@
-
- - + - - + @@ -134,13 +134,13 @@
名称 + 名称 联系人 + 联系人
地址 - +
备注 - +
diff --git a/erp_web/pages/materials/person.html b/erp_web/pages/materials/person.html index fe74f478..067835ea 100644 --- a/erp_web/pages/materials/person.html +++ b/erp_web/pages/materials/person.html @@ -345,6 +345,9 @@ //保存信息 $("#savePerson").off("click").on("click", function () { + if(!$('#personFM').form('validate')){ + return; + } if (!$("#Type").val()) { $.messager.alert('提示', '请选择类型！', 'warning'); return; diff --git a/src/main/java/com/jsh/erp/service/role/RoleComponent.java b/src/main/java/com/jsh/erp/service/role/RoleComponent.java index e757b083..57ede8eb 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleComponent.java +++ b/src/main/java/com/jsh/erp/service/role/RoleComponent.java @@ -65,7 +65,7 @@ public class RoleComponent implements ICommonQuery { @Override public int checkIsNameExist(Long id, String name)throws Exception { - return 0; + return roleService.checkIsNameExist(id, name); } } diff --git a/src/main/java/com/jsh/erp/service/role/RoleService.java b/src/main/java/com/jsh/erp/service/role/RoleService.java index c02ecb2b..700b2b09 100644 --- a/src/main/java/com/jsh/erp/service/role/RoleService.java +++ b/src/main/java/com/jsh/erp/service/role/RoleService.java @@ -136,6 +136,18 @@ public class RoleService { return result; } + public int checkIsNameExist(Long id, String name) throws Exception{ + RoleExample example = new RoleExample(); + example.createCriteria().andIdNotEqualTo(id).andNameEqualTo(name).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); + List list =null; + try{ + list=roleMapper.selectByExample(example); + }catch(Exception e){ + JshException.readFail(logger, e); + } + return list==null?0:list.size(); + } + public List findUserRole()throws Exception{ RoleExample example = new RoleExample(); example.setOrderByClause("Id");