|
@@ -143,6 +143,7 @@
|
|
|
<div>
|
|
|
<detailProductList
|
|
|
ref="productList"
|
|
|
+ :maxHeight="pageHeight"
|
|
|
:detailData="detailData"
|
|
|
:warehouseSn="warehouseSn"
|
|
|
:promoFlag="promoFlag"
|
|
@@ -158,6 +159,7 @@
|
|
|
:bordered="false"
|
|
|
title="活动产品"
|
|
|
class="salesEdit-cont"
|
|
|
+ v-if="activeList.length"
|
|
|
>
|
|
|
<activeStatisticsList
|
|
|
ref="activeTjList"
|
|
@@ -355,7 +357,7 @@ export default {
|
|
|
},
|
|
|
// 表格高度计算
|
|
|
pageHeight () {
|
|
|
- return window.innerHeight - 305 + (this.hideFooter ? 45 : 0)
|
|
|
+ return window.innerHeight - 315 + (this.hideFooter ? 45 : 0)
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -458,7 +460,7 @@ export default {
|
|
|
// 查询数据
|
|
|
searchTable () {
|
|
|
this.$refs.productList.searchTable()
|
|
|
- this.$refs.productActiveList.searchTable()
|
|
|
+ if (this.activeList.length) this.$refs.productActiveList.searchTable()
|
|
|
},
|
|
|
// 详情
|
|
|
getDetail () {
|
|
@@ -477,9 +479,11 @@ export default {
|
|
|
this.activeList = list.filter(item => item.promotion && item.promotionRule)
|
|
|
// 触发活动统计查询变量
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.activeTjList.hasInit = false
|
|
|
- // 刷新活动统计
|
|
|
- this.$refs.activeTjList.getDataList()
|
|
|
+ if (this.activeList.length) {
|
|
|
+ this.$refs.activeTjList.hasInit = false
|
|
|
+ // 刷新活动统计
|
|
|
+ this.$refs.activeTjList.getDataList()
|
|
|
+ }
|
|
|
})
|
|
|
setTimeout(() => {
|
|
|
this.resetSearchForm()
|