|
@@ -47,6 +47,7 @@
|
|
@allThreeStock="searchAllThreeStock"
|
|
@allThreeStock="searchAllThreeStock"
|
|
@addActive="upActive"
|
|
@addActive="upActive"
|
|
@error="tableErrorData"
|
|
@error="tableErrorData"
|
|
|
|
+ @count="setNormalCount"
|
|
:showTotal="showTotal"
|
|
:showTotal="showTotal"
|
|
:activeList="activeList"
|
|
:activeList="activeList"
|
|
:hasActive="hasActive"
|
|
:hasActive="hasActive"
|
|
@@ -91,6 +92,7 @@
|
|
@refash="refashTableData"
|
|
@refash="refashTableData"
|
|
@selected="active => salesPromoSnSet = active"
|
|
@selected="active => salesPromoSnSet = active"
|
|
:showCols="colsValue"
|
|
:showCols="colsValue"
|
|
|
|
+ :hasNormal="hasNormal"
|
|
:activeList="activeList"
|
|
:activeList="activeList"
|
|
:warehouseSn="warehouseSn"
|
|
:warehouseSn="warehouseSn"
|
|
:salesBillSn="salesBillSn"
|
|
:salesBillSn="salesBillSn"
|
|
@@ -260,7 +262,8 @@ export default {
|
|
openVaildPriceModal: false, // 销售价低于成本价提示弹窗
|
|
openVaildPriceModal: false, // 销售价低于成本价提示弹窗
|
|
tempData: null, // 销售价低于成本价 弹窗列表数据
|
|
tempData: null, // 销售价低于成本价 弹窗列表数据
|
|
colsOptions: [],
|
|
colsOptions: [],
|
|
- colsValue: []
|
|
|
|
|
|
+ colsValue: [],
|
|
|
|
+ normalCount: null
|
|
}
|
|
}
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -276,13 +279,16 @@ export default {
|
|
return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
|
|
return shippingAddrProvinceName + shippingAddrCityName + shippingAddrCountyName + shippingAddr
|
|
}
|
|
}
|
|
},
|
|
},
|
|
- // 是否显示统计信息
|
|
|
|
|
|
+ // 是否显示活动统计信息
|
|
showTotal () {
|
|
showTotal () {
|
|
return this.activeList.length > 0
|
|
return this.activeList.length > 0
|
|
},
|
|
},
|
|
hasActive () {
|
|
hasActive () {
|
|
const list = this.activeList.filter(item => item.enabledFlag == 1)
|
|
const list = this.activeList.filter(item => item.enabledFlag == 1)
|
|
return list.length > 0
|
|
return list.length > 0
|
|
|
|
+ },
|
|
|
|
+ hasNormal () {
|
|
|
|
+ return this.normalCount && this.normalCount.totalQty > 0
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
@@ -308,6 +314,10 @@ export default {
|
|
// this.colsValue = this.colsOptions.filter(item => item.value < 8 && item.value != 3 || item.value == 11).map(item => item.value)
|
|
// this.colsValue = this.colsOptions.filter(item => item.value < 8 && item.value != 3 || item.value == 11).map(item => item.value)
|
|
this.colsValue = this.colsOptions.map(item => item.value)
|
|
this.colsValue = this.colsOptions.map(item => item.value)
|
|
},
|
|
},
|
|
|
|
+ // 正常产品统计信息
|
|
|
|
+ setNormalCount (val) {
|
|
|
|
+ this.normalCount = val
|
|
|
|
+ },
|
|
// 查看参与规则明细
|
|
// 查看参与规则明细
|
|
showRuleDetail (sn) {
|
|
showRuleDetail (sn) {
|
|
this.$refs.activeTjList.showDesc({ promoRuleSn: sn })
|
|
this.$refs.activeTjList.showDesc({ promoRuleSn: sn })
|