Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

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

@@ -91,6 +91,8 @@ public class MachineController {
             ptsMachine.setMachineCreateTime(new Date());//创建时间
             ptsMachine.setMachineProduceType(produce.getProduceType());//产品类型
             ptsMachine.setMachineNfcId(nfcId);
+            ptsMachine.setMachineHardwareVersion("30");
+            ptsMachine.setMachineSoftwareVersion("30");
             machineService.addMachine(ptsMachine);
         }
         boolean isAbnormality = true;//状态是否异常

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

@@ -97,8 +97,9 @@
 
     $(function(){
         //var validator = $("#form-admin-addEmployee").validate();
-        $("#form-admin-addProduce").submit(function(){
+        $("#form-admin-addEmployee").submit(function(){
             ajaxReq();
+            return false;
         })
 
     })

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

@@ -97,8 +97,9 @@
 
     $(function(){
         //var validator = $("#form-admin-addEmployee").validate();
-        $("#form-admin-addProduce").submit(function(){
+        $("#form-admin-addEmployee").submit(function(){
             ajaxReq();
+            return false;
         })
     })
 

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

@@ -127,24 +127,24 @@
         //var validator = $("#form-admin-addProduce").validate();
         $("#form-admin-addProduce").submit(function(){
             ajaxReq();
+            return false;
         })
     })
 
     function ajaxReq(){
         var data = formatJSON();
         $.ajax({
-            cache: true,
             type: "POST",
             data: data,
             url: "${path}/admin/produce/save_produce",
-            async: false,
             success: function(data){
                 if (data.returnCode == 200) {
-                    window.location.href = '${path}/admin/produce/_produce_list'
+
+                    location.href = '${path}/admin/produce/_produce_list';
                 }
             },
-            error: function(XmlHttpRequest, textStatus, errorThrown){
-
+            error: function(errorThrown){
+                console.log(errorThrown)
             }
         });
     }

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

@@ -128,6 +128,7 @@
         //var validator = $("#signupForm").validate();
         $("#form-admin-addProduce").submit(function(){
             ajaxReq();
+            return false;
         })
 //        jQuery.validator.addMethod("processName", function(value, element) {
 //               var mobile = /[^\w\u4e00-\u9fa5]/;