产品页面验证，员工页面验证

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/PtsEmployeeService.java

@@ -47,4 +47,12 @@ public interface PtsEmployeeService {
      * @return
      */
     Integer updateEmployee(PtsEmployee employee);
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    PtsEmployee getEmployeeByEmployeeNo(String employeeNo);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsEmployeeServiceImpl.java

@@ -63,4 +63,13 @@ public class PtsEmployeeServiceImpl implements PtsEmployeeService {
         Integer flag = ptsEmployeeMapper.updateEmployee(employee);
         return flag;
     }
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    public PtsEmployee getEmployeeByEmployeeNo(String employeeNo){
+        return ptsEmployeeMapper.getEmployeeByEmployeeNo(employeeNo);
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/PtsEmployeeMapper.java

@@ -46,4 +46,12 @@ public interface PtsEmployeeMapper {
      * @return
      */
     Integer updateEmployee(PtsEmployee employee);
+
+    /**
+     * 查询员工
+     * @param employeeNo
+     * @return
+     */
+    PtsEmployee getEmployeeByEmployeeNo(String employeeNo);
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -6,6 +6,7 @@
         SELECT
             tb_rst_pts_produce.produce_id AS produceId,
             tb_rst_pts_produce.produce_no AS produceNo,
+             tb_rst_pts_produce.produce_type AS produceType,
             tb_rst_pts_produce.produce_name AS produceName,
             tb_rst_pts_produce.produce_status AS  produceStatus,
             tb_rst_pts_produce.produce_remake AS produceRemake,
@@ -108,6 +109,7 @@
         SELECT
         tb_rst_pts_produce.produce_id AS produceId,
         tb_rst_pts_produce.produce_no AS produceNo,
+        tb_rst_pts_produce.produce_type AS produceType,
         tb_rst_pts_produce.produce_name AS produceName,
         tb_rst_pts_produce.produce_status AS  produceStatus,
         tb_rst_pts_produce.produce_remake AS produceRemake,
@@ -191,6 +193,9 @@
             <if test="produceNo !=null and produceNo !=''">
                 produce_no = #{produceNo},
             </if>
+            <if test="produceType !=null and produceType !=''">
+                produce_type = #{produceType},
+            </if>
             <if test="produceName !=null and produceName !=''">
                 produce_name = #{produceName},
             </if>
@@ -276,7 +281,8 @@
     <select id="getProduceByPro" parameterType="Produce" resultType="Produce">
         SELECT
             produce_id AS produceId,
-            produce_no AS  produce_no,
+            produce_no AS  produceNo,
+            produce_type AS  produceType,
             produce_name AS produceName,
             produce_status AS  produceStatus,
             produce_remake AS produceRemake,

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ptsEmployeeMapper.xml

@@ -124,4 +124,23 @@
             employee_id = #{employeeId}
     </update>
 
+    <select id="getEmployeeByEmployeeNo" parameterType="String" resultType="PtsEmployee">
+        SELECT
+        employee_id AS employeeId,
+        employee_no AS employeeNo,
+        employee_name AS employeeName,
+        employee_tel AS  employeeTel,
+        employee_state AS  employeeState,
+        employee_entry_date AS  employeeEntryDate,
+        employee_departure_date AS employeeDepartureDate ,
+        employee_post AS  employeePost,
+        employee_desc AS  employeeDesc,
+        employee_clear_power AS  employeeClearPower,
+        employee_create_time AS  employeeCreateTime,
+        employee_update_time AS  employeeUpdateTime
+        FROM
+         tb_rst_pts_employee
+        WHERE
+         employee_no = #{employeeNo}
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminPtsEmployeeController.java

@@ -74,6 +74,27 @@ public class AdminPtsEmployeeController {
     }
 
     /**
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/is_employee")
+    public ResponseJson getEmployee(HttpServletRequest request){
+        String employeeNo = request.getParameter("employeeNo");
+        if(employeeNo == null  || "".equals(employeeNo)){
+            return new ResponseJson(500, "员工编号为空", 501);
+        }
+        PtsEmployee ptsEmployee = ptsEmployeeService.getEmployeeByEmployeeNo(employeeNo);
+        if (ptsEmployee != null ){
+            return new ResponseJson(200, "SUCCESS", 200);
+        }else {
+            return new ResponseJson(500, "员工不存在", 502);
+        }
+    }
+
+
+    /**
      * 跳转到添加员工页面
      *
      * @return

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -30,10 +30,10 @@
     <form class="form form-horizontal" id="form-admin-addProduce">
         <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
             <div class="my-title">产品信息</div>
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="" placeholder="请输入产品名称" required   maxlength="20" /> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="" placeholder="请输入产品描述" required  maxlength="100"/> </div>
             <div class="input-box"><span class="input-dic">产品类型</span>
-                <label><input type="radio" name="produceType" value="1">净水机</label>
+                <label><input type="radio" name="produceType" value="1" checked>净水机</label>
                 <label><input type="radio" name="produceType" value="2">冲奶机</label>
             </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
@@ -43,18 +43,18 @@
                 <li id="1" class="processList">
                     <input type="hidden" class="processNumber" value="1">
                     <div class="input-box"><span class="input-dic process-type">节点类型</span>
-                        <label class=""><input type="radio" name="processType_p1" value="1">生产工序</label>
+                        <label><input type="radio" name="processType_p1" value="1" checked>生产工序</label>
                         <label><input type="radio" name="processType_p1" value="2">修理工序</label>
                         <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
                     </div>
-                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>
+                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称" required   maxlength="20"/> </div>
                     <div class="input-box"><span class="input-dic">节点操作</span>
                         <ul class="add-list oneTheNode" >
                             <li class="nodeList">
                                 <#--<select class="my-select"><option>1</option></select>-->
-                                <label><input type="radio" name="nodeStatus_p1_n1" value="1">正常</label>
+                                <label><input type="radio" name="nodeStatus_p1_n1" value="1" checked>正常</label>
                                 <label><input type="radio" name="nodeStatus_p1_n1" value="0">异常</label>
-                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>
+                                <input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文" required minlength="2"   maxlength="20" />
                                 <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                             </li>
                             <li>
@@ -79,23 +79,34 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
-    //动态显示隐藏所属菜单
-    $(document).on('click', '.menuSubid input[type=radio]', function() {
-        isSelectShow($(this).val())
-    })
-
-    $(function(){
+/*
+   $(function(){
         $("#form-admin-addProduce").validate({
             rules:{
-                subName:{
+                produceName1:{
                     required:true,
-                    minlength:4,
-                    maxlength:30
+                    minlength:2,
+                    maxlength:20
                 }
             },
-            onkeyup:false,
+            messages: {
+                produceName1: {
+                    required: "*必填！",
+                    rangelength: "*长度为2到20位！",
+                }
+            },
+            //是否在获取焦点时验证
+            //onfocusout:false,
+            //是否在敲击键盘时验证
+            //onkeyup:false,
+            //提交表单后，（第一个）未通过验证的表单获得焦点
+            focusInvalid:true,
+            //当未通过验证的元素获得焦点时，移除错误提示
             focusCleanup:true,
-            success:"valid",
+
+//            onkeyup:false,
+//            focusCleanup:true,
+//            success:"valid",
             submitHandler:function(form){
                 $.post(root_path + "/admin/produce/save_produce", formatJSON(),function(result){
                     if (result.returnCode != 200 || result.returnCode != 200) {
@@ -103,13 +114,40 @@
                     } else {
                         layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
                             // 关闭当前页面，并刷新父级页面
-                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                            window.location.href= '${path}/admin/produce/_produce_list';
                         });
                     }
                 });
             }
         });
-    });
+    });*/
+
+
+    $(function(){
+        //var validator = $("#form-admin-addProduce").validate();
+        $("#form-admin-addProduce").submit(function(){
+            ajaxReq();
+        })
+    })
+
+    function ajaxReq(){
+        var data = formatJSON();
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: data,
+            url: "${path}/admin/produce/save_produce",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    window.location.href = '${path}/admin/produce/_produce_list'
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
 
     /*将表单format为JSON*/
     function formatJSON() {
@@ -153,9 +191,9 @@
         var nodeNumber = $(node).parents(".oneTheNode").find(".nodeList").length + 1;       //因为是新加的节点操作所以 +1
         var nodeHtml = '<li class="nodeList">'
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
-                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
+                +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1" checked>正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文"   required  minlength="2"  maxlength="20"/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -169,18 +207,18 @@
         var processNumber = $(".onrTheProcess").find(".processList").length + 1;  //因为是新加的工序节点所以 +1
         var processHtml = '<li id="'+ processNumber +'"  class="processList"><input type="hidden" class="processNumber" value="'+ processNumber +'">'
                 + '<div class="input-box"><span class="input-dic">节点类型</span>'
-                + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1">生产工序</label>'
+                + '<label><input type="radio" name="processType_p'+ processNumber +'" value="1" checked>生产工序</label>'
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
                 + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"  required   maxlength="20"/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
-                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
+                + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1" checked>正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-20位中文"  required  minlength="2"  maxlength="20"/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
                 + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
@@ -230,11 +268,11 @@
     });
 
     //确认提交事件，获取每个li的id
-    $(document).on('click', '.my-btn-submit', function() {
-        $("#sortable>li").each(function(){
-            console.log($(this).attr("id"));
-        });
-    });
+//    $(document).on('click', '.my-btn-submit', function() {
+//        $("#sortable>li").each(function(){
+//            console.log($(this).attr("id"));
+//        });
+//    });
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -31,11 +31,11 @@
         <div style="padding: 10px;width: 600px;margin: 0 auto;" class="">
             <div class="my-title">产品信息</div>
             <input type="hidden" name="produceId" value="${produce.produceId!}">
-            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="${produce.produceName!}" placeholder="请输入产品名称"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="${produce.produceRemake!}" placeholder="请输入产品描述"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="${produce.produceName!}" placeholder="请输入产品名称" maxlength="20"  required /> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" value="${produce.produceRemake!}" placeholder="请输入产品描述" maxlength="100"  required /> </div>
             <div class="input-box"><span class="input-dic">产品类型</span>
-                <label><input type="radio" name="produceType" value="1" <#if nodes.nodeStatus == 1>checked</#if>>净水机</label>
-                <label><input type="radio" name="produceType" value="2" <#if nodes.nodeStatus == 2>checked</#if>>冲奶机</label>
+                <label><input type="radio" name="produceType" value="1" <#if produce.produceType == 1>checked</#if>>净水机</label>
+                <label><input type="radio" name="produceType" value="2" <#if produce.produceType == 2>checked</#if>>冲奶机</label>
             </div>
             <div style="background-color:rgba(0,0,0,.1);height: 1px;margin: 15px 0;"></div>
             <div class="my-title">节点信息</div>
@@ -51,7 +51,7 @@
                             <label><input type="radio" name="processType_p${process_index + 1}" value="2" <#if process.processType == 2>checked</#if>>修理工序</label>
                             <button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>
                         </div>
-                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称"/> </div>
+                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称" maxlength="20" required/> </div>
                         <div class="input-box"><span class="input-dic">节点操作</span>
                             <ul class="add-list oneTheNode" >
                                 <#list process.nodes as nodes>
@@ -60,7 +60,7 @@
                                         <#--<select class="my-select"><option>1</option></select>-->
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="1" <#if nodes.nodeStatus == 1>checked</#if>>正常</label>
                                         <label><input type="radio" name="nodeStatus_p${process_index + 1}_n${nodes_index + 1}" value="0" <#if nodes.nodeStatus == 0>checked</#if>>异常</label>
-                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>
+                                        <input class="my-input" name="nodeDes" type="text" value="${nodes.nodeDes!}" placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>
                                         <i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>
                                     </li>
                                 </#list>
@@ -91,11 +91,11 @@
     var delProcessIds="",delNodeIds="";
 
     //动态显示隐藏所属菜单
-    $(document).on('click', '.menuSubid input[type=radio]', function() {
-        isSelectShow($(this).val())
-    })
+//    $(document).on('click', '.menuSubid input[type=radio]', function() {
+//        isSelectShow($(this).val())
+//    })
 
-    $(function(){
+ /*   $(function(){
         $("#form-admin-addProduce").validate({
             rules:{
                 subName:{
@@ -114,13 +114,45 @@
                     } else {
                         layer.msg('录入成功!!',{icon: 1,time:2000}, function () {
                             // 关闭当前页面，并刷新父级页面
-                            window.location.href= '${path}/admin/produce/list_produce?detaId='+result.resultMsg;
+                            window.location.href= '${path}/admin/produce/_produce_list';
                         });
                     }
                 });
             }
         });
-    });
+    });*/
+
+
+
+    $(function(){
+        //var validator = $("#signupForm").validate();
+        $("#form-admin-addProduce").submit(function(){
+            ajaxReq();
+        })
+//        jQuery.validator.addMethod("processName", function(value, element) {
+//               var mobile = /[^\w\u4e00-\u9fa5]/;
+//               return this.optional(element) || (mobile.test(value));
+//            }, "请正确填写您的手机号码");
+    })
+
+    function ajaxReq(){
+        var data = formatJSON();
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: data,
+            url: "${path}/admin/produce/update_produce",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    window.location.href = '${path}/admin/produce/_produce_list'
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+
+            }
+        });
+    }
 
     /*将表单format转为JSON*/
     function formatJSON() {
@@ -185,7 +217,7 @@
                 //+'<select class="my-select"><option>1</option></select>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="1">正常</label>&nbsp;'
                 +'<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n'+ nodeNumber +'" value="0">异常</label>&nbsp;'
-                +'<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                +'<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>&nbsp;'
                 +'<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 +'</li>';
         $(node).parent().before(nodeHtml);
@@ -203,14 +235,14 @@
                 + '<label><input type="radio" name="processType_p'+ processNumber +'" value="2">修理工序</label>'
                 + '<button type="button" class="my-btn-edit" onclick="delProcess(this)">删除节点</button>'
                 + '</div>'
-                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称" maxlength="20"  required/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'
                 //  + '<select class="my-select"><option>1</option></select>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="1">正常</label>&nbsp;'
                 + '<label><input type="radio" name="nodeStatus_p'+ processNumber +'_n1" value="0">异常</label>&nbsp;'
-                + '<input class="my-input" name="nodeDes" type="text" value="" placeholder="请输入节点操作描述，2-10位中文" maxlength="10"/>&nbsp;'
+                + '<input class="my-input" name="nodeDes" type="text" value=""  placeholder="请输入节点操作描述，2-20位中文" maxlength="20" minlength="2"  required/>&nbsp;'
                 + '<i class="Hui-iconfont" onclick="delNode(this)">&#xe60b;</i>'
                 + '</li>'
                 + '<li><button type="button" class="my-btn-edit" onclick="addProNode(this)">增加节点操作</button></li>'
@@ -267,11 +299,11 @@
 
     });
 
-    //确认提交事件，获取每个li的id
-    $(document).on('click', '.my-btn-submit', function() {
-        $("#sortable>li").each(function(){
-            console.log($(this).attr("id"));
-        });
+//    //确认提交事件，获取每个li的id
+//    $(document).on('click', '.my-btn-submit', function() {
+//        $("#sortable>li").each(function(){
+//            console.log($(this).attr("id"));
+//        });
     });
 </script>
 </body>