|
@@ -388,16 +388,17 @@ export default {
|
|
|
} else {
|
|
|
// 查询正常产品明细列表
|
|
|
if (this.promoProductClz == 0 || this.promoProductClz == undefined) {
|
|
|
- this.dataSource = await salesDetailAllList({ ...params, promotionFlag: this.promoProductClz == '' ? undefined : this.promoProductClz }).then(res => res.data || [])
|
|
|
+ params.promotionFlag = this.promoProductClz == '' ? undefined : this.promoProductClz
|
|
|
+ this.dataSource = await salesDetailAllList(params).then(res => res.data || [])
|
|
|
if (this.activeList.length > 0) {
|
|
|
- this.countData = await salesDetaiCount({ ...params, promoProductClz: this.promoProductClz == '' ? undefined : this.promoProductClz }).then(res => res.data)
|
|
|
+ this.countData = await salesDetaiCount(params).then(res => res.data)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
// 查询活动产品明细列表
|
|
|
if (this.promoProductClz !== '0') {
|
|
|
- this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, ...params }).then(res => res.data || [])
|
|
|
+ this.dataSource = await salesDetailExtPromoList({ salesPromoSnSet: this.salesPromoSnSet, promoProductClz: this.promoProductClz == '' ? undefined : this.promoProductClz, ...params }).then(res => res.data || [])
|
|
|
}
|
|
|
}
|
|
|
this.$emit('hideTable', this.type, this.dataSource.length)
|