产品/员工/设备/机器样式调整

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

@@ -136,7 +136,7 @@
         }
 
         /*设置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;}
+        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;}
         .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;}
@@ -154,7 +154,7 @@
 </nav>
 <div><input type="hidden" value="${deviceId!}" id="deviceId"></div>
 <ul class="list-main">
-    <#--<li>
+<#--<li>
         <div class="content">
             <article>
                 <h3>净水机</h3>
@@ -480,35 +480,35 @@
         var value = $('#' + id + ' option:selected').val();
         var data = null;
         layer.confirm('确认要修改吗？',function(index){
-            //num=1则是修改员工信息，num=2则是修改设备信息
-            if (num == 1) {
-                data = {
-                    processId: processId,
-                    employeeId: value
-                }
-            } else if(num == 2) {
-                data = {
-                    processId: processId,
-                    driveId: value
-                }
-            }
-            $.ajax({
-                cache: true,
-                type: "POST",
-                data: data,
-                url: "${path}/admin/equipment/update_process_info",
-                async: false,
-                success: function(dt){
-                    if (dt.returnCode == 200) {
-                        layer.msg('恭喜您，修改成功!',{icon: 1,time:1000});
-                    } else {
-                        layer.msg('对不起，修改失败!',{icon: 5,time:1000});
+                    //num=1则是修改员工信息，num=2则是修改设备信息
+                    if (num == 1) {
+                        data = {
+                            processId: processId,
+                            employeeId: value
+                        }
+                    } else if(num == 2) {
+                        data = {
+                            processId: processId,
+                            driveId: value
+                        }
                     }
+                    $.ajax({
+                        cache: true,
+                        type: "POST",
+                        data: data,
+                        url: "${path}/admin/equipment/update_process_info",
+                        async: false,
+                        success: function(dt){
+                            if (dt.returnCode == 200) {
+                                layer.msg('恭喜您，修改成功!',{icon: 1,time:1000});
+                            } else {
+                                layer.msg('对不起，修改失败!',{icon: 5,time:1000});
+                            }
+                        }
+                    })
+                }, function() {
+                    location.reload();
                 }
-            })
-        }, function() {
-            location.reload();
-        }
         );
     }
 </script>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/save_employee.ftl

@@ -50,7 +50,7 @@
 
             <div class="input-box"><span class="input-dic">入职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeEntryDate" id="employeeEntryDate" value="" placeholder="请选择入职日期" onclick="WdatePicker({skin:'whyGreen'})"  readonly="readonly" /> </div>
             <div class="input-box" id="isDeparture"><span class="input-dic">离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" id="employeeDepartureDate" value="" placeholder="请选择离职日期"  onclick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen',minDate:'#F{$dp.$D(\'employeeEntryDate\')||\'%y-%M-%d\'}' })"  readonly="readonly"/></div>
-            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" id="employeePost" value="" placeholder="请输入2-20位中文、英文字符描述" required   maxlength="20"  /> </div>
+            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" id="employeePost" value="" placeholder="请输入2-20位中文、英文字符描述" required   maxlength="20"  minlength="2" /> </div>
 
             <div style="clear: both;"></div>
             <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
@@ -71,8 +71,9 @@
     var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
     var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
     var china_name = /^[\u4e00-\u9fa5]+$/;
+    var en_name = /^[a-zA-Z0-9]+$/;
 
-    $(function(){
+            $(function(){
         //var validator = $("#form-admin-addEmployee").validate();
         $("#form-admin-addEmployee").submit(function(){
             if(!ptsValiDataEmNo()){
@@ -104,7 +105,7 @@
                 var employeeEntryDate = $("[name='employeeEntryDate']").val();
                 var employeeDepartureDate = $("[name='employeeDepartureDate']").val();
                 if(!CompareDate(employeeDepartureDate,employeeEntryDate)){
-                    layer.msg('离职日期不能再入职日期之前', {icon: 5, time: 1000});
+                    layer.msg('离职日期不能在入职日期之前', {icon: 5, time: 1000});
                     return false;
                 }
             }
@@ -177,7 +178,7 @@
             return false;
         }
 
-        if(!(check_name.test(thVal))){
+        if(!(en_name.test(thVal))){
             layer.msg('员工编码格式不正确', {icon: 5, time: 1000});
             return false;
         }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/employee/update_employee.ftl

@@ -39,7 +39,7 @@
             <input type="hidden" name="employeeId" value="${employee.employeeId!}">
             <input type="hidden" id="oldNo" value="${employee.employeeNo!}" >
             <div class="input-box"><span class="input-dic">员工编号</span>&nbsp;&nbsp;<input class="my-input" name="employeeNo" id="employeeNo" type="text" value="${employee.employeeNo!}" placeholder="请输入员工编号" required   maxlength="10" /> </div>
-            <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName"  id="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入2-10位中文" required   maxlength="20" /> </div>
+            <div class="input-box"><span class="input-dic">员工姓名</span>&nbsp;&nbsp;<input class="my-input" name="employeeName"  id="employeeName" type="text" value="${employee.employeeName!}" placeholder="请输入2-10位中文" required   maxlength="10" minlength="2" /> </div>
             <div class="input-box"><span class="input-dic">手机号码</span>&nbsp;&nbsp;<input class="my-input" name="employeeTel" id="employeeTel" type="text" value="${employee.employeeTel!}" placeholder="请输入11位的手机号码" required   maxlength="11" minlength="11" /> </div>
             <div class="input-box"><span class="input-dic" style="margin-top: 0">员工状态</span>&nbsp;&nbsp;
                 <input type="radio" id="employeeState1" name="employeeState" value="1" <#if employee.employeeState == 1>checked</#if>/><label for="employeeState1">在职</label>
@@ -52,7 +52,7 @@
 
             <div class="input-box"><span class="input-dic">入职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeEntryDate" id="employeeEntryDate" value="${(employee.employeeEntryDate?string("yyyy-MM-dd"))!''}" placeholder="请选择入职日期" onclick="WdatePicker({skin:'whyGreen'})" readonly="readonly"/> </div>
             <div class="input-box" id="isDeparture" style="<#if employee.employeeState == 1>display: none</#if>"><span class="input-dic">离职日期</span>&nbsp;&nbsp;<input class="my-input-date" type="text" name="employeeDepartureDate" id="employeeDepartureDate" value="${(employee.employeeDepartureDate?string("yyyy-MM-dd"))!''}" placeholder="请选择离职日期" onclick="WdatePicker({ dateFmt:'yyyy-MM-dd',skin:'whyGreen' })" readonly="readonly"/> </div>
-            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" id="employeePost" value="${employee.employeePost!}" placeholder="请输入2-20位中文、英文字符描述" required   maxlength="100"/> </div>
+            <div class="input-box"><span class="input-dic">员工岗位</span>&nbsp;&nbsp;<input class="my-input" type="text" name="employeePost" id="employeePost" value="${employee.employeePost!}" placeholder="请输入2-20位中文、英文字符描述" required    maxlength="20"  minlength="2" /> </div>
 
             <div style="clear: both;"></div>
             <div class="input-box"><span class="input-dic">员工备注</span>&nbsp;&nbsp;
@@ -74,6 +74,7 @@
     var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
     var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
     var china_name = /^[\u4e00-\u9fa5]+$/;
+    var en_name = /^[a-zA-Z0-9]+$/;
 
     $(function(){
         //var validator = $("#form-admin-addEmployee").validate();
@@ -108,7 +109,7 @@
                 var employeeEntryDate = $("[name='employeeEntryDate']").val();
                 var employeeDepartureDate = $("[name='employeeDepartureDate']").val();
                 if(!CompareDate(employeeDepartureDate,employeeEntryDate)){
-                    layer.msg('离职日期不能再入职日期之前', {icon: 5, time: 1000});
+                    layer.msg('离职日期不能在入职日期之前', {icon: 5, time: 1000});
                     return false;
                 }
             }
@@ -174,7 +175,7 @@
             return true;
         }
 
-        if(!(check_name.test(thVal))){
+        if(!(en_name.test(thVal))){
             layer.msg('员工编码格式不正确', {icon: 5, time: 1000});
             return false;
         }

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_List.ftl

@@ -73,7 +73,7 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort">
 				<thead>
 				<tr class="text-c">
-					<th width="10">机器条码(点击打印)</th>
+					<th width="100">机器条码(点击打印)</th>
 					<th width="100">机器二维码(点击打印)</th>
 					<th width="100">打印状态</th>
 					<th width="100">销售状态</th>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_particulars.ftl

@@ -1,203 +1,207 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<meta charset="UTF-8">
-		<title></title>
-		<style>
-			.my-title{font-weight: 500;padding-left: 15px;position: relative;}
-			.my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
-			.my-list{list-style-type: none;padding: 0;margin: 0;}
-			.my-list>li{margin: 10px 0;}
-			article, section, time, aside {
-				display: block;
-			}
-			.point-time {
-				content: "";
-				position: absolute;
-				width: 13px;
-				height: 13px;
-				top: 12px;
-				left: 90px;
-				background: #1c87bf;
-				margin-left: -4px;
-				border-radius: 50%;
-				box-shadow: 0 0 0 2px #fff;
-			}
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+    <style>
+        .my-title{font-weight: 500;padding-left: 15px;position: relative;}
+        .my-title:after{content: '';position: absolute;left: 0;top:12%;width: 3px;height: 80%;background: #32a3d8;}
+        .my-list{list-style-type: none;padding: 0;margin: 0;}
+        .my-list>li{margin: 10px 0;}
+        article, section, time, aside {
+            display: block;
+        }
+        .point-time {
+            content: "";
+            position: absolute;
+            width: 13px;
+            height: 13px;
+            top: 12px;
+            left: 90px;
+            background: #1c87bf;
+            margin-left: -4px;
+            border-radius: 50%;
+            box-shadow: 0 0 0 2px #fff;
+        }
 
-			.text-red {
-				color: #f6393f;
-			}
+        .text-red {
+            color: #f6393f;
+        }
 
-			.text-blue {
-				color: #32a3d8;
-			}
+        .text-blue {
+            color: #32a3d8;
+        }
 
-			.text-green {
-				color: #95c91e;
-			}
+        .text-green {
+            color: #95c91e;
+        }
 
-			.text-yellow {
-				color: #ffb902;
-			}
+        .text-yellow {
+            color: #ffb902;
+        }
 
-			.text-purple {
-				color: #d32d93;
-			}
+        .text-purple {
+            color: #d32d93;
+        }
 
-			.point-red {
-				background-color: #f6393f;
-			}
+        .point-red {
+            background-color: #f6393f;
+        }
 
-			.point-blue {
-				background-color: #32a3d8;
-			}
+        .point-blue {
+            background-color: #32a3d8;
+        }
 
-			.point-green {
-				background-color: #24c175;
-			}
+        .point-green {
+            background-color: #24c175;
+        }
 
-			.point-yellow {
-				background-color: #ffb902;
-			}
+        .point-yellow {
+            background-color: #ffb902;
+        }
 
-			.point-purple {
-				background-color: #d32d93;
-			}
+        .point-purple {
+            background-color: #d32d93;
+        }
 
-			.content {
-				width: 100%;
-				margin: 0 auto;
-			}
-			.content article {
-				position: relative;
-			}
-			.content article > h3 {
-				width: 100%;
-				height: 20px;
-				line-height: 20px;
-				text-align: left;
-				text-indent: 3%;
-				font-size: 1.4em;
-				color: #fff;
-				padding: 10px 0 20px;
-				background-color: #dd6d01;
-			}
-			.content article section {
-				padding: 0 0 17px;
-				position: relative;
-			}
-			.content article section:before {
-				content: "";
-				width: 3px;
-				top: 17px;
-				bottom: -17px;
-				left: 91px;
-				background: #84c9e9;
-				position: absolute;
-				-webkit-transform: scaleX(.5);
-			}
-			.content article section.no-before:before{
-				display: none;
-			}
-			.content article section:last-child:before {
-				display: none;
-			}
-			.content article section time {
-				width: 80px;
-				display: block;
-				position: absolute;
-				padding: 8px 0;
-			}
-			.content article section time > span {
-				display: block;
-				text-align: center;
-			}
-			.content article section aside {
-				color: #3a3a38;
-				margin-left: 108px;
-				height: 35px;
-				line-height: 35px;
-			}
-			.content article section .brief {
-				color: #9f9f9f;
-			}
-			.things>.items{margin: 0 15px;}
-			p{margin: 0;}
-            input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-            input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
-		</style>
-	<#include "/base/list_base.ftl">
-	</head>
-	<body>
-    <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-        <span class="c-gray en">&gt;</span> PST管理
-        <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 style="padding: 10px;">
-			<div class="my-title">产品生产详情</div>
-			<ul class="my-list">
-				<li>机器条码：${ptsMachine.machineBarcode!''}</li>
-				<li>生产状态：<#if ptsMachine.machineProcessState == 1><span class="text-blue">正常</#if>
-							<#if ptsMachine.machineProcessState == 2><span class="text-red">异常</#if></span></li>
-				<li>
-					<div class="content">
-					<article>
-					<#list machineLogsList as list>
-                        <section>
-                            <span class="point-time point-blue"></span>
-                            <time>
-								<#if list_index == 1>生产流程：</#if>
-                            </time>
-                            <aside>
-                                <p class="things">
-								${(list.logsProcessTime?string("yyyy-MM-dd HH:mm:ss"))!''}<span class="items">${list.employeeName!''}</span><span class="items">${list.processName!''}</span><#if list.logsProcessStatus == 0><span class="btn-see-ditails text-red">异常</#if><#if list.logsProcessStatus == 1><span class="btn-see-ditails text-blue">正常</#if></span>
-                                </p>
+        .content {
+            width: 100%;
+            margin: 0 auto;
+            font-size: 12px !important;
+        }
+        .content article {
+            position: relative;
+        }
+        .content article > h3 {
+            width: 100%;
+            height: 20px;
+            line-height: 20px;
+            text-align: left;
+            text-indent: 3%;
+            font-size: 1.4em;
+            color: #fff;
+            padding: 10px 0 20px;
+            background-color: #dd6d01;
+        }
+        .content article section {
+            padding: 0 0 17px;
+            position: relative;
+        }
+        .content article section:before {
+            content: "";
+            width: 3px;
+            top: 17px;
+            bottom: -17px;
+            left: 91px;
+            background: #84c9e9;
+            position: absolute;
+            -webkit-transform: scaleX(.5);
+        }
+        .content article section.no-before:before{
+            display: none;
+        }
+        .content article section:last-child:before {
+            display: none;
+        }
+        .content article section time {
+            width: 80px;
+            display: block;
+            position: absolute;
+            padding: 8px 0;
+        }
+        .content article section time > span {
+            display: block;
+            text-align: center;
+        }
+        .content article section aside {
+            color: #3a3a38;
+            margin-left: 108px;
+            height: 35px;
+            line-height: 35px;
+        }
+        .content article section .brief {
+            color: #9f9f9f;
+        }
+        .content .things{margin-bottom: 0;}
+        .things>.items{margin: 0 15px;}
+        p{margin: 0;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+    </style>
+<#include "/base/list_base.ftl">
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> PST管理
+    <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 style="padding: 10px;">
+    <div class="my-title">产品生产详情</div>
+    <ul class="my-list">
+        <li>机器条码：${ptsMachine.machineBarcode!''}</li>
+        <li>生产状态：<#if ptsMachine.machineProcessState == 1><span class="text-blue">正常</#if>
+		<#if ptsMachine.machineProcessState == 2><span class="text-red">异常</#if></span></li>
+        <li>
+            <div class="content">
+                <article>
+				<#list machineLogsList as list>
+                    <section style="padding-bottom: 37px;">
+                        <span class="point-time point-blue"></span>
+                        <time>
+							<#if list_index == 1>生产流程：</#if>
+                        </time>
+                        <aside>
+                            <p class="things">
+							${(list.logsProcessTime?string("yyyy-MM-dd HH:mm:ss"))!''}<span class="items">${list.employeeName!''}</span><span class="items">${list.processName!''}</span><#if list.logsProcessStatus == 0><span class="btn-see-ditails text-red">异常</#if><#if list.logsProcessStatus == 1><span class="btn-see-ditails text-blue">正常</#if></span>
+                            </p>
+                            <p class="things text-red">
 								<#if list.logsErrorType??>
 									<#if list.logsErrorType == 1>
-										<img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/common/images/tanhao.png" />提示：<span class="btn-see-ditails text-red">${list.logsProcessPrompt}</span>
+                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/rst/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">${list.logsProcessPrompt}</span>
 									<#else>
-                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/common/images/tanhao.png" />提示：<span class="btn-see-ditails text-red">次品异常</span>
+                                        <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/rst/common/images/pts/tanhao.png" />提示：<span class="btn-see-ditails text-red">次品异常</span>
 									</#if>
 								</#if>
-                            </aside>
-                        </section>
+                            </p>
+                        </aside>
+                    </section>
 
-					</#list>
-						<#--<section style="padding-bottom: 37px;">
-							<span class="point-time point-blue"></span>
-							<time>
-								
-							</time>
-							<aside>
-								<p class="things">
-									2017-08-09 12:12:12  <span class="items">王老五</span><span class="items">净水机需求清洗物料</span><span class="btn-see-ditails text-red">异常</span>
-								</p>
-								<p class="things text-red">
-									<img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/common/images/tanhao.png" />提示：此正常流程为检查水箱是否完好
-								</p>
-							</aside>
-						</section>-->
-						<section>
-							<span class="point-time point-green"></span>
-							<time>
-								销售信息：
-							</time>
-							<aside>
-								<p class="things">
-									<#if ptsMachine.machineSalesState == 2>
-									${(ptsMachine.machineSalesDate?string("yyyy-MM-dd"))!''}售出<#--<span class="items">王老五</span><span class="items">净水机需求清洗物料</span>-->
-									<#else >
-										未售出
-									</#if>
+				</#list>
+				<#--<section style="padding-bottom: 37px;">
+                    <span class="point-time point-blue"></span>
+                    <time>
+
+                    </time>
+                    <aside>
+                        <p class="things">
+                            2017-08-09 12:12:12  <span class="items">王老五</span><span class="items">净水机需求清洗物料</span><span class="btn-see-ditails text-red">异常</span>
+                        </p>
+                        <p class="things text-red">
+                            <img style="width: 20px;float: left;margin-top:8px;margin-right: 10px;" src="/common/images/tanhao.png" />提示：此正常流程为检查水箱是否完好
+                        </p>
+                    </aside>
+                </section>-->
+                    <section>
+                        <span class="point-time point-green"></span>
+                        <time>
+                            销售信息：
+                        </time>
+                        <aside>
+                            <p class="things">
+							<#if ptsMachine.machineSalesState == 2>
+							${(ptsMachine.machineSalesDate?string("yyyy-MM-dd"))!''}售出<#--<span class="items">王老五</span><span class="items">净水机需求清洗物料</span>-->
+							<#else >
+                                未售出
+							</#if>
 
-								</p>
-							</aside>
-						</section>
-					</article>
-				</div>
-				</li>
-			</ul>
-		</div>
-	</body>
+                            </p>
+                        </aside>
+                    </section>
+                </article>
+            </div>
+        </li>
+    </ul>
+</div>
+</body>
 </html>

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

@@ -43,7 +43,7 @@
 			<table class="table table-border table-bordered table-bg table-hover table-sort" style=" width: 50%;margin: 0 auto;">
 				<thead>
 				<tr class="text-c">
-                    <th width="1"><input name='checkbox' type='checkbox' value='' id="all" >全选</th>
+                    <th width="1"><input name='checkbox' type='checkbox' value='' id="all" ></th>
 					<th width="10">产品条码</th>
 					<th width="20">操作</th>
 				</tr>

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" /> </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"/> </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"/> </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">
@@ -96,8 +96,8 @@
 <script type="text/javascript" src="${path}/common/lib/jquery.ui/jquery-ui.js"></script>
 <script type="text/javascript">
 
-    var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;\\[\\]，。！；：“”\\"]+$/;
-    var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+    var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;，。！；：“”\\"\\ ]+$/;
+    var cnen_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
 
     $(function(){
         //var validator = $("#form-admin-addProduce").validate();

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

@@ -99,8 +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-Z0-9\u4e00-\u9fa5,.!;\\[\\]，。！；：“”\\"]+$/;
-    var cnen_name = /^[a-zA-Z\u4e00-\u9fa5]+$/;
+    var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;，。！；：“”\\"\\ ]+$/;
+    var cnen_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
 
     var delProcessIds="",delNodeIds="";
     $(function(){
@@ -138,7 +138,6 @@
             if(!flag)
                 return false;
 
-
             ajaxReq();
             return false;
         })