|
@@ -47,7 +47,7 @@
|
|
|
<v-select
|
|
|
v-model="queryParam.promoState"
|
|
|
ref="promoState"
|
|
|
- :notIn="['HAVE_DISCARD','IS_OVER']"
|
|
|
+ :notIn="['IS_OVER']"
|
|
|
id="promoProducts-promoState"
|
|
|
code="SHOP_PROMO_PROMO_STATE"
|
|
|
placeholder="请选择促销状态"
|
|
@@ -119,7 +119,7 @@
|
|
|
<template slot="promoRules" slot-scope="text, record">
|
|
|
<span v-if="record.promoType==='BUY_PROD_GIVE_PROD'&&record.conditionValue&&record.resultValue">买{{ record.conditionValue }}赠{{ record.resultValue }}</span>
|
|
|
<div v-else-if="record.promoType==='PROMO_PROD'&&(record.shopProductPrice||record.shopProductPrice ==0)&&(record.conditionValue||record.conditionValue==0)">
|
|
|
- <span>优惠{{ (record.shopProductPrice - record.conditionValue).toFixed(2) }}元</span>s
|
|
|
+ <span>优惠{{ (record.shopProductPrice - record.conditionValue).toFixed(2) }}元</span>
|
|
|
</div>
|
|
|
<span v-else-if="record.promoType==='BUY_PROD_GIVE_VALID'&&record.resultValue">返{{ record.resultValue ? record.resultValue.toFixed(2):'--' }}元</span>
|
|
|
<span v-else>--</span>
|
|
@@ -181,7 +181,7 @@ export default {
|
|
|
categorySn: undefined, // 商城类目
|
|
|
shopProductStatus: undefined, // 商城状态
|
|
|
shopProductDelFlag: 0, // 促销产品标志
|
|
|
- promoStateList: ['NOT_RELEASE', 'HAVE_RELEASE']// 促销列表只查询这两种状态
|
|
|
+ promoStateList: ['NOT_RELEASE', 'HAVE_RELEASE', 'IS_CLOSE']// 促销列表只查询这两种状态
|
|
|
},
|
|
|
categoryOptions: [], // 产品类目列表
|
|
|
fieldNames: { label: 'categoryName', value: 'categorySn', children: 'shopCategoryList' },
|
|
@@ -249,7 +249,7 @@ export default {
|
|
|
this.queryParam.shopProductStatus = undefined
|
|
|
this.queryParam.categorySn = undefined
|
|
|
this.queryParam.shopProductDelFlag = 0
|
|
|
- this.queryParam.promoStateList = ['NOT_RELEASE', 'HAVE_RELEASE']
|
|
|
+ this.queryParam.promoStateList = ['NOT_RELEASE', 'HAVE_RELEASE', 'IS_CLOSE']
|
|
|
this.productType = []
|
|
|
this.category = []
|
|
|
this.$refs.table.refresh()
|