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

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

@@ -63,6 +63,10 @@
         var salesId = $("#salesId").val();
         var salesPostFirm = $("#salesPostFirm").val();
         var salesPostNum = $("#salesPostNum").val();
+        if (salesPostNum == null || salesPostNum === "" || typeof(salesPostNum) === "undefined") {
+            layer.msg("快递单号必须填写，空快递单号不允许发货", {icon: 5, time: 3000});
+            return;
+        }
         $.ajax('${path}/admin/await_send/manual_delivery?dates=' + new Date().getTime(), {
             data: {"salesPostFirm":salesPostFirm,"salesPostNum" : salesPostNum,"salesId":salesId},
             dataType: 'json',