diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js index f23fa19..41e64b5 100644 --- a/src/filters/commFilter.js +++ b/src/filters/commFilter.js @@ -296,7 +296,13 @@ export function transactionTypeFilter(type) { 'commission_to_platform_refund': '退回平台手续费', 'commission_to_service_team_refund': '退回平台佣金', 'commission_to_village_refund': '退回平台佣金', - 'commission_to_town_refund': '退回平台佣金' + 'commission_to_town_refund': '退回平台佣金', + 'commission_to_store': '提货店铺佣金', + 'commission_to_courier': '配送员佣金', + 'commission_to_promoter': '直推首单佣金', + 'commission_to_store_refund': '提货店铺佣金退款', + 'commission_to_courier_refund': '配送员佣金退款', + 'commission_to_promoter_refund': '直推首单佣金退款', } return typeMap[type] diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index 0c3abaa..95c8414 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -639,7 +639,7 @@ - - + --> @@ -789,7 +789,7 @@ - - + --> { if (!e.price || e.price == 0) priceObj.price = true; @@ -2449,7 +2461,7 @@ export default { }) if (priceObj.price) return Message.error('零售价不能为小于等于0'); if (priceObj.procure_price && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('批发价不能为小于等于0'); - if (priceObj.single_number && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('单件数量不能为小于等于0'); + // if (priceObj.single_number && this.$store.state.user.merchantType.type_code == 'TypeSupplyChain') return Message.error('单件数量不能为小于等于0'); this.$refs[name].validate(valid => { if (valid) { this.validateAttr();