产品校验修改

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

@@ -25,6 +25,9 @@
             <if test="employeeNo !=null and employeeNo !=''">
                 and employee_no = #{employeeNo}
             </if>
+            <if test="employeeState !=null">
+                and employee_state = #{employeeState}
+            </if>
         </where>
     </select>
 

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

@@ -41,6 +41,7 @@ public class PtsEmployeeAppController {
         }
         PtsEmployee ptsEmployee = new PtsEmployee();
         ptsEmployee.setEmployeeNo(employeeNo);
+        ptsEmployee.setEmployeeState(1);
         ptsEmployee = ptsEmployeeService.getPtsEmployee(ptsEmployee); //查询员工信息
         if (ptsEmployee == null) {
             rsj.setResultCode(500);

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

@@ -71,7 +71,7 @@
                                 <#--<select class="my-select"><option>1</option></select>-->
                                 <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-20位中文、英文组合" required minlength="2"   maxlength="20" />
+                                <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>
@@ -96,27 +96,28 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
-    var check_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+    var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;\\[\\]，。！；：“”\\"]+$/;
+    var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
 
     $(function(){
         //var validator = $("#form-admin-addProduce").validate();
         $("#form-admin-addProduce").submit(function(){
 
             var produceName = $("#produceName").val();
-            if(!(check_name.test(produceName))){
+            if(!(cnen_name.test(produceName))){
                 layer.msg('产品名称输入格式不正确', {icon: 5, time: 1000});
                 return false;
             }
 
             var produceRemake = $("#produceRemake").val();
-            if(!(check_name.test(produceRemake))){
+            if(!(cnen_name.test(produceRemake))){
                 layer.msg('产品描述输入格式不正确', {icon: 5, time: 1000});
                 return false;
             }
 
             var flag = true;
             $("input[name='processName']").each(function () {
-                if( !(check_name.test($(this).val())) ){
+                if( !(cnen_name.test($(this).val())) ){
                     layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
                     flag = false;
                 }
@@ -201,7 +202,7 @@
                 //+'<select class="my-select"><option>1</option></select>&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-20位中文、英文组合"   required  minlength="2"  maxlength="20"/>&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);
@@ -226,7 +227,7 @@
                 //  + '<select class="my-select"><option>1</option></select>&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-20位中文、英文组合"  required  minlength="2"  maxlength="20"/>&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>'

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

@@ -71,7 +71,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-20位中文、英文组合" maxlength="20" minlength="2"  required/>
+                                        <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>
@@ -99,7 +99,8 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
-    var check_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+    var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;\\[\\]，。！；：“”\\"]+$/;
+    var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
 
     var delProcessIds="",delNodeIds="";
     $(function(){
@@ -107,20 +108,20 @@
         $("#form-admin-addProduce").submit(function(){
 
             var produceName = $("#produceName").val();
-            if(!(check_name.test(produceName))){
+            if(!(cnen_name.test(produceName))){
                 layer.msg('产品名称输入格式不正确', {icon: 5, time: 1000});
                 return false;
             }
 
             var produceRemake = $("#produceRemake").val();
-            if(!(check_name.test(produceRemake))){
+            if(!(cnen_name.test(produceRemake))){
                 layer.msg('产品描述输入格式不正确', {icon: 5, time: 1000});
                 return false;
             }
 
             var flag = true;
             $("input[name='processName']").each(function () {
-                if( !(check_name.test($(this).val())) ){
+                if( !(cnen_name.test($(this).val())) ){
                     layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
                     flag = false;
                 }
@@ -225,7 +226,7 @@
                 //+'<select class="my-select"><option>1</option></select>&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-20位中文、英文组合" maxlength="20" minlength="2"  required/>&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);
@@ -250,7 +251,7 @@
                 //  + '<select class="my-select"><option>1</option></select>&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-20位中文、英文组合" maxlength="20" minlength="2"  required/>&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>'