|
@@ -105,6 +105,7 @@
|
|
|
showEmpty: false,
|
|
|
showTableHead: true,
|
|
|
colspanNums: 13,
|
|
|
+ hasOutStockOfActive: false,
|
|
|
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE
|
|
|
}
|
|
|
},
|
|
@@ -320,6 +321,7 @@
|
|
|
if(acTotal&&acTotal.totalQty){
|
|
|
// 获取活动产品列表
|
|
|
const aclist = await salesDetailAllList(activeParams).then(res => res.data)
|
|
|
+
|
|
|
const retList = aclist.length ? [{
|
|
|
id: 'promo-'+i,
|
|
|
promo: promo,
|
|
@@ -340,7 +342,7 @@
|
|
|
}
|
|
|
console.log(listData)
|
|
|
this.dataSource = listData
|
|
|
-
|
|
|
+
|
|
|
// 格式化数据
|
|
|
let f = 0
|
|
|
this.outStockStr = ''
|
|
@@ -359,6 +361,9 @@
|
|
|
item.epushedQty = Number(item.pushedQty) - Number(item.pushQty)
|
|
|
if (item.unpushedQty && (Number(item.stockQty) < Number(item.unpushedQty))) {
|
|
|
str += item.productCode + '、'
|
|
|
+ if(item.promotionFlag != 0){
|
|
|
+ this.hasOutStockOfActive = true
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
if (str.length > 0) {
|