产品修改-型号长度修改

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -103,6 +103,7 @@
                             <option value="30">超级妈咪团</option>
                             <option value="31">艾德叔叔</option>
                             <option value="32">钱儿频道</option>
+                            <option value="33">尹建莉</option>
                         </select>
                     </label>
                 </td>

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

@@ -12,7 +12,7 @@
     <title>生产产品列表</title>
     <style>
         .chanpin-list{margin: 0;padding: 10px;list-style-type: none;}
-        .chanpin-list>li{display: table-cell;width: 230px;border-left: 1px solid rgba(0,0,0,.1);border-bottom: 1px solid rgba(0,0,0,.1);background-color: #fff;position: relative;border-right: 30px solid transparent;padding-bottom: 30px;}
+        .chanpin-list>li{display: table-cell;width: 230px;border-left: 1px solid rgba(0,0,0,.1);border-bottom: 1px solid rgba(0,0,0,.1);background-color: #fff;position: relative;border-right: 30px solid transparent;padding-bottom: 30px;float: left; height: 500px;    margin-bottom: 25px;}
         .chanpin-list>li:after{content: '';position: absolute;right: 0;width: 1px;height: 100%;background-color: #ccc;-webkit-transform:scaleX(.5);  top:0;}
         .chanpin-list>li .title{background-color: #32a3d8;text-align: center;color: #fff;padding: 12px 0;}
         .chanpin-list>li .title>span{padding:3px 3px 3px 28px;background: url(${path}/common/images/pts/jiqi-1.png) left center no-repeat;background-size:auto 80%;}

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

@@ -59,7 +59,8 @@
                     </#if>
                     </select>
                 </div>
-                <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>-<input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
+                <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>-
+                    <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>  </div>
 
                 <div class="input-box"><span class="input-dic">产品类型</span>
                     <label><input type="radio" name="produceType" value="1" checked>净水机</label>
@@ -118,7 +119,7 @@
 
     var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;，。！；：“”\\"\\ ]+$/;
     var cnen_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
-    var en_name = /^[a-zA-Z0-9]+$/;
+    var en_name = /^[a-zA-Z0-9_-]+$/;
 
     $(function(){
         //var validator = $("#form-admin-addProduce").validate();

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

@@ -61,8 +61,8 @@
                 </select>
             </div>
 
-            <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-3位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="3" minlength="1"/>-
-                <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
+            <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-15位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="15" minlength="1"/>-
+                <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-15位英文、数字组合" required  maxlength="15" minlength="1"/>  </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>
@@ -127,7 +127,7 @@
 
     var check_name = /^[a-zA-Z0-9\u4e00-\u9fa5,.!;，。！；：“”\\"\\ ]+$/;
     var cnen_name = /^[a-zA-Z0-9\u4e00-\u9fa5]+$/;
-    var en_name = /^[a-zA-Z0-9]+$/;
+    var en_name = /^[a-zA-Z0-9_-]+$/;
 
     var delProcessIds="",delNodeIds="";
     $(function(){