wangxiaoming 7 anos atrás
pai
commit
0cdce6aa2c

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/add_batch.ftl

@@ -46,7 +46,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>批次编号:</label>
             <div class="formControls col-xs-8 col-sm-9">
-				<input type="text" class="input-text" value="" id="batchNo" name="batchNo" placeholder="请输入1-20位的名称,支持字母、数字" datatype="/^[a-zA-Z0-9]{1,20}$/" errormsg="请输入1-20位的名称,支持字母、数字!">
+				<input type="text" class="input-text" value="" id="batchNo" name="batchNo" placeholder="请输入1-20位的批次编号,支持字母、数字" datatype="/^[a-zA-Z0-9]{1,20}$/" errormsg="请输入1-20位的批次编号,支持字母、数字!">
             </div>
         </div>
 

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/batch/update_batch.ftl

@@ -47,7 +47,7 @@
         <div class="row cl">
             <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>批次编号:</label>
             <div class="formControls col-xs-8 col-sm-9">
-				<input type="text" class="input-text" value="${ptsBatch.batchNo}" id="batchNo" name="batchNo" placeholder="请输入1-20位的名称,支持字母、数字" datatype="/^[a-zA-Z0-9]{1,20}$/" errormsg="请输入1-20位的名称,支持字母、数字!">
+				<input type="text" class="input-text" value="${ptsBatch.batchNo}" id="batchNo" name="batchNo" placeholder="请输入1-20位的批次编号,支持字母、数字" datatype="/^[a-zA-Z0-9]{1,20}$/" errormsg="请输入1-20位的批次编号,支持字母、数字!">
             </div>
         </div>
 

+ 1 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/add_bom.ftl

@@ -316,6 +316,7 @@
         if(bom != null && bom.bomId != null){
             $("#bomName").val(bom.bomName);
             $("#bomRemarks").val(bom.bomRemarks);
+            $("#bomVersion").val(bom.bomVersion);
             delComponent(0,"all");
             var components = bom.ptsBomComponentsList;
             if(components != null && components.length > 0){

+ 1 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/pts/bom/update_bom.ftl

@@ -275,6 +275,7 @@
         if(bom != null && bom.bomId != null){
             $("#bomName").val(bom.bomName);
             $("#bomRemarks").val(bom.bomRemarks);
+            $("#bomVersion").val(bom.bomVersion);
             delComponent(0,"all");
             var components = bom.ptsBomComponentsList;
             if(components != null && components.length > 0){

+ 8 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_add.ftl

@@ -14,7 +14,14 @@
 <title>添加机器零件</title>
 </head>
 <body>
-<article class="page-container">
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <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>
+<article class="page-container" style="padding: 10px;width: 600px;margin: 0 auto;">
 	<form action="" method="post" class="form form-horizontal" id="form-parts-add">
 
         <div class="row cl">

+ 8 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machinePtras/ptras_update.ftl

@@ -14,7 +14,14 @@
 <title>修改机器零件</title>
 </head>
 <body>
-<article class="page-container">
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <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>
+<article class="page-container" style="padding: 10px;width: 600px;margin: 0 auto;">
 	<form action="" method="post" class="form form-horizontal" id="form-parts-update">
 
         <div class="row cl">

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_add.ftl

@@ -54,7 +54,7 @@
 
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">更新内容:</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>更新内容:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="machineVersionContent" id="machineVersionContent" cols="" rows="" class="textarea"  placeholder="请详细描述本次版本更新内容,较上次修复内容" onKeyUp="$.Huitextarealength(this,300)"></textarea>
                 <p class="textarea-numberbar"><em class="textarea-length">0</em>/300</p>

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/pts/machineVersion/version_update.ftl

@@ -55,7 +55,7 @@
 
 
         <div class="row cl">
-            <label class="form-label col-xs-4 col-sm-3">更新内容:</label>
+            <label class="form-label col-xs-4 col-sm-3"><span class="c-red">*</span>更新内容:</label>
             <div class="formControls col-xs-8 col-sm-9">
                 <textarea name="machineVersionContent" id="machineVersionContent" cols="" rows="" class="textarea"  placeholder="请详细描述本次版本更新内容,较上次修复内容" onKeyUp="$.Huitextarealength(this,300)">${ptsMachineVersion.machineVersionContent}</textarea>
                 <p class="textarea-numberbar"><em class="textarea-length">0</em>/300</p>

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

@@ -73,14 +73,14 @@
                         <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">
                                 <#--<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>
@@ -137,23 +137,23 @@
             }
 
             var flag = true;
-            $("input[name='processName']").each(function () {
-                if( !(cnen_name.test($(this).val())) ){
-                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
-                    flag = false;
-                }
-            })
-            if(!flag)
-                return false;
+//            $("input[name='processName']").each(function () {
+//                if( !(cnen_name.test($(this).val())) ){
+//                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
+//                    flag = false;
+//                }
+//            })
+//            if(!flag)
+//                return false;
 
-            $("input[name='nodeDes']").each(function () {
-                if( !(check_name.test($(this).val())) ){
-                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
-                    flag = false;
-                }
-            })
-            if(!flag)
-                return false;
+//            $("input[name='nodeDes']").each(function () {
+//                if( !(check_name.test($(this).val())) ){
+//                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
+//                    flag = false;
+//                }
+//            })
+//            if(!flag)
+//                return false;
 
             ajaxReq();
             return false;
@@ -226,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位中文、英文、数字组合"   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);
@@ -244,14 +244,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="请输入节点名称,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">'
                 //  + '<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>'

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

@@ -75,7 +75,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>
@@ -84,7 +84,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>
@@ -147,23 +147,23 @@
             }
 
             var flag = true;
-            $("input[name='processName']").each(function () {
-                if( !(cnen_name.test($(this).val())) ){
-                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
-                    flag = false;
-                }
-            })
-            if(!flag)
-                return false;
-
-            $("input[name='nodeDes']").each(function () {
-                if( !(check_name.test($(this).val())) ){
-                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
-                    flag = false;
-                }
-            })
-            if(!flag)
-                return false;
+//            $("input[name='processName']").each(function () {
+//                if( !(cnen_name.test($(this).val())) ){
+//                    layer.msg('节点名称输入格式不正确', {icon: 5, time: 1000});
+//                    flag = false;
+//                }
+//            })
+//            if(!flag)
+//                return false;
+
+//            $("input[name='nodeDes']").each(function () {
+//                if( !(check_name.test($(this).val())) ){
+//                    layer.msg('节点操作描述输入格式不正确', {icon: 5, time: 1000});
+//                    flag = false;
+//                }
+//            })
+//            if(!flag)
+//                return false;
 
             layer.confirm('您确定要修改产品信息吗?', {
                 btn: ['确定','取消'] //按钮
@@ -262,7 +262,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);
@@ -280,14 +280,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="请输入节点名称,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">'
                 //  + '<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>'