|
@@ -303,7 +303,7 @@
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<div style="width: 83%;margin:0 auto 10px;">
|
|
|
- <productTable ref="chooseProduct" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
|
|
|
+ <productTable ref="chooseProductList" :promoActiveSn="$route.params.sn" :disabledVal="isDisabled"></productTable>
|
|
|
</div>
|
|
|
</a-col>
|
|
|
<a-col
|
|
@@ -444,8 +444,8 @@ export default {
|
|
|
ruleBaseType: [{ required: true, message: '请选择生成方式', trigger: 'change' }],
|
|
|
validType: [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
|
|
|
publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }],
|
|
|
- dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }],
|
|
|
- range: [{ required: true, message: '请选择', trigger: 'blur' }]
|
|
|
+ dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }]
|
|
|
+ // range: [{ required: true, message: '请选择', trigger: 'blur' }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -533,7 +533,6 @@ export default {
|
|
|
const _this = this
|
|
|
if (_this.form.contentType === 'LINK') {
|
|
|
_this.form.content = _this.form.contentLink
|
|
|
- _this.sellForm.range = '1'
|
|
|
// 验证组件必填项
|
|
|
_this.$refs.ruleForm.validate(valid => {
|
|
|
if (valid) {
|
|
@@ -587,21 +586,28 @@ export default {
|
|
|
if (formData.promoRule.productRangeList && formData.promoRule.productRangeList.length > 0) {
|
|
|
formData.promoRule.productRangeList = formData.promoRule.productRangeList.map(item => { return { productTypeSn: item } })
|
|
|
}
|
|
|
- if (this.form.linkType === '1') {
|
|
|
- if (this.sellForm.validType === 'FIXED') {
|
|
|
- if (!this.sellForm.validStartDate || this.sellForm.validStartDate.validEndDate) {
|
|
|
- this.$message.warning('请输入券有效期!')
|
|
|
+ if (_this.form.linkType === '1') {
|
|
|
+ if (_this.sellForm.validType === 'FIXED') {
|
|
|
+ if (!_this.sellForm.validStartDate || _this.sellForm.validStartDate.validEndDate) {
|
|
|
+ _this.$message.warning('请输入券有效期!')
|
|
|
return false
|
|
|
}
|
|
|
} else {
|
|
|
- if (!this.sellForm.validDays) {
|
|
|
- this.$message.warning('请输入券有效期!')
|
|
|
+ if (!_this.sellForm.validDays) {
|
|
|
+ _this.$message.warning('请输入券有效期!')
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- formData.dealerEditFlag = this.sellForm.dealerEditFlag
|
|
|
- formData.publishFlag = this.sellForm.publishFlag
|
|
|
+ formData.dealerEditFlag = _this.sellForm.dealerEditFlag
|
|
|
+ formData.publishFlag = _this.sellForm.publishFlag
|
|
|
+ const numInfo = _this.$refs.chooseProductList.getDataNum()
|
|
|
+ if (numInfo == 0) {
|
|
|
+ if (!_this.sellForm.validDays) {
|
|
|
+ _this.$message.warning('请选择返券产品!')
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
_this.spinning = true
|
|
|
promoActivePublish(formData).then(res => {
|