diff --git a/.gitignore b/.gitignore index c3e9db3..67b3378 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ marketing-system-data-tool.tar .idea/ web/config.js server/server.log +server/server diff --git a/server/server b/server/server deleted file mode 100755 index 716a5a9..0000000 Binary files a/server/server and /dev/null differ diff --git a/server/server_restart.log b/server/server_restart.log deleted file mode 100644 index 6393b21..0000000 --- a/server/server_restart.log +++ /dev/null @@ -1,2 +0,0 @@ -/opt/homebrew/opt/go/libexec/src/crypto/x509/cert_pool.go:10:2: package encoding/pem is not in std (/opt/homebrew/opt/go/libexec/src/encoding/pem) -cmd/server/main.go:7:2: open /Users/zhouyonggao/Library/Caches/go-build/81/81aa4fdeaa93757df0aec25e30b31ebae853b2651233ed934d1a1b081249443a-d: operation not permitted diff --git a/web/modules/fields.js b/web/modules/fields.js index 82ecb21..23a1e80 100644 --- a/web/modules/fields.js +++ b/web/modules/fields.js @@ -110,30 +110,17 @@ class FieldsManager { const orderFields = this.getTableFields('order'); const children = orderFields.map(f => ({ value: f.value, label: f.label })); - // 添加公共子表 + // 添加公共子表(这些表与订单类型无关,应始终展示) children.push(this.buildTreeNode('merchant', this.getTableFields('merchant'))); children.push(this.buildTreeNode('activity', this.getTableFields('activity'))); - // 根据订单类型添加特定子表 - if (orderType === 2) { - // 直充卡密 - children.push(this.buildTreeNode('order_digit', this.getTableFields('order_digit'))); - } else if (orderType === 3) { - // 立减金 - children.push(this.buildTreeNode('order_voucher', this.getTableFields('order_voucher'))); - children.push(this.buildTreeNode('goods_voucher_batch', this.getTableFields('goods_voucher_batch'))); - children.push(this.buildTreeNode('goods_voucher_subject_config', this.getTableFields('goods_voucher_subject_config'))); - } else if (orderType === 1) { - // 红包 - children.push(this.buildTreeNode('order_cash', this.getTableFields('order_cash'))); - } else { - // 全部类型 - children.push(this.buildTreeNode('order_voucher', this.getTableFields('order_voucher'))); - children.push(this.buildTreeNode('order_cash', this.getTableFields('order_cash'))); - children.push(this.buildTreeNode('order_digit', this.getTableFields('order_digit'))); - children.push(this.buildTreeNode('goods_voucher_batch', this.getTableFields('goods_voucher_batch'))); - children.push(this.buildTreeNode('goods_voucher_subject_config', this.getTableFields('goods_voucher_subject_config'))); - } + // 为避免“有时显示有时不显示”的问题,这里不再按订单类型裁剪子表, + // 而是始终展示所有与订单相关的子表,由业务在导出层面控制是否使用。 + children.push(this.buildTreeNode('order_digit', this.getTableFields('order_digit'))); + children.push(this.buildTreeNode('order_voucher', this.getTableFields('order_voucher'))); + children.push(this.buildTreeNode('order_cash', this.getTableFields('order_cash'))); + children.push(this.buildTreeNode('goods_voucher_batch', this.getTableFields('goods_voucher_batch'))); + children.push(this.buildTreeNode('goods_voucher_subject_config', this.getTableFields('goods_voucher_subject_config'))); return children; }