Merge branch 'zjl_create_order_20180813' into development

public/js/add_order.js

@@ -467,7 +467,7 @@
                                 return false;
                                 return false;
                             }
                             }
 
 
-                            if (inv_type && !tax_id) {
+                            if ((inv_type && !tax_id) || (!tax_id && goods_type == 2)) {
                                 layer.msg('请选择发票信息');
                                 layer.msg('请选择发票信息');
                                 return false;
                                 return false;
                             }
                             }