瀏覽代碼

已打印分页,login页面修复,其他bug修复

wangxiaoming 7 年之前
父節點
當前提交
6890b82db7

+ 4 - 0
watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/MachineService.java

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
 import com.iamberry.rst.core.pts.Produce;
+import com.iamberry.rst.core.pts.PtsEmployee;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 
@@ -31,6 +32,9 @@ public interface MachineService {
 
     List<PtsMachine> listPrintOrder(PtsMachine ptsMachine);
 
+    //分页查询机器打印列表
+    PagedResult<PtsMachine> getPrintOrderList(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum);
+
     //获取单个机器生产流程日志
     List<PtsMachineLogs> listMachineLogs(Integer machineId);
 

+ 8 - 0
watero-rst-service/src/main/java/com/iamberry/rst/service/pts/MachineServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageHelper;
 import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsEmployee;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.faces.pts.MachineService;
@@ -58,6 +59,13 @@ public class MachineServiceImpl implements MachineService {
     }
 
     @Override
+    public PagedResult<PtsMachine> getPrintOrderList(int pageNO, int pageSize, PtsMachine ptsMachine, boolean isTotalNum){
+        PageHelper.startPage(pageNO, pageSize, isTotalNum);
+        List<PtsMachine> list = machineMapper.listMachine(ptsMachine);
+        return PageUtil.getPage(list);
+    }
+
+    @Override
     public List<PtsMachineLogs> listMachineLogs(Integer machineId) {
         return machineMapper.listMachineLogs(machineId);
     }

+ 28 - 4
watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminMachineController.java

@@ -4,6 +4,7 @@ import com.iamberry.rst.core.order.Order;
 import com.iamberry.rst.core.order.RentType;
 import com.iamberry.rst.core.page.PageRequest;
 import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsEmployee;
 import com.iamberry.rst.core.pts.PtsMachine;
 import com.iamberry.rst.core.pts.PtsMachineLogs;
 import com.iamberry.rst.faces.pts.*;
@@ -126,14 +127,37 @@ public class AdminMachineController {
      */
     @RequiresPermissions("machine:select_all:machine")
     @RequestMapping("/_machine_print_list")
-    public ModelAndView listPrintMachine(PtsMachine ptsMachine){
+    public ModelAndView listPrintMachine(HttpServletRequest request,PtsMachine ptsMachine,
+                                        @RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
+                                         @RequestParam(value = "pageNO", defaultValue = "1",required=false) Integer pageNO,
+                                         @RequestParam(value = "totalNum", defaultValue = "0",required=false) Integer totalNum){
         ModelAndView mv = new ModelAndView("pts/machine/machine_print_List");
-        List<PtsMachine> machineList = machineService.listPrintOrder(ptsMachine);
+        mv.addObject("machineIsPrint",ptsMachine.getMachineIsPrint() == null?"1":ptsMachine.getMachineIsPrint());
+
+        StringBuilder sb = new StringBuilder("/admin/machine/_machine_print_list?pageSize=" + pageSize);
+
+        if(ptsMachine == null ||  ptsMachine.getMachineIsPrint() == null || ptsMachine.getMachineIsPrint() == 1){ //未打印
+            List<PtsMachine> machineList = machineService.listPrintOrder(ptsMachine);
+            mv.addObject("machineList",machineList);
+        }else{  //已打印
+            PagedResult<PtsMachine> pagedResult = machineService.getPrintOrderList(pageNO, pageSize, ptsMachine, totalNum == 0);
+            if(totalNum != 0) {
+                pagedResult.setTotal(totalNum);
+                pagedResult.setPages((int) Math.ceil((double)totalNum/pageSize));
+            }
+            sb.append("&machineIsPrint=");
+            if(ptsMachine.getMachineIsPrint() != null && ptsMachine.getMachineIsPrint() == 2){
+                sb.append(ptsMachine.getMachineIsPrint());
+            }
+            sb.append("&totalNum=");
+            sb.append(totalNum == 0 ? pagedResult.getTotal() : totalNum);
+            sb.append("&pageNO=");
+            mv.addObject("page", pagedResult);
+            mv.addObject("url", sb.toString());
+        }
         //查询最新一条机器id
         Integer machineId = machineService.maxMachineId();
         mv.addObject("machineId",machineId);
-        mv.addObject("machineIsPrint",ptsMachine.getMachineIsPrint() == null?"1":ptsMachine.getMachineIsPrint());
-        mv.addObject("machineList", machineList);
         return mv;
     }
 

+ 5 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -28,9 +28,14 @@
         .acrossTab li.active{color:#fff;}
     </style>
     <title>Watero-RST 1.0</title>
+    <script language="JavaScript" type="text/javascript">
+        /*用于login页面判断是否有父级页面,如果有就强制跳转*/
+        var PARENT_IS_LOGIN = 1;
+    </script>
 </head>
 <body>
 <header class="navbar-wrapper">
+    <input type="hidden" id="parent_is_login" value="1" placeholder="用于判断是否存在父级页面!">
     <div class="navbar navbar-fixed-top">
         <div class="container-fluid cl"> <a class="logo navbar-logo f-l mr-10 hidden-xs" href="#"><img src="${path}/common/images/index/admin-login.png" style="height: 44px"/></a> <a class="logo navbar-logo-m f-l mr-10 visible-xs" href="#">Watero-RST</a>
             <span class="logo navbar-slogan f-l mr-10 hidden-xs">租赁服务跟踪系统v1.0</span>

+ 10 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/login.ftl

@@ -19,8 +19,17 @@
     <script>DD_belatedPNG.fix('*');</script>
     <![endif]-->
     <title>后台登录 - Watero RST</title>
-    <script type="text/javascript">
+    <script language="JavaScript" type="text/javascript">
         var root_path = "${path}";
+
+        /*用于判断是否有父级页面,如果有就强制跳转*/
+        function myfun(){
+            var ifmObj = window.parent.PARENT_IS_LOGIN;
+            if(ifmObj != null && ifmObj != "" && typeof(ifmObj) !="undefined" && ifmObj != undefined && ifmObj == 1){
+                parent.location.href = "${path}/_login";
+            }
+        }
+        window.onload = myfun;
     </script>
 </head>
 <body>

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/device_list.ftl

@@ -88,9 +88,9 @@
                            onclick="edit_detail('${path}/admin/equipment/_update_device?deviceId=${device.deviceId!}');">
                             <i class="Hui-iconfont">&#xe6df;</i>
                         </a>
-                        <a style="text-decoration:none" href="javascript:;" title="查看"
+                        <a style="text-decoration:none" href="javascript:;" title="查看作用工序"
                            onclick="edit_process('${path}/admin/equipment/_update_process?deviceId=${device.deviceId!}');">
-                            <i class="Hui-iconfont">&#xe665;</i>
+                            <i class="Hui-iconfont">&#xe70c;</i>
                         </a>
                     </td>
                 </tr>

+ 35 - 10
watero-rst-web/src/main/webapp/WEB-INF/views/pts/device/update_process.ftl

@@ -56,7 +56,7 @@
         }
 
         .point-blue {
-            background-color: #1c87bf;
+            background-color: #1c87bf !important;
         }
 
         .point-green {
@@ -79,10 +79,12 @@
             width: 90% !important;
             margin: 0 auto;
             border: 1px solid rgba(0,0,0,.1);
-            padding-bottom: 20px;
+
         }
+
         .content article {
             position: relative;
+            padding-bottom: 20px;
         }
         .content article > h3 {
             width: 100%;
@@ -90,12 +92,13 @@
             font-size: 1.4em;
             color: #fff;
             padding: 10px 0 20px;
-            background-color: #32a3d8;
+            background-color: #32a3d8 !important;
             margin: 0 0 10px 0;
         }
         .content article section {
             padding: 10px 0 10px;
             position: relative;
+            background-color: transparent !important;
         }
         .content article section:before {
             content: "";
@@ -115,6 +118,7 @@
             position: absolute;
             text-align: right;
             padding-left: 10px;
+            background-color: transparent !important;
         }
         .content article section time > span {
             display: block;margin-right: 10px;
@@ -123,6 +127,7 @@
             color: #3a3a38;
             margin-left: 55%;
             min-height: 50px;
+            background-color: transparent;
         }
         .content article section aside > span{
             display: block;
@@ -136,12 +141,15 @@
         }
 
         /*设置Select样式*/
-        select{border: 1px solid rgba(0,0,0,.1);padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;margin-right: 10px;width: 85px;}
+        select{border: 1px solid rgba(0,0,0,.1);border-radius: 5px;padding:6px 35px 6px 5px;height: 32px;-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/select-1.png) right center no-repeat !important;background-size:auto 100% !important;margin-right: 10px;width: 85px;}
         .add-title-left{position: absolute;right: 0;top: 15%;}
         .add-title-right{position: absolute;left: 55%;top:33%;}
         .my-btn-edit{padding: 6px 20px;background-color: #fff;color: #32a3d8;border: 1px solid #32a3d8;cursor:pointer;margin: 5px 0 5px 0;}
         .list-main{list-style-type: none;margin: 0;padding: 10px;overflow-x: scroll;white-space: nowrap;}
         .list-main>li{display: table-cell;min-width: 500px;position: relative;width: 500px;margin-right: 20px;}
+        .list-main >li :hover{
+            background: #f0f0f0;
+        }
     </style>
 <#include "/base/list_base.ftl">
 </head>
@@ -149,7 +157,7 @@
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> PST管理
     <span class="c-gray en">&gt;</span> 设备列表
-    <span class="c-gray en">&gt;</span> 查看作用流程岗位
+    <span class="c-gray en">&gt;</span> 作用生产流程
     <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
 </nav>
 <div><input type="hidden" value="${deviceId!}" id="deviceId"></div>
@@ -356,6 +364,8 @@
         </div>
     </li>-->
 </ul>
+
+<div id="produceData"></div>
 <script type="text/javascript">
 
     $(function(){
@@ -399,19 +409,21 @@
                                     var employee_list = this;
                                     employee_option += '<option value="' + employee_list.employeeId + '">' + employee_list.employeeName + '</option>';
                                 });
-                                tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,1)">' + employee_option + '</select>&nbsp;&nbsp;&nbsp;&nbsp;';
+                                tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" preVal=""  onchange="update_process(this,1)">' + employee_option + '</select>&nbsp;&nbsp;&nbsp;&nbsp;';
                             } else {
                                 var employee_option = '';
+                                var preVal = "";
                                 $.each(employeeList, function(n,nobj){
                                     var employee_list = this;
                                     if (employee_list.employeeId == this_process.employeeId) {
+                                        preVal = employee_list.employeeId;
                                         employee_option += '<option value="' + employee_list.employeeId + '" selected>' + employee_list.employeeName + '</option>';
                                     } else {
                                         employee_option += '<option value="' + employee_list.employeeId + '">' + employee_list.employeeName + '</option>';
                                     }
 
                                 });
-                                tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,1)">' + employee_option + '</select>';
+                                tb_user = '<select id="user' + id_num + '" process="' + this_process.processId + '" preVal="'+ preVal +'" onchange="update_process(this,1)">' + employee_option + '</select>';
                             }
                             if (this_process.deviceName == null || this_process.deviceName == undefined) {
                                 var device_option = '<option value="">添加打卡设备</option>';
@@ -419,18 +431,20 @@
                                     var device_list = this;
                                     device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
                                 });
-                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
+                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" preVal="" onchange="update_process(this,2)">' + device_option + '</select>';
                             } else {
                                 var device_option = '';
+                                var preVal = "";
                                 $.each(deviceList, function(n,nobj){
                                     var device_list = this;
                                     if (this_process.driveId == device_list.deviceId) {
+                                        preVal = device_list.deviceId
                                         device_option += '<option value="' + device_list.deviceId + '" selected>' + device_list.deviceName + '</option>';
                                     } else {
                                         device_option += '<option value="' + device_list.deviceId + '">' + device_list.deviceName + '</option>';
                                     }
                                 });
-                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" onchange="update_process(this,2)">' + device_option + '</select>';
+                                tb_device = '<select id="device' + id_num + '" process="' + this_process.processId + '" preVal="'+ preVal +'" onchange="update_process(this,2)">' + device_option + '</select>';
                             }
                             if (j % 2 == 0) {
                                 process += '<section>'
@@ -474,6 +488,12 @@
         });
     });
 
+    $(function () {
+        $(".produceData").change(function(){
+            alert($(this).val());
+        })
+    })
+
     function update_process(obj,num) {
         var processId = obj.getAttribute("process");
         var id = obj.getAttribute("id");
@@ -501,13 +521,18 @@
                         success: function(dt){
                             if (dt.returnCode == 200) {
                                 layer.msg('恭喜您,修改成功!',{icon: 1,time:1000});
+                                var preVal = $(obj).val();
+                                $(obj).attr("preVal",preVal);
                             } else {
                                 layer.msg('对不起,修改失败!',{icon: 5,time:1000});
+                                var preVal = $(obj).attr("preVal");
+                                $(obj).val(preVal);
                             }
                         }
                     })
                 }, function() {
-                    location.reload();
+                    var preVal = $(obj).attr("preVal");
+                    $(obj).val(preVal);
                 }
         );
     }

+ 2 - 2
watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/employee_list.ftl

@@ -85,9 +85,9 @@
                                 <a style="text-decoration:none" href="javascript:void(0);" title="编辑" onclick="admin_update_employee(${employee.employeeId!});">
                                     <i class="Hui-iconfont">&#xe6df;</i>
                                 </a>
-                                <a style="text-decoration:none" href="javascript:;" title="查看"
+                                <a style="text-decoration:none" href="javascript:;" title="查看作用工序"
                                    onclick="edit_process('${path}/admin/equipment/_update_process?deviceId=0');">
-                                    <i class="Hui-iconfont">&#xe665;</i>
+                                    <i class="Hui-iconfont">&#xe70c;</i>
                                 </a>
                             </td>
                         </tr>

+ 15 - 3
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -32,11 +32,11 @@
                             <span id="havePrint" onclick="selectIsPrint(2);" class="returnOrderEtc">已打印</span>
                         </div>
                     </div>
-                <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint"/>
-                    <input  class="my-input" type="text" value="每个二维码打印数量:" readonly="readonly" style="border: 0;margin-top: 8px;margin-right: 0"/>
+                <input class="my-input" type="hidden" id="machineIsPrint" name="machineIsPrint" />
+                <input  class="my-input" type="text" value="每个二维码打印数量:" readonly="readonly" style="border: 0;margin-top: 8px;margin-right: 0"/>
                 <input class="my-input" type="text" id="settingNumber" name="printNumber" value="3" placeholder="打印数量" style="margin-top: 10px;"/>
                 <button type="button" class="my-btn-search" onclick="printList();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">打印</button>
-                    <button id="updatePrintId" type="button" class="my-btn-search" onclick="batchUpdatePring();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">修改为已打印</button>
+                <button id="updatePrintId" type="button" class="my-btn-search" onclick="batchUpdatePring();" style="cursor:pointer; margin-right: 50px;margin-top: 10px;">修改为已打印</button>
 			</form>
 		</div>
 		<div class="mt-2" style="margin: 20px;">
@@ -49,6 +49,11 @@
 				</tr>
 				</thead>
 				<tbody id="listid">
+                    <#if machineIsPrint == 1>
+                        <#assign machineList = machineList />
+                    <#else >
+                        <#assign machineList = page.dataList />
+                    </#if>
 					<#list machineList as list>
 						<tr class="text-c" id="${list.machineBarcode }">
                             <td width="2">
@@ -64,6 +69,13 @@
 					</#list>
 				</tbody>
 			</table>
+
+            <#if machineIsPrint == 2>
+                <tfoot>
+                    <div style="width: 60%;margin: 0 auto;"><#include "/base/page_util.ftl"></div>
+                </tfoot>
+            </#if>
+
 			<input type="hidden" value="${machineId!''}" name="machineId" id="machineId">
             <input type="hidden" value="" name="codeId" id="codeId">
             <div style="position: absolute;top: 80px;height: 23px;display:none;" id="bcTarget" class="barcodeImg"></div>

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

@@ -40,8 +40,8 @@
     <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" id="produceName" type="text" value="" placeholder="请输入产品名称,2-20位中文、英文组合" required   maxlength="20" minlength="2"/> </div>
-            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" id="produceRemake" value="" placeholder="请输入产品描述,2-100位中文、英文组合" required  maxlength="100" minlength="2"/> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" id="produceName" type="text" value="" placeholder="请输入产品名称,2-20位中文、英文、数字组合" required   maxlength="20" minlength="2"/> </div>
+            <div class="input-box"><span class="input-dic">产品描述</span><input class="my-input" type="text" name="produceRemake" id="produceRemake" value="" placeholder="请输入产品描述,2-100位中文、英文、数字组合" required  maxlength="100" minlength="2"/> </div>
             <div class="input-box"><span class="input-dic">产品类型</span>
                 <label><input type="radio" name="produceType" value="1" checked>净水机</label>
                 <label><input type="radio" name="produceType" value="2">冲奶机</label>
@@ -64,7 +64,7 @@
                         <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="请输入节点名称,2-20位中文、英文组合" required   maxlength="20" minlength="2"/> </div>
+                    <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位中文、英文、数字组合" required   maxlength="20" minlength="2"/> </div>
                     <div class="input-box"><span class="input-dic">节点操作</span>
                         <ul class="add-list oneTheNode" >
                             <li class="nodeList">
@@ -220,7 +220,7 @@
                 + '<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="请输入节点名称,2-20位中文、英文组合"  required   maxlength="20"/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位中文、英文、数字组合"  required   maxlength="20"/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'

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

@@ -38,8 +38,8 @@
         <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="请输入产品名称,2-20位中文、英文组合" 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="请输入产品描述,2-100位中文、英文组合" maxlength="100"  required /> </div>
+            <div class="input-box"><span class="input-dic">产品名称</span><input class="my-input" name="produceName" type="text" value="${produce.produceName!}" placeholder="请输入产品名称,2-20位中文、英文、数字组合" 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="请输入产品描述,2-100位中文、英文、数字组合" maxlength="100"  required /> </div>
             <div class="input-box"><span class="input-dic">产品类型</span>
                 <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>
@@ -62,7 +62,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="请输入节点名称,2-20位中文、英文组合" maxlength="20" required/> </div>
+                        <div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="${process.processName!}" placeholder="请输入节点名称,2-20位中文、英文、数字组合" maxlength="20" required/> </div>
                         <div class="input-box"><span class="input-dic">节点操作</span>
                             <ul class="add-list oneTheNode" >
                                 <#list process.nodes as nodes>
@@ -243,7 +243,7 @@
                 + '<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="请输入节点名称,2-20位中文、英文组合" maxlength="20"  required/> </div>'
+                + '<div class="input-box"><span class="input-dic">节点名称</span><input class="my-input" name="processName" type="text" value="" placeholder="请输入节点名称,2-20位中文、英文、数字组合" maxlength="20"  required/> </div>'
                 + '<div class="input-box"><span class="input-dic">节点操作</span>'
                 + '<ul class="add-list oneTheNode">'
                 + '<li class="nodeList">'