新增订单页面添加校验

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -305,26 +305,15 @@
             searchOrder();
         });
 
-<<<<<<< .mine
         /*初始化  搜索订单  */
-        //searchOrder();
+       //searchOrder();
 
-=======
-
-
-
->>>>>>> .theirs
         /*回车搜索*/
         $('.input-text').keydown(function(event){
             if(event.keyCode == 13){ //绑定回车
                 $('#searchOrder').click();
             }
         });
-<<<<<<< .mine
-
-=======
-
->>>>>>> .theirs
     })
 
     /**
@@ -436,6 +425,13 @@
             tipSweep: true, //若为true，则只在表单提交时验证
             ajaxPost: true, //异步提交
             beforeCheck: function (curform) {  //验证通过之前执行的函数
+                var salesCompanyId = $("#salesCompanyId").val();
+                var salesStoreId = $("#salesStoreId").val();
+                if(salesCompanyId == null || salesCompanyId == "" || typeof(salesCompanyId) == "undefined" ||
+                        salesStoreId == null || salesStoreId == "" || typeof(salesStoreId) == "undefined"){
+                    layer.msg("请选择销售公司与店铺", {icon: 5, time: 3000});
+                    return  false;
+                }
             },
             beforeSubmit: function (curform) {  //验证通过之后执行的函数
                 var pro = $("#province").find("option:selected").text();