diff --git a/src/main/java/com/emr/controller/faultTypeController.java b/src/main/java/com/emr/controller/faultTypeController.java index 66db86e2..8b509b15 100644 --- a/src/main/java/com/emr/controller/faultTypeController.java +++ b/src/main/java/com/emr/controller/faultTypeController.java @@ -40,22 +40,40 @@ public class faultTypeController { @ResponseBody @RequestMapping(value = "/updateByClo") - public int updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws Exception{ + public String updateByClo(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Type emrFaultType) throws Exception{ + String result=""; int bol=0; + //判断code是否已经存在 + Emr_Fault_Type emrFaultTypeTj=new Emr_Fault_Type(); + emrFaultTypeTj.setTypeFlag(emrFaultType.getTypeFlag()); + List list=emrFaultTypeService.selectByCol(emrFaultTypeTj); //判断id是否存在 - if(emrFaultType.getId()!=null){ - //判断是否存在记录 - if (emrFaultTypeService.selectById(emrFaultType.getId()) != null) { - bol = emrFaultTypeService.updateByClo(emrFaultType); - } - }else{ + if(emrFaultType.getId()==null && list.size()<1){ //不存在则添加缺陷类别记录 //查询id最大的数据，取id+1作为新id的值 - Emr_Fault_Type emrFaultTypeNew=emrFaultTypeService.selectByColDesc(); - emrFaultType.setId(emrFaultTypeNew.getId()+1); - bol= emrFaultTypeService.insertClo(emrFaultType); + /* Emr_Fault_Type emrFaultTypeNew=emrFaultTypeService.selectByColDesc(); + emrFaultType.setId(emrFaultTypeNew.getId()+1);*/ + bol= emrFaultTypeService.insertClo(emrFaultType); + if(bol==1){ + result="添加类别成功!"; + }else{ + result="添加类别失败!"; + } + }else if(emrFaultType.getId()!=null && list.size()<2){ + //判断是否存在记录 + if (emrFaultTypeService.selectById(emrFaultType.getId()) != null) { + bol = emrFaultTypeService.updateByClo(emrFaultType); + if(bol==1){ + result="修改类别成功!"; + }else{ + result="修改类别失败!"; + } + } + + }else { + result="类别代码不可重复!"; } - return bol; + return result; } diff --git a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp index 3ffbc2d5..82503518 100644 --- a/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp +++ b/src/main/webapp/WEB-INF/views/dictionaryDir/dictionary.jsp @@ -21,10 +21,12 @@ vertical-align: middle; background-color: #2e6da4; color: #fff; - font-size: 19px; + font-size: 18px; font-weight: bold; - height: 30px; + height: 35px; margin-bottom: 10px; + margin-top: 0px; + padding-top: 5px; } .treeBtn1 { @@ -54,7 +56,7 @@ /*margin-left: 20px;*/ border-width: 0 0 0 1px; border-style: solid; - border-color: #2e6da4; + border-color: #aed0ea; /*background-color: #2e6da4;*/ height: calc(100vh - 0px); overflow-x: hidden; @@ -110,13 +112,14 @@ #ztree { margin-top: 10px; margin-left: -35px; - height: calc(100vh - 180px); + height: calc(100vh - 150px); overflow: auto; !important; } #searchBtn { width: 20%; + margin-top: -5px; !important; } @@ -127,8 +130,8 @@  字典列表
- - + +
@@ -267,8 +270,7 @@
@@ -357,7 +359,91 @@ // return result; // } + var currId =null; + var deptNodeId=null; + var setting = { + view: { + addHoverDom: false, + removeHoverDom: false, + selectedMulti: false, + autoCancelSelected: false, + fontCss: getFontCss + }, + check: { + enable: false + }, + data: { + simpleData: { + enable: true, + idKey: "id", + pIdKey: "pId", + rootPId: "0" + } + }, + edit: { + enable: false + }, + callback: { + beforeClick: function (treeId, treeNode) { + $("#delBtn").show(); + $("#saveBtn").show(); + $("#allTypeDiv").show(); + currNode = treeNode; + //console.log(treeNode.id); + if (treeNode.id != 0) { + if (treeNode.isParent || treeNode.pid == 0 || treeNode.code == null) { + $("#typecode").removeAttr("readOnly"); + $("#typename").removeAttr("readOnly"); + $("#typecode").val(treeNode.typecode); + $("#typename").val(treeNode.typename); + $("#subTypeDiv").hide(); + //$("#addTypeBtn").show(); + $("#addBtn").show(); + //判断节点是否有叶子节点，有则不可改父级，无则可改动 + var childrenNodes = treeNode.children; + /*if(childrenNodes!= undefined){ + $("#parentDiv").hide(); + }else{ + $("#parentDiv").show(); + }*/ + } else { + $("#typecode").attr("readOnly", "true"); + $("#typename").attr("readOnly", "true"); + var pNode = treeNode.getParentNode(); + $("#typecode").val(pNode.typecode); + $("#typename").val(pNode.typename); + $("#subTypeDiv").show(); + //$("#addTypeBtn").hide(); + $("#addBtn").hide(); + //$("#parentDiv").show(); + } + $("#id").val(treeNode.id); + $("#name").val(treeNode.name); + $("#code").val(treeNode.code); + $("#pyCode").val(treeNode.pyCode); + $("#wbCode").val(treeNode.wbCode); + $("#zipCode").val(treeNode.zipCode); + $("#cComment").val(treeNode.cComment); + $("#flag").val(treeNode.flag); + $("#parentId").val(""); + $("#effective").val(treeNode.effective); + $("#remark").val(treeNode.remark); + + $("#allTypeDiv").show(); + } else { + $("#subTypeDiv").removeAttr("display"); + $("#addBtn").hide(); + $("#delBtn").hide(); + $("#saveBtn").hide(); + $("#allTypeDiv").hide(); + //$("#addTypeBtn").show(); + //$("#parentDiv").hide(); + emptyEntity(1); + } + } + } + }; function initTree() { var target = document.getElementById('treediv'); spinner.spin(target);//给id为foo的div 中绑上spinner @@ -376,20 +462,26 @@ //var htmlStr=""; if (result != null) { for (var i = 0; i < result.length; i++) { - var obj = {}; obj.id = result[i].id; obj.pid = result[i].parentId; obj.pId = result[i].parentId; obj.typecode = result[i].typecode; obj.code = result[i].code; + if(obj.code==$("#code").val() && $("#code").val()!=undefined){ + $("#id").val(obj.id); + currId=obj.id; + } + if (result[i].parentId == 0 || obj.code == null) { obj.name = result[i].typename.trim(); + deptNodeId=result[i].id; // htmlStr += ""; } else { obj.name = result[i].name.trim(); // htmlStr += ""; } + obj.typename = result[i].typename; obj.cComment = result[i].cComment; obj.effective = result[i].effective; @@ -397,7 +489,7 @@ obj.gbCode = result[i].gbCode; obj.pyCode = result[i].pyCode; obj.wbCode = result[i].wbCode; - //console.log("obj"); + //console.log(obj); //zNodes=trans_tree(zNodes); zNodes.push(obj); if (obj.typecode != null && obj.typecode != "") { @@ -409,12 +501,9 @@ $.fn.zTree.init($("#ztree"), setting, zNodes); var treeObj = $.fn.zTree.init($("#ztree"), setting, zNodes); treeObj.expandAll(true); - $("#addBtn").hide(); - $("#delBtn").hide(); - $("#saveBtn").hide(); + $("#parentId").treeSelect(checkNodes); var node; - var currId = $("#id").val(); if (currId != "" && currId != null) { //修改选中已选节点 node = treeObj.getNodeByParam("id", currId); @@ -422,18 +511,22 @@ // $("#subTypeDiv").hide(); // $("#allTypeDiv").show(); // $("#addTypeBtn").hide(); - } else { //添加选中父节点 - node = treeObj.getNodeByParam("id", 0); + node = treeObj.getNodeByParam("id", deptNodeId); // $("#addBtn").hide(); // $("#subTypeDiv").show(); // $("#allTypeDiv").hide(); // $("#addTypeBtn").show(); } - currNode = node; - treeObj.selectNode(node, true);//将指定ID的节点选中 - $("#addBtn").hide(); + if(node!=null || node!=""){ + currNode = node; + }else if(currNode==null || currNode==""){ + currNode= treeObj.getNodeByParam("id", currNode.id); + } + treeObj.selectNode(currNode, true);//将指定ID的节点选中 + $("#"+currNode.tId+"_a").click();//触发ztree点击事件 + //$("#addBtn").hide(); spinner.spin(); }, error: function () { @@ -463,89 +556,7 @@ $("#remark").val(""); } - var setting = { - view: { - addHoverDom: false, - removeHoverDom: false, - selectedMulti: false, - autoCancelSelected: false, - fontCss: getFontCss - }, - check: { - enable: false - }, - data: { - simpleData: { - enable: true, - idKey: "id", - pIdKey: "pId", - rootPId: "0" - } - }, - edit: { - enable: false - }, - callback: { - beforeClick: function (treeId, treeNode) { - $("#delBtn").show(); - $("#saveBtn").show(); - $("#allTypeDiv").show(); - currNode = treeNode; - //console.log(treeNode.id); - if (treeNode.id != 0) { - if (treeNode.isParent || treeNode.pid == 0 || treeNode.code == null) { - $("#typecode").removeAttr("readOnly"); - $("#typename").removeAttr("readOnly"); - $("#typecode").val(treeNode.typecode); - $("#typename").val(treeNode.typename); - $("#subTypeDiv").hide(); - //$("#addTypeBtn").show(); - $("#addBtn").show(); - //判断节点是否有叶子节点，有则不可改父级，无则可改动 - var childrenNodes = treeNode.children; - /*if(childrenNodes!= undefined){ - $("#parentDiv").hide(); - }else{ - $("#parentDiv").show(); - }*/ - } else { - $("#typecode").attr("readOnly", "true"); - $("#typename").attr("readOnly", "true"); - var pNode = treeNode.getParentNode(); - $("#typecode").val(pNode.typecode); - $("#typename").val(pNode.typename); - $("#subTypeDiv").show(); - //$("#addTypeBtn").hide(); - $("#addBtn").hide(); - //$("#parentDiv").show(); - } - $("#id").val(treeNode.id); - $("#name").val(treeNode.name); - $("#code").val(treeNode.code); - $("#pyCode").val(treeNode.pyCode); - $("#wbCode").val(treeNode.wbCode); - $("#zipCode").val(treeNode.zipCode); - $("#cComment").val(treeNode.cComment); - $("#flag").val(treeNode.flag); - $("#parentId").val(""); - $("#effective").val(treeNode.effective); - $("#remark").val(treeNode.remark); - - $("#allTypeDiv").show(); - } else { - $("#subTypeDiv").removeAttr("display"); - $("#addBtn").hide(); - $("#delBtn").hide(); - $("#saveBtn").hide(); - $("#allTypeDiv").hide(); - //$("#addTypeBtn").show(); - //$("#parentDiv").hide(); - emptyEntity(1); - } - } - } - }; // function searchNode() { @@ -718,7 +729,9 @@ initTree(); $("#allTypeDiv").hide(); - + $("#addBtn").hide(); + $("#delBtn").hide(); + $("#saveBtn").hide(); // $("#parentDiv").hide(); @@ -747,12 +760,12 @@ $("#delBtn").click(function () { if ($("#id").val() == null || $("#id").val() == "") { - toastr.warning("请选中一个字典节点"); + toastr.warning("请选中一个字典节点!"); return; } var childrenNodes = currNode.children; if (childrenNodes && childrenNodes.length > 0) { - console.log(childrenNodes); + //console.log(childrenNodes); toastr.warning("拥有子节点不可删除!"); return; } @@ -767,11 +780,13 @@ for (var i = 0, l = nodes.length; i < l; i++) { ztree.removeNode(nodes[i]); } - $("#id").val(""); + //$("#id").val(""); //添加选中父节点 - var node = ztree.getNodeByParam("id", 0); - ztree.selectNode(node, true);//将指定ID的节点选中 + currNode = ztree.getNodeByParam("id", deptNodeId); + ztree.selectNode(currNode, true);//将指定ID的节点选中 + $("#allTypeDiv").hide(); + $("#"+currNode.tId+"_a").click();//触发ztree点击事件 toastr.success("删除成功!") } else { toastr.error("删除失败!") @@ -821,6 +836,7 @@ $("#allTypeDiv").show(); $("#subTypeDiv").show(); + $("#delBtn").show(); //判断树选中节点，为父节点部分显示，为叶子节点全部显示 //typecode和code不重复 diff --git a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp index 154dbe01..f5e88bbf 100644 --- a/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/faultTypeDir/faultTypeList.jsp @@ -19,9 +19,13 @@ /*margin-left: 20px;*/ border-width: 0 0 0 1px; border-style: solid; - border-color: #2e6da4; + border-color: #aed0ea; /*background-color: #2e6da4;*/ - height: calc(100vh - 50px); + height: calc(100vh - 0px); + overflow-x: hidden; + overflow-y: auto; + width: 75%; + float: left; } .divCss { @@ -37,12 +41,13 @@ vertical-align: middle; background-color: #2e6da4; color: #fff; - font-size: 19px; + font-size: 18px; font-weight: bold; - height: 30px; + height: 35px; margin-bottom: 10px; margin-top: 0px; - width: 115.5%; + padding-top: 5px; + /*width: 115%;*/ } .treeBtn1 { @@ -75,7 +80,7 @@ #ztree { margin-top: 10px; margin-left: -35px; - height: calc(100vh - 180px); + height: calc(100vh - 150px); overflow: auto; !important; } @@ -83,6 +88,9 @@ #leftCol { background-color: #fff; height: calc(100vh - 20px); + width: 24%; + float: left; + margin-left: 10px; !important; } @@ -96,18 +104,21 @@ #searchBtn { width: 20%; + margin-top: -5px; !important; } + + -
+
 缺陷类别列表
- - + +
@@ -121,84 +132,85 @@
-
+
 缺陷类别信息
-
+
-
-
- -
- + -
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
-
-
- -
- +
+
+ +
+ +
+
-
-
- <%--
+ <%--
-
--%> +
--%> +