科室列表功能开发完成

src/main/java/cn/hnthyy/thmz/controller/UnitCodeController.java

@@ -163,19 +163,26 @@ public class UnitCodeController {
         User tokenUser=(User)JsonUtil.jsontoObject(decodedJWT.getSubject(),User.class);
         zdUnitCode.setOpDate(new Date());
         zdUnitCode.setOpId(tokenUser.getUserCode());
-        if(StringUtils.isBlank(zdUnitCode.getOriginalCode())){
-            //新增部门记录
-            zdUnitCode.setDelFlag(YesNoEnum.NO.code);
-            zdUnitCodeService.saveZdUnitCode(zdUnitCode);
-            resultMap.put("code", 0);
-            resultMap.put("message", "保存科室成功");
-            return resultMap;
-        }
-        //修改部门记录
-        zdUnitCodeService.modifyZdUnitCode(zdUnitCode);
-        resultMap.put("code", 0);
-        resultMap.put("message", "保存科室成功");
-        return resultMap;
+       try {
+           if(StringUtils.isBlank(zdUnitCode.getOriginalCode())){
+               //新增部门记录
+               zdUnitCode.setDelFlag(YesNoEnum.NO.code);
+               zdUnitCodeService.saveZdUnitCode(zdUnitCode);
+               resultMap.put("code", 0);
+               resultMap.put("message", "保存科室成功");
+               return resultMap;
+           }
+           //修改部门记录
+           zdUnitCodeService.modifyZdUnitCode(zdUnitCode);
+           resultMap.put("code", 0);
+           resultMap.put("message", "保存科室成功");
+           return resultMap;
+       }catch (Exception e){
+           resultMap.put("code", -1);
+           resultMap.put("message", "保存科室失败,错误信息：【"+e.getMessage()+"】");
+           log.error("保存科室失败,错误信息：[]",e.getMessage());
+           return resultMap;
+       }
     }
 
     /**

src/main/resources/static/js/unit_code.js

@@ -161,11 +161,14 @@ var TableInit = function () {
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
-                    return [
-                        '<button type="button" class="RoleOfdelete btn btn-primary  btn-sm" onclick="deleteUnitCode(\'' + row.code + '\',\''+row.name+'\')">停用</button>',
-
-                        '<button type="button" class="RoleOfedit btn btn-default  btn-sm" onclick="editUnitCode(\'' + row.code + '\')">编辑</button>'
-                    ].join('');
+                    var str;
+                    if(row.delFlag==1){
+                        str='<button type="button" class="btn btn-success  btn-sm" onclick="updateDeleteUnitCode(\'' + row.code + '\',\''+row.name+'\',\''+row.delFlag+'\')">启用</button>';
+                    }else {
+                        str= '<button type="button" class="btn btn-primary  btn-sm" onclick="updateDeleteUnitCode(\'' + row.code + '\',\''+row.name+'\',\''+row.delFlag+'\')">停用</button>';
+                    }
+                    str+=',<button type="button" class="btn btn-default  btn-sm" onclick="editUnitCode(\'' + row.code + '\')">编辑</button>';
+                    return [str].join('');
                 }
             }],
 
@@ -345,6 +348,7 @@ function editUnitCode(code) {
         initParentCodePlus();
     }
     $("div.bs-example-modal-lg").modal();
+    $("#myModalLabel").text("编辑科室");
     fillModel(code);
 }
 
@@ -352,9 +356,14 @@ function editUnitCode(code) {
  * 删除记录 （停用）
  * @param code
  */
-function deleteUnitCode(code,name) {
-    $("#deleteCode").val(code);// 将模态框中需要删除的大修的ID设为需要删除的
-    $("#deleteMessage").html("您确认要删除【"+name+"】科室吗？");
+function updateDeleteUnitCode(code,name,delFlag) {
+    $("#deleteCode").val(code);// 将模态框中需要修改删除的科室的ID设为需要删除的
+    $("#dataDelFlag").val(delFlag);// 将模态框中需要删除的科室的停用状态设置成当前状态
+    if(delFlag==1){
+        $("#deleteMessage").html("您确认要启用【"+name+"】科室吗？");
+    }else {
+        $("#deleteMessage").html("您确认要停用【"+name+"】科室吗？");
+    }
     $("#deleteConfirmModel").modal({
         backdrop : 'static',
         keyboard : false
@@ -367,12 +376,19 @@ function deleteUnitCode(code,name) {
  * 停用科室操作提交
  */
 function deleteSubmit() {
+   var delFlag=$("#dataDelFlag").val();
+   var newDelFlag=1;
+    var text= "科室停用成功";
+   if(delFlag==1){
+       newDelFlag=0;
+       text= "科室启用成功";
+   }
     $.ajax({
         type: "POST",
         url: '/thmz/saveUnitCode',
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
-        data: JSON.stringify({"originalCode": $("#deleteCode").val(),"delFlag": 1}),
+        data: JSON.stringify({"originalCode": $("#deleteCode").val(),"delFlag": newDelFlag}),
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
         success: function (res) {
             if (res == '401' || res == 401) {
@@ -382,7 +398,7 @@ function deleteSubmit() {
             if (res.code == 0) {
                 new PNotify({
                     title: '操作成功',
-                    text: "科室停用成功",
+                    text: text,
                     type: 'success',
                     styling: 'bootstrap3'
                 });
@@ -501,10 +517,15 @@ $(function () {
         if($('#parentCodePlus').find("option").length==1){
             initParentCodePlus();
         }
+        $("#myModalLabel").text("新增科室");
         $("div.bs-example-modal-lg").modal();
     });
 
     $("#saveUnitCode").on("click", function (t) {
+        var validatorResult = validator.checkAll($("#formPlus"));
+        if(!validatorResult){
+            return;
+        }
         var params = {
             "code": $("#codePlus").val(),
             "name": $("#namePlus").val(),

src/main/resources/static/js/validator.js

@@ -96,7 +96,11 @@ var validator = (function($){
                 }
                 return true;
             }
-            if( !skip && lengthRange && a.length < lengthRange[0] ){
+            // if( !skip && lengthRange && a.length < lengthRange[0] ){
+            //     alertTxt = message.min;
+            //     return false;
+            // }
+            if(lengthRange && a.length < lengthRange[0] ){
                 alertTxt = message.min;
                 return false;
             }

src/main/resources/templates/menu.html

@@ -90,7 +90,7 @@
                                     <li><a href="calendar.html">Calendar</a></li>
                                 </ul>
                             </li>
-                            <li><a><i class="fa fa-table"></i> Tables <span class="fa fa-chevron-down"></span></a>
+                            <li><a><i class="fa fa-table"></i> 列表管理 <span class="fa fa-chevron-down"></span></a>
                                 <ul class="nav child_menu">
                                     <li><a href="#" onclick="changeContent('/thmz/unit-code')">科室列表</a></li>
                                     <li><a href="tables_dynamic.html">Table Dynamic</a></li>

src/main/resources/templates/unit_code.html

@@ -62,54 +62,54 @@
                         <h4 class="modal-title" id="myModalLabel">新增科室</h4>
                     </div>
                     <div class="modal-body">
-                        <form class="form-horizontal form-label-left" novalidate>
+                        <form class="form-horizontal form-label-left" novalidate id="formPlus">
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="codePlus">科室编码 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input id="codePlus" class="form-control col-md-7 col-xs-12" data-validate-length-range="4" required="required" type="text">
+                                    <input id="codePlus" class="form-control col-md-7 col-xs-12" data-validate-length-range="4,7" required="required" type="text">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="namePlus">科室名称 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="namePlus" class="form-control col-md-7 col-xs-12" required="required">
+                                    <input type="text" id="namePlus" class="form-control col-md-7 col-xs-12" data-validate-length-range="2,16" required="required">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="pyCodePlus">拼音码 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="pyCodePlus" required="required" data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                                    <input type="text" id="pyCodePlus" required="required" data-validate-length-range="1,8" class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="wbCodePlus">五笔码 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="wbCodePlus" required="required" data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                                    <input type="text" id="wbCodePlus" required="required" data-validate-length-range="1,8" class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="xnhDeptCodePlus">新农合科室编码 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="xnhDeptCodePlus" required="required"  data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                                    <input type="text" id="xnhDeptCodePlus" required="required"  data-validate-length-range="1,20" class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="xnhDeptNamePlus">新农合科室名称 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="xnhDeptNamePlus" required="required" data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                                    <input type="text" id="xnhDeptNamePlus" required="required" data-validate-length-range="1,25" class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
                             <div class="item form-group">
                                 <label class="control-label col-md-3 col-sm-3 col-xs-12" for="officePosPlus">就诊地点 <span class="required">*</span>
                                 </label>
                                 <div class="col-md-6 col-sm-6 col-xs-12">
-                                    <input type="text" id="officePosPlus" required="required" data-validate-length-range="8,20" class="form-control col-md-7 col-xs-12">
+                                    <input type="text" id="officePosPlus" required="required" data-validate-length-range="1,20" class="form-control col-md-7 col-xs-12">
                                 </div>
                             </div>
                             <div class="item form-group" id="emailDiv">
@@ -193,6 +193,7 @@
                         <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
                         <a onclick="deleteSubmit()" class="btn btn-success" data-dismiss="modal">确定</a>
                         <input type="hidden" id="deleteCode"/>
+                        <input type="hidden" id="dataDelFlag"/>
                     </div>
                 </div><!-- /.modal-content -->
             </div><!-- /.modal-dialog -->