|
@@ -65,8 +65,8 @@
|
|
class="sTable"
|
|
class="sTable"
|
|
ref="table"
|
|
ref="table"
|
|
size="small"
|
|
size="small"
|
|
- :rowKey="(record) => record.productSn"
|
|
|
|
- rowKeyName="productSn"
|
|
|
|
|
|
+ :rowKey="(record) => record.borrowDetailSn"
|
|
|
|
+ rowKeyName="borrowDetailSn"
|
|
:columns="columns"
|
|
:columns="columns"
|
|
:data="loadData"
|
|
:data="loadData"
|
|
:row-selection="{ columnWidth: 40 }"
|
|
:row-selection="{ columnWidth: 40 }"
|
|
@@ -108,11 +108,11 @@ export default {
|
|
productBrandSn: undefined, // 产品品牌
|
|
productBrandSn: undefined, // 产品品牌
|
|
productTypeSn1: '', // 产品一级分类
|
|
productTypeSn1: '', // 产品一级分类
|
|
productTypeSn2: '', // 产品二级分类
|
|
productTypeSn2: '', // 产品二级分类
|
|
- productTypeSn3: '' // 产品三级分类
|
|
|
|
|
|
+ productTypeSn3: '', // 产品三级分类
|
|
|
|
+ promoProductClz: 'GATE' // 促销产品类型
|
|
},
|
|
},
|
|
tableHeight: 300, // 表格高度
|
|
tableHeight: 300, // 表格高度
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
disabled: false, // 查询、重置按钮是否可操作
|
|
- promoProductClz: 'GATE', // 促销产品类型
|
|
|
|
promoRuleData: null, // 促销规则数据
|
|
promoRuleData: null, // 促销规则数据
|
|
tabList: [], // 促销产品选项卡
|
|
tabList: [], // 促销产品选项卡
|
|
rowSelectionInfo: null, // 已选择
|
|
rowSelectionInfo: null, // 已选择
|
|
@@ -196,7 +196,7 @@ export default {
|
|
},
|
|
},
|
|
// 切换tab
|
|
// 切换tab
|
|
changeTab (e) {
|
|
changeTab (e) {
|
|
- this.promoProductClz = e
|
|
|
|
|
|
+ this.queryParam.promoProductClz = e
|
|
this.resetSearchForm()
|
|
this.resetSearchForm()
|
|
// 清空表格选中项
|
|
// 清空表格选中项
|
|
this.$refs.table.clearSelected()
|
|
this.$refs.table.clearSelected()
|
|
@@ -226,6 +226,7 @@ export default {
|
|
this.promoRuleData = promo.promotionRule
|
|
this.promoRuleData = promo.promotionRule
|
|
this.queryParam.salesBillSn = data.salesBillSn
|
|
this.queryParam.salesBillSn = data.salesBillSn
|
|
this.queryParam.salesPromoSn = promo.salesPromoSn
|
|
this.queryParam.salesPromoSn = promo.salesPromoSn
|
|
|
|
+ this.queryParam.promoRuleSn = promo.salesPromoSn
|
|
// 选项卡数据
|
|
// 选项卡数据
|
|
const tabList = []
|
|
const tabList = []
|
|
if (this.promoRuleData) {
|
|
if (this.promoRuleData) {
|
|
@@ -237,7 +238,7 @@ export default {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.tabList = tabList
|
|
this.tabList = tabList
|
|
- this.promoProductClz = tabList && tabList.length ? tabList[0].val:''
|
|
|
|
|
|
+ this.queryParam.promoProductClz = tabList && tabList.length ? tabList[0].val : ''
|
|
this.tableHeight = window.innerHeight - 368
|
|
this.tableHeight = window.innerHeight - 368
|
|
this.resetSearchForm()
|
|
this.resetSearchForm()
|
|
},
|
|
},
|
|
@@ -257,10 +258,10 @@ export default {
|
|
const chooseDataList = this.rowSelectionInfo.selectedRows = this.rowSelectionInfo.selectedRows.map(item => {
|
|
const chooseDataList = this.rowSelectionInfo.selectedRows = this.rowSelectionInfo.selectedRows.map(item => {
|
|
item.borrowFlag = 1
|
|
item.borrowFlag = 1
|
|
item.salesBillSn = this.queryParam.salesBillSn
|
|
item.salesBillSn = this.queryParam.salesBillSn
|
|
- item.promotionFlag = this.promoProductClz
|
|
|
|
|
|
+ item.promotionFlag = this.queryParam.promoProductClz
|
|
return item
|
|
return item
|
|
})
|
|
})
|
|
- this.$emit('add', chooseDataList, this.promoProductClz)
|
|
|
|
|
|
+ this.$emit('add', chooseDataList, this.queryParam.promoProductClz)
|
|
},
|
|
},
|
|
// 选择产品分类 change
|
|
// 选择产品分类 change
|
|
changeProductType (val, opt) {
|
|
changeProductType (val, opt) {
|