|
@@ -35,7 +35,7 @@
|
|
|
ref="productNormalList"
|
|
|
@insterOk="insterActiveOk"
|
|
|
@openCpModal="openProductModal"
|
|
|
- :showTotal="activeList.length>0"
|
|
|
+ :showTotal="showTotal"
|
|
|
:detailData="detailData"
|
|
|
:warehouseSn="warehouseSn"
|
|
|
:salesBillSn="salesBillSn"></productNormalList>
|
|
@@ -195,6 +195,9 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
+ showTotal(){
|
|
|
+ return this.activeList.length > 0
|
|
|
+ },
|
|
|
shippingAddress () {
|
|
|
const shippingAddrProvinceName = this.detailData && this.detailData.salesBillExtEntity && this.detailData.salesBillExtEntity.shippingAddrProvinceName ? this.detailData.salesBillExtEntity.shippingAddrProvinceName : ''
|
|
|
const shippingAddrCityName = this.detailData && this.detailData.salesBillExtEntity && this.detailData.salesBillExtEntity.shippingAddrCityName ? this.detailData.salesBillExtEntity.shippingAddrCityName : ''
|
|
@@ -245,6 +248,10 @@ export default {
|
|
|
item.disabled = item.enabledFlag == 0
|
|
|
this.activeDesKey['search-'+item.promoRuleSn] = false
|
|
|
})
|
|
|
+ // 加载正常产品列表
|
|
|
+ setTimeout(()=> {
|
|
|
+ this.$refs.productNormalList.resetSearchForm()
|
|
|
+ }, 500)
|
|
|
},
|
|
|
// 获取是否有新活动
|
|
|
async getNewActive(){
|