|
@@ -551,25 +551,7 @@
|
|
|
this.handleBatchDelAll()
|
|
|
}
|
|
|
},
|
|
|
- // 换促销
|
|
|
- async upActiveOk(data, editRow){
|
|
|
- console.log(data)
|
|
|
- console.log(editRow)
|
|
|
- this.spinning = true
|
|
|
- // 先删除当前活动
|
|
|
- const delRet = await salesDetailDel({
|
|
|
- salesBillDetailSn: editRow.salesBillDetailSn,
|
|
|
- salesBillSn: this.salesBillSn,
|
|
|
- salesPromoSn: this.promo.salesPromoSn
|
|
|
- })
|
|
|
- // 当删除成功且不是”不参与活动“时
|
|
|
- if(delRet.status == 200 && data != 0){
|
|
|
- // 再添加到其它活动
|
|
|
- this.$emit()
|
|
|
- }
|
|
|
- this.openUpActiveModal = false
|
|
|
- this.spinning = false
|
|
|
- },
|
|
|
+ // 打开换促销活动列表选项
|
|
|
handleUpdateActive(record){
|
|
|
this.$refs.updateActive.getActiveList({
|
|
|
productSn: record.productSn,
|
|
@@ -623,6 +605,25 @@
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
+ // 确定更换促销活动
|
|
|
+ async upActiveOk(data, editRow){
|
|
|
+ console.log(data)
|
|
|
+ console.log(editRow)
|
|
|
+ this.spinning = true
|
|
|
+ // 先删除当前活动
|
|
|
+ const delRet = await salesDetailDel({
|
|
|
+ salesBillDetailSn: editRow.salesBillDetailSn,
|
|
|
+ salesBillSn: this.salesBillSn,
|
|
|
+ salesPromoSn: this.promo.salesPromoSn
|
|
|
+ })
|
|
|
+ // 当删除成功且不是”不参与活动“时
|
|
|
+ if(delRet.status == 200 && data != 0){
|
|
|
+ // 再添加到其它活动
|
|
|
+ this.$emit("upActive",editRow, data)
|
|
|
+ }
|
|
|
+ this.openUpActiveModal = false
|
|
|
+ this.spinning = false
|
|
|
+ },
|
|
|
// 添加产品
|
|
|
insterProduct (row, promotionFlag, promoProductClz) {
|
|
|
console.log(row, promotionFlag, promoProductClz)
|
|
@@ -632,7 +633,7 @@
|
|
|
_this.saveNewProduct(row, promotionFlag, promoProductClz)
|
|
|
},
|
|
|
// 保存添加的产品到销售列表
|
|
|
- saveNewProduct (row, promotionFlag, promoProductClz) {
|
|
|
+ saveNewProduct (row, promo, promoProductClz) {
|
|
|
this.$message.loading('正在添加产品...', 1)
|
|
|
this.isInster = true
|
|
|
this.spinning = true
|