|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div class="promotionEdit-wrap" :style="{paddingBottom: (form.contentType ==='LINK'&&form.linkType==='1')?'10px':'51px'}">
|
|
|
+ <div class="promotionEdit-wrap">
|
|
|
<a-spin :spinning="spinning" tip="Loading...">
|
|
|
<a-page-header :ghost="false" :backIcon="false" class="promotionEdit-cont" >
|
|
|
<!-- 自定义的二级文字标题 -->
|
|
@@ -62,7 +62,7 @@
|
|
|
width="80"
|
|
|
height="80"
|
|
|
v-for="(con,i) in imageSet"
|
|
|
- style="margin-right:10px;"
|
|
|
+ style="margin-right:10px;object-fit: cover;"
|
|
|
:key="i" />
|
|
|
</div>
|
|
|
<span class="upload-desc">说明:单张大小小于10Mb,最多10张;建议尺寸:宽(420px)*高(230px)</span>
|
|
@@ -146,6 +146,20 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
+ <a-row v-if="form.contentType !='LINK' ||(form.contentType ==='LINK'&&form.linkType==='2') ">
|
|
|
+ <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
+ <a-form-model-item label="是否发布" prop="publishFlag">
|
|
|
+ <a-radio-group button-style="solid" v-model="form.publishFlag">
|
|
|
+ <a-radio-button value="1">
|
|
|
+ 是
|
|
|
+ </a-radio-button>
|
|
|
+ <a-radio-button value="0">
|
|
|
+ 否
|
|
|
+ </a-radio-button>
|
|
|
+ </a-radio-group>
|
|
|
+ </a-form-model-item>
|
|
|
+ </a-col>
|
|
|
+ </a-row>
|
|
|
</a-form-model>
|
|
|
<a-form-model
|
|
|
id="setPromotion-form"
|
|
@@ -234,7 +248,7 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
- <a-form-model-item class="productName" label="券适用范围" prop="range">
|
|
|
+ <a-form-model-item class="productName" label="券适用范围" prop="ruleName">
|
|
|
全部产品
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
@@ -268,7 +282,7 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
- <a-form-model-item label="返券产品">
|
|
|
+ <a-form-model-item label="返券产品" prop="ruleName">
|
|
|
<div class="productInfo flex-center">
|
|
|
<div>
|
|
|
返券金额<a-input-number
|
|
@@ -298,7 +312,7 @@
|
|
|
:lg="24"
|
|
|
:xl="24">
|
|
|
<a-form-model-item label="加盟商编辑" prop="dealerEditFlag">
|
|
|
- <a-radio-group button-style="solid" :disabled="isDisabled" v-model="form.dealerEditFlag">
|
|
|
+ <a-radio-group button-style="solid" :disabled="isDisabled" v-model="sellForm.dealerEditFlag">
|
|
|
<a-radio-button value="1">
|
|
|
是
|
|
|
</a-radio-button>
|
|
@@ -310,7 +324,7 @@
|
|
|
</a-col>
|
|
|
<a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
<a-form-model-item label="是否发布" prop="publishFlag">
|
|
|
- <a-radio-group button-style="solid" v-model="form.publishFlag">
|
|
|
+ <a-radio-group button-style="solid" v-model="sellForm.publishFlag">
|
|
|
<a-radio-button value="1">
|
|
|
是
|
|
|
</a-radio-button>
|
|
@@ -321,21 +335,6 @@
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
- <a-row v-if="form.contentType !='LINK' ||(form.contentType ==='LINK'&&form.linkType==='2') ">
|
|
|
- <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
|
|
|
- <a-form-model-item label="是否发布" prop="publishFlag">
|
|
|
- <a-radio-group button-style="solid" v-model="form.publishFlag">
|
|
|
- <a-radio-button value="1">
|
|
|
- 是
|
|
|
- </a-radio-button>
|
|
|
- <a-radio-button value="0">
|
|
|
- 否
|
|
|
- </a-radio-button>
|
|
|
- </a-radio-group>
|
|
|
- </a-form-model-item>
|
|
|
- </a-col>
|
|
|
- </a-row>
|
|
|
- </a-form-model>
|
|
|
</a-form-model>
|
|
|
</a-card>
|
|
|
</a-spin>
|
|
@@ -350,8 +349,6 @@
|
|
|
v-if="form.contentType !='LINK'|| isShowNextStep ||(form.contentType ==='LINK'&&form.linkType ==='2')"
|
|
|
style="padding: 0 60px;">保存</a-button>
|
|
|
</div>
|
|
|
- <!-- 预览 -->
|
|
|
- <promotion-show-modal ref="showModal" :openModal="openShowModal" @close="openShowModal = false"></promotion-show-modal>
|
|
|
<!-- 添加产品 -->
|
|
|
<chooseProduct
|
|
|
ref="chooseProduct"
|
|
@@ -365,13 +362,15 @@
|
|
|
<script>
|
|
|
import { commonMixin } from '@/utils/mixin'
|
|
|
import moment from 'moment'
|
|
|
+// 组件
|
|
|
import { VSelect, Upload } from '@/components'
|
|
|
import Editor from '@/components/WEeditor'
|
|
|
-import { promoActivePublish, promoActiveDetail, saveBatchEntity, promoCreateBatch, deleteByProductType } from '@/api/promoActive'
|
|
|
import promotionShowModal from './promotionShowModal'
|
|
|
import productTable from './productTable'
|
|
|
import chooseProduct from './chooseProductsModal.vue'
|
|
|
+// 接口
|
|
|
import { productTypeQuery } from '@/api/productType'
|
|
|
+import { promoActivePublish, promoActiveDetail, saveBatchEntity, promoCreateBatch, deleteByProductType } from '@/api/promoActive'
|
|
|
export default {
|
|
|
name: 'ProductBrandEditModal',
|
|
|
mixins: [commonMixin],
|
|
@@ -379,10 +378,12 @@ export default {
|
|
|
data () {
|
|
|
return {
|
|
|
spinning: false,
|
|
|
+ // 第一个表单 label 设置
|
|
|
formItemLayout: {
|
|
|
labelCol: { span: 2 },
|
|
|
wrapperCol: { span: 20 }
|
|
|
},
|
|
|
+ // 第二个表单 label 设置
|
|
|
sellFormItemLayout: {
|
|
|
labelCol: { span: 2 }, // 文字前距离设置
|
|
|
wrapperCol: { span: 20 }// 表单后距离设置 数字越大距离越小
|
|
@@ -393,18 +394,16 @@ export default {
|
|
|
imageSet: '', // 图片
|
|
|
contentType: 'IMAGE_CONTENT', // 内容类型
|
|
|
content: '', // 内容
|
|
|
+ ruleEnableFlag: '1', // 参属配置 1 是 0否
|
|
|
contentLink: '', // 链接内容
|
|
|
sort: undefined, // 排序
|
|
|
- ruleEnableFlag: '1', // 参数配置 1勾选配置 0不能配置
|
|
|
- publishFlag: '0',
|
|
|
+ publishFlag: '0', // 是否发布
|
|
|
dealerEditFlag: '0', // 加盟商编辑 1是 0否
|
|
|
- promoRule: {},
|
|
|
- publishState: 'UNPUBLISH'
|
|
|
+ promoRule: {} // 链接配置内容
|
|
|
},
|
|
|
// 参数配置数据
|
|
|
sellForm: {
|
|
|
ruleType: 'ticket', // 基本规则类型
|
|
|
- productRangeFlag: '', // 产品范围标记 0无 1有产品范围
|
|
|
productRangeList: [], // 产品范围列表
|
|
|
ruleName: '', // 券名称
|
|
|
ruleTitle: '', // 副标题
|
|
@@ -414,55 +413,35 @@ export default {
|
|
|
validStartDate: undefined, // 券生效时间
|
|
|
validEndDate: undefined, // 券失效时间
|
|
|
validDays: undefined, // 券有效期天数
|
|
|
- range: '1',
|
|
|
- // 券内容
|
|
|
- ruleDetailList: []
|
|
|
+ dealerEditFlag: '0', // 加盟商编辑 1是 0否
|
|
|
+ publishFlag: '0' // 是否发布
|
|
|
},
|
|
|
time: [], // 有效期
|
|
|
- promotionName: '',
|
|
|
- dateFormat: 'YYYY-MM-DD',
|
|
|
+ dateFormat: 'YYYY-MM-DD', // 有效期时间格式
|
|
|
+ promotionName: '', // 促销名称
|
|
|
pageType: undefined, // 页面类型
|
|
|
- showProModal: false,
|
|
|
- isShowNextStep: false, // 是否显示下一步 配置产品
|
|
|
- openShowModal: false,
|
|
|
- isDisabled: false, // 控制是否能编辑
|
|
|
- chooseTypeList: [],
|
|
|
- chooseProductList: [],
|
|
|
+ showProModal: false, // 打开产品弹窗
|
|
|
+ isShowNextStep: false, // 是否显示下一步 并提交一半配置产品
|
|
|
+ isDisabled: false, // 控制页面是否能编辑
|
|
|
+ chooseTypeList: [], // 已选中产品范围
|
|
|
imageSet: [], // 回显显示图片数据
|
|
|
- productTypeList: [],
|
|
|
+ productTypeList: [], // 产品范围 列表数据
|
|
|
rules: {
|
|
|
- title: [
|
|
|
- { required: true, message: '请输入标题名称', trigger: 'blur' }
|
|
|
- ],
|
|
|
- imageSet: [
|
|
|
- { required: true, message: '请选择要上传的封面图片', trigger: 'change' }
|
|
|
- ],
|
|
|
- sort: [
|
|
|
- { required: true, message: '请输入排序数字', trigger: 'blur' }
|
|
|
- ],
|
|
|
- contentType: [
|
|
|
- { required: true, message: '请选择内容类型', trigger: 'change' }
|
|
|
- ],
|
|
|
- content: [
|
|
|
- { required: true, message: '请输入对应内容', trigger: ['blur', 'change'] }
|
|
|
- ],
|
|
|
- contentLink: [
|
|
|
- { required: true, message: '请输入对应内容', trigger: 'blur' }
|
|
|
- ],
|
|
|
- publishFlag: [
|
|
|
- { required: true, message: '请选择是否发布', trigger: 'change' }
|
|
|
- ],
|
|
|
- range: [
|
|
|
- { required: true, message: '请选择券适用范围', trigger: 'change' }
|
|
|
- ]
|
|
|
+ title: [{ required: true, message: '请输入标题名称', trigger: 'blur' }],
|
|
|
+ imageSet: [{ required: true, message: '请选择要上传的封面图片', trigger: 'change' }],
|
|
|
+ sort: [{ required: true, message: '请输入排序数字', trigger: 'blur' }],
|
|
|
+ contentType: [{ required: true, message: '请选择内容类型', trigger: 'change' }],
|
|
|
+ content: [{ required: true, message: '请输入对应内容', trigger: ['blur', 'change'] }],
|
|
|
+ contentLink: [{ required: true, message: '请输入对应内容', trigger: 'blur' }],
|
|
|
+ publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }]
|
|
|
},
|
|
|
sellRules: {
|
|
|
ruleType: [{ required: true, message: '请选择基本规则', trigger: 'change' }],
|
|
|
ruleName: [{ required: true, message: '请输入券名称', trigger: ['change', 'blur'] }],
|
|
|
ruleBaseType: [{ required: true, message: '请选择生成方式', trigger: 'change' }],
|
|
|
validType: [{ required: true, message: '请选择券有效期类型', trigger: 'change' }],
|
|
|
- ruleDetailList: [{ type: 'array', required: true, message: '请选择券内容', trigger: 'blur' }]
|
|
|
- // dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }]
|
|
|
+ publishFlag: [{ required: true, message: '请选择是否发布', trigger: 'change' }],
|
|
|
+ dealerEditFlag: [{ required: true, message: '请选择加盟商是否可编辑', trigger: 'change' }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -503,8 +482,11 @@ export default {
|
|
|
// 编辑按钮时,publishState 已发布,只能编辑是否发布;publishState已关闭,都可以编辑
|
|
|
if (_this.pageType === 'edit') {
|
|
|
_this.isDisabled = res.data.publishState === 'PUBLISH'
|
|
|
- _this.form.publishFlag = res.data.publishFlag
|
|
|
+ _this.sellForm.publishFlag = res.data.publishFlag
|
|
|
+ _this.sellForm.dealerEditFlag = res.data.dealerEditFlag
|
|
|
}
|
|
|
+ _this.form.publishFlag = res.data.publishFlag
|
|
|
+ _this.form.dealerEditFlag = res.data.dealerEditFlag
|
|
|
_this.form.promoActiveSn = res.data.promoActiveSn
|
|
|
_this.form.title = res.data.title
|
|
|
_this.form.contentType = res.data.contentType
|
|
@@ -513,7 +495,7 @@ export default {
|
|
|
if (res.data.imageSet) {
|
|
|
const images = res.data.imageSet.join(',')
|
|
|
_this.form.imageSet = images
|
|
|
- if (this.pageType === 'add') {
|
|
|
+ if (this.pageType === 'add' || (this.pageType === 'edit' && res.data.publishState != 'PUBLISH')) {
|
|
|
_this.$refs.imageSet.setFileList(images)
|
|
|
}
|
|
|
}
|
|
@@ -603,16 +585,18 @@ export default {
|
|
|
if (this.form.linkType === '1') {
|
|
|
if (this.sellForm.validType === 'FIXED') {
|
|
|
if (!this.sellForm.validStartDate || this.sellForm.validStartDate.validEndDate) {
|
|
|
- this.$message.warning('请选择固定日期!')
|
|
|
+ this.$message.warning('请输入券有效期!')
|
|
|
return false
|
|
|
}
|
|
|
} else {
|
|
|
if (!this.sellForm.validDays) {
|
|
|
- this.$message.warning('请输入有效天数!')
|
|
|
+ this.$message.warning('请输入券有效期!')
|
|
|
return false
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ formData.dealerEditFlag = this.sellForm.dealerEditFlag
|
|
|
+ formData.publishFlag = this.sellForm.publishFlag
|
|
|
}
|
|
|
_this.spinning = true
|
|
|
promoActivePublish(formData).then(res => {
|
|
@@ -666,25 +650,25 @@ export default {
|
|
|
content: '', // 内容
|
|
|
contentLink: '', // 链接内容
|
|
|
sort: undefined, // 排序
|
|
|
- ruleEnableFlag: '1', // 参数配置 1勾选配置 0不能配置
|
|
|
- publishState: 'UNPUBLISH', // 是否发布
|
|
|
+ publishFlag: '0', // 是否发布
|
|
|
dealerEditFlag: '0', // 加盟商编辑 1是 0否
|
|
|
- // 参数配置数据
|
|
|
- promoRule: {
|
|
|
- ruleType: 'ticket', // 基本规则类型
|
|
|
- productRangeFlag: '', // 产品范围标记 0无 1有产品范围
|
|
|
- productRangeList: [], // 产品范围列表
|
|
|
- ruleName: '', // 券名称
|
|
|
- ruleTitle: '', // 副标题
|
|
|
- ruleBaseType: 'category', // 券生成方式
|
|
|
- ruleExplain: '', // 使用说明
|
|
|
- validType: undefined, // 券有效期类型
|
|
|
- validStartDate: undefined, // 券生效时间
|
|
|
- validEndDate: undefined, // 券失效时间
|
|
|
- validDays: undefined, // 券有效期天数
|
|
|
- // 券内容
|
|
|
- ruleDetailList: []
|
|
|
- }
|
|
|
+ ruleEnableFlag: '1',
|
|
|
+ promoRule: {} // 链接配置内容
|
|
|
+ }
|
|
|
+ // 参数配置数据
|
|
|
+ this.sellForm = {
|
|
|
+ ruleType: 'ticket', // 基本规则类型
|
|
|
+ productRangeList: [], // 产品范围列表
|
|
|
+ ruleName: '', // 券名称
|
|
|
+ ruleTitle: '', // 副标题
|
|
|
+ ruleBaseType: 'category', // 券生成方式
|
|
|
+ ruleExplain: '', // 使用说明
|
|
|
+ validType: undefined, // 券有效期类型
|
|
|
+ validStartDate: undefined, // 券生效时间
|
|
|
+ validEndDate: undefined, // 券失效时间
|
|
|
+ validDays: undefined, // 券有效期天数
|
|
|
+ dealerEditFlag: '0', // 加盟商编辑 1是 0否
|
|
|
+ publishFlag: '0' // 是否发布
|
|
|
}
|
|
|
this.isShowNextStep = false
|
|
|
this.isDisabled = false
|
|
@@ -694,6 +678,9 @@ export default {
|
|
|
if (this.$refs.ruleForm) {
|
|
|
this.$refs.ruleForm.resetFields()
|
|
|
}
|
|
|
+ if (this.$refs.ruleForm) {
|
|
|
+ this.$refs.ruleForm.resetFields()
|
|
|
+ }
|
|
|
},
|
|
|
// 获取产品范围数据
|
|
|
getTreeData () {
|
|
@@ -816,6 +803,7 @@ export default {
|
|
|
position: relative;
|
|
|
height: 100%;
|
|
|
box-sizing: border-box;
|
|
|
+ padding-bottom:51px;
|
|
|
>.ant-spin-nested-loading{
|
|
|
overflow-y: scroll;
|
|
|
height: 100%;
|