|
@@ -229,7 +229,7 @@
|
|
|
</s-table>
|
|
|
|
|
|
<!-- 导入产品 -->
|
|
|
- <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn}" @close="closeGuideModel" @ok="hanldeImportOk" />
|
|
|
+ <importGuideModal :openModal="openGuideModal" :params="{salesBillSn: $route.params.sn, salesPromoSn: promo.salesPromoSn}" @close="closeGuideModel" @ok="hanldeImportOk" />
|
|
|
<!-- 仓库设置 -->
|
|
|
<setWarehouse :show="openWarehouseModal" @ok="chooseWarehouseOk" @cancel="openWarehouseModal=false"></setWarehouse>
|
|
|
<!-- 换促销 -->
|
|
@@ -334,7 +334,8 @@
|
|
|
rowSelectionInfo: null,
|
|
|
warehouseDataList: [],
|
|
|
openUpActiveModal: false,
|
|
|
- descDetail: null
|
|
|
+ descDetail: null,
|
|
|
+ promoProductClz: null, // 活动产品分类
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -566,15 +567,15 @@
|
|
|
})
|
|
|
},
|
|
|
// 添加产品
|
|
|
- insterProduct (row, promotionFlag) {
|
|
|
+ insterProduct (row, promotionFlag, promoProductClz) {
|
|
|
console.log(row, promotionFlag)
|
|
|
// 防止多次添加产品
|
|
|
if (this.isInster) { return }
|
|
|
const _this = this
|
|
|
- _this.saveNewProduct(row, promotionFlag)
|
|
|
+ _this.saveNewProduct(row, promotionFlag, promoProductClz)
|
|
|
},
|
|
|
// 保存添加的产品到销售列表
|
|
|
- saveNewProduct (row, promotionFlag) {
|
|
|
+ saveNewProduct (row, promotionFlag, promoProductClz) {
|
|
|
this.$message.loading('正在添加产品...', 1)
|
|
|
this.isInster = true
|
|
|
this.spinning = true
|
|
@@ -582,7 +583,8 @@
|
|
|
salesPromoDetailDTO:{
|
|
|
salesPromoSn: this.promo.salesPromoSn,
|
|
|
promoRuleSn: this.promo.promoRuleSn,
|
|
|
- promoSn: this.promo.promoSn
|
|
|
+ promoSn: this.promo.promoSn,
|
|
|
+ promoProductClz: promoProductClz
|
|
|
},
|
|
|
packQty: row.productPackQty,
|
|
|
productSn: row.productSn,
|
|
@@ -615,12 +617,25 @@
|
|
|
// 导入产品
|
|
|
handleImportClick(e){
|
|
|
this.openGuideModal = true
|
|
|
+ this.promoProductClz = e.key
|
|
|
},
|
|
|
closeGuideModel () {
|
|
|
this.openGuideModal = false
|
|
|
},
|
|
|
- hanldeImportOk (obj) {
|
|
|
- salesBatchInsert(obj).then(res => {
|
|
|
+ // 批量导入产品
|
|
|
+ hanldeImportOk (data, salesPromoSn) {
|
|
|
+ const params = {
|
|
|
+ salesBillSn: this.detailData.salesBillSn,
|
|
|
+ salesBillDetailList: data
|
|
|
+ }
|
|
|
+ // 活动导入
|
|
|
+ if(salesPromoSn){
|
|
|
+ params.salesPromoSn = salesPromoSn
|
|
|
+ params.promoRuleSn = this.promo.promoRuleSn
|
|
|
+ params.promoProductClz = this.promoProductClz
|
|
|
+ }
|
|
|
+
|
|
|
+ salesBatchInsert(params).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.$refs.table.refresh(true)
|
|
|
this.getOrderDetail(false)
|