|
@@ -57,6 +57,29 @@
|
|
<v-select code="FLAG" v-model="queryParam.unitFlag" allowClear placeholder="请选择是否满足起订量"></v-select>
|
|
<v-select code="FLAG" v-model="queryParam.unitFlag" allowClear placeholder="请选择是否满足起订量"></v-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
</a-col>
|
|
</a-col>
|
|
|
|
+ <a-col flex="1">
|
|
|
|
+ <a-form-item label="产品类型">
|
|
|
|
+ <a-select
|
|
|
|
+ v-model="queryParam.promotionFlag"
|
|
|
|
+ id="salesEdit-promoFlag"
|
|
|
|
+ allowClear
|
|
|
|
+ :dropdownMatchSelectWidth="false"
|
|
|
|
+ placeholder="请选择产品类型">
|
|
|
|
+ <a-select-option value="REGULAR">
|
|
|
|
+ 正价产品(活动)
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="DISCOUNT">
|
|
|
|
+ 特价产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="GIFT">
|
|
|
|
+ 促销产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ <a-select-option value="GATE">
|
|
|
|
+ 门槛产品
|
|
|
|
+ </a-select-option>
|
|
|
|
+ </a-select>
|
|
|
|
+ </a-form-item>
|
|
|
|
+ </a-col>
|
|
<a-col flex="1">
|
|
<a-col flex="1">
|
|
<a-form-item label="累计产品">
|
|
<a-form-item label="累计产品">
|
|
<v-select code="FLAG" v-model="queryParam.borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
|
|
<v-select code="FLAG" v-model="queryParam.borrowFlag" allowClear placeholder="请选择是否累计产品"></v-select>
|
|
@@ -244,7 +267,8 @@ export default {
|
|
productTypeSn1: '', // 产品一级分类
|
|
productTypeSn1: '', // 产品一级分类
|
|
productTypeSn2: '', // 产品二级分类
|
|
productTypeSn2: '', // 产品二级分类
|
|
productTypeSn3: '', // 产品三级分类
|
|
productTypeSn3: '', // 产品三级分类
|
|
- borrowFlag: undefined, // 是否累计产品
|
|
|
|
|
|
+ promotionFlag: undefined, // 是否累计产品
|
|
|
|
+ promoFlag: undefined,
|
|
unitFlag: undefined // 是否满足起订量
|
|
unitFlag: undefined // 是否满足起订量
|
|
},
|
|
},
|
|
productType: [], // 已选产品分类
|
|
productType: [], // 已选产品分类
|
|
@@ -369,7 +393,7 @@ export default {
|
|
title="点击查看详情"
|
|
title="点击查看详情"
|
|
style="padding:5px 0;cursor: pointer;"
|
|
style="padding:5px 0;cursor: pointer;"
|
|
onClick={() => _this.showRuleDetail(item)}
|
|
onClick={() => _this.showRuleDetail(item)}
|
|
- >{ _this.activeRuleFilter(item) }</div>
|
|
|
|
|
|
+ >{ _this.activeRuleFilter(item, row) }</div>
|
|
)
|
|
)
|
|
})}
|
|
})}
|
|
</template>
|
|
</template>
|
|
@@ -547,8 +571,8 @@ export default {
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
this.queryParam.salesBillSn = this.salesBillSn || ''
|
|
this.queryParam.salesPromoSnSet = this.salesPromoSnSet || []
|
|
this.queryParam.salesPromoSnSet = this.salesPromoSnSet || []
|
|
salesDetailExtPromoList(Object.assign(this.queryParam, {
|
|
salesDetailExtPromoList(Object.assign(this.queryParam, {
|
|
- showStock: true,
|
|
|
|
- promoFlag: this.detailData.promoFlag
|
|
|
|
|
|
+ showStock: true
|
|
|
|
+ // promoFlag: this.detailData.promoFlag
|
|
})).then(res => {
|
|
})).then(res => {
|
|
let data = []
|
|
let data = []
|
|
if (res.status == 200) {
|
|
if (res.status == 200) {
|
|
@@ -572,9 +596,10 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 参与规则名称
|
|
// 参与规则名称
|
|
- activeRuleFilter (val) {
|
|
|
|
|
|
+ activeRuleFilter (val, data) {
|
|
const row = this.activeList.length && this.activeList.find(item => item.promoRuleSn == val)
|
|
const row = this.activeList.length && this.activeList.find(item => item.promoRuleSn == val)
|
|
- return row ? row.promotion.description + '-' + row.promotionRule.description : ''
|
|
|
|
|
|
+ const rule = data.salesPromoDetailList.find(item => item.promoRuleSn == val)
|
|
|
|
+ return row ? (row.promotionRule.promotionRuleTypeDictValue + '-' + row.promotion.description + '(' + row.promotionRule.description + ')') + (data.borrowFlag != 1 ? ',起订量:' + rule.promoUnit : '') : ''
|
|
},
|
|
},
|
|
// 查看参与规则详情
|
|
// 查看参与规则详情
|
|
showRuleDetail (promoRuleSn) {
|
|
showRuleDetail (promoRuleSn) {
|
|
@@ -619,6 +644,7 @@ export default {
|
|
this.queryParam.productTypeSn2 = ''
|
|
this.queryParam.productTypeSn2 = ''
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.queryParam.productTypeSn3 = ''
|
|
this.queryParam.borrowFlag = undefined
|
|
this.queryParam.borrowFlag = undefined
|
|
|
|
+ this.queryParam.promotionFlag = undefined
|
|
this.queryParam.unitFlag = undefined
|
|
this.queryParam.unitFlag = undefined
|
|
this.productType = []
|
|
this.productType = []
|
|
this.rowSelectionInfo = null
|
|
this.rowSelectionInfo = null
|