Merge branch 'zjl_create_order_20180813' into development

55719078 · 朱继来 · 84f43851 · 2b9b8b05 · 55719078
Commit 55719078 authored Aug 28, 2018 by 朱继来
Showing with 1 additions and 1 deletions
public/js/add_order.js
--- a/public/js/add_order.js
+++ b/public/js/add_order.js
@@ -467,7 +467,7 @@
                                return false;
                            }

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