Skip to content

M
marketing
Commit 95818c46 by chenyu
Options

Merge branch 'feature/9月3.0迭代' of http://git.gicdev.com/marketing-web/marketing

parents 7a6dd130 a0006def
Showing with 48 additions and 10 deletions
index.html
......@@ -23,6 +23,7 @@
<!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.58.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-selector.1.0.6.js"></script>
<!-- <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.19.js"></script>卡券选择器 -->
<script src="//web-1251519181.file.myqcloud.com/components/store.2.0.01.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js"></script>
......
src/views/ecm/form.js
......@@ -39,6 +39,19 @@ export default {
// 自动领取设置
couponAutoGetFlag: 0, // 1开启自动领取 0关闭
couponAutoGetStock: 0, // 自动领取最大库存数
enterpriseId: '',
wihteList: [
// 'ff8080815dacd3a2015dacd3ef5c0000', // 金华达摩(测试环境)
'ff8080816a36326c016a53380d8b5f52', // 金华达摩
'ff8080816dd0385e016ddca436d01fe1', // Balabala
'ff8080816f334552016f59fa1eaa7802', // 乔丹
'ff808081734de4c6017375c148501364', // 七匹狼
'ff80808177da33a0017810c5374262c2', // 恒宣
'ff8080816dd03743016dd9062ac31c60', // 康奈
'ff80808171838eaf01719b44558d458d', // PIT
'ff80808163a84edb0163aee389832ed4', // HAZZYS
'ff8080816ed6a34f016f11d38ba97f87' // 迪赛尼斯
],
form: {
memberType: 0,
ecmPlanName: '',
......@@ -81,7 +94,9 @@ export default {
lowest_cost_count: '',
max_cost_count: '',
// store_mode: 0,
consumerStoreType: 0, // 0 固定门店 1 门店条件
order_store: '',
order_store_new: '',
storedLowest: 0,
storedMax: 0
},
......@@ -368,7 +383,7 @@ export default {
let res = await getEcmInfo({ ecmPlanId: this.$route.params.id, copy: this.isCopy ? 1 : undefined });
this.loading = false;
// 如果是模板重置不需要重置基本信息
if (!isResetTemplate) {
if (!isResetTemplate && res.result) {
const result = res.result.ecmDTO;
const commonScene = res.result.commonScene;
const consumTrigger = res.result.consumTrigger;
......@@ -459,13 +474,15 @@ export default {
// 处理消费触发
if (consumTrigger) {
// 触发门店初始化
if (this.form.effectAction === 'consume' && consumTrigger.store_mode) {
this.consumeChecked.store = Boolean(consumTrigger.store_mode) || false; /** 门店类型: 0: 所有门店, 1: 部分(包含部分门店, 部分分组等) **/
this.form.consumerStoreType = result.consumerStoreType || 0; /** 消费门店类型 **/
this.form.order_store = this.form.consumerStoreType === 0 ? consumTrigger.order_store : ''; /** 消费门店key值 **/
this.form.order_store_new = this.form.consumerStoreType === 1 ? consumTrigger.order_store : ''; /** 消费门店key值 **/
if (this.form.effectAction === 'consume' && consumTrigger.store_mode && result.consumerStoreType === 0) {
this.$nextTick(_ => {
this.$refs.storeCard.init();
});
}
this.consumeChecked.store = Boolean(consumTrigger.store_mode) || false; /** 门店类型: 0: 所有门店, 1: 部分(包含部分门店, 部分分组等) **/
this.form.order_store = consumTrigger.order_store || ''; /** 消费门店key值 **/
// 消费商品
if (res.result.goodsEnable && consumTrigger.goods_filter_id) {
this.xxSysp.goodsFilterId = consumTrigger.goods_filter_id || '';
......@@ -727,9 +744,9 @@ export default {
if (this.form.effectAction === 'consume') {
// 这里判断部分门店是否为空
if (this.consumeChecked.store && this.consumeChecked.store) {
let data = await this.$refs.storeCard.getRightList();
let data = this.form.consumerStoreType === 1 ? await this.$refs.newStoreCard.getList() : await this.$refs.storeCard.getRightList();
if (!data.length) {
this.$tips({ type: 'warning', message: '部分门店不能为空' });
this.$tips({ type: 'warning', message: '门店不能为空' });
return;
}
}
......@@ -873,7 +890,8 @@ export default {
// 门店
let consumeObj = {
store_mode: this.consumeChecked.store ? 1 : 0,
order_store: this.consumeChecked.store ? this.form.order_store : ''
consumerStoreType: this.form.consumerStoreType,
order_store: this.consumeChecked.store ? (this.form.consumerStoreType === 0 ? this.form.order_store : this.form.order_store_new) : ''
};
// 勾选消费金额 --不填代表没有上下限，不传该字段
if (this.consumeChecked.cost) {
......@@ -1228,7 +1246,11 @@ export default {
}
}
},
updated() {
this.enterpriseId = JSON.parse(localStorage.getItem('dmUserInfo')).enterpriseId;
},
mounted() {
this.enterpriseId = JSON.parse(localStorage.getItem('dmUserInfo')).enterpriseId;
const Profile = Vue.extend({
template: '<p>{{ alias }}{{ ppp }}</p>',
data: function() {
......
src/views/ecm/form.vue
......@@ -91,7 +91,7 @@
<el-form-item label="数据对话">
<template slot="label">
<span>数据对话</span>
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择，选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="300">
<el-tooltip class="item" effect="dark" content="数据对话为原营销活动。可不选择，选择后会将该营销活动的数据置于选择的数据对话中一起分析" :open-delay="200">
<i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
</el-tooltip>
</template>
......@@ -108,10 +108,25 @@
<p class="fz14 gray mb20 ml10">同时满足以下条件即可触发</p>
<el-form-item>
<div class="no_label_form_label">
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.store" @change="initStoreCardLeft">消费门店</el-checkbox>
<el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.store" @change="initStoreCardLeft"
>消费门店<el-tooltip class="item" effect="dark" :open-delay="200"
><template slot="content">固定门店：系统基于所选定的门店来判断是否触发<br />按门店条件：系统基于所选的门店条件下所包含的门店来实时判断是否触发；所选门店条件下门店发生变更，立即生效。</template><i style="margin-left:4px;cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i> </el-tooltip
></el-checkbox>
<div>
<span class="fz14 gray" v-show="!consumeChecked.store">所有消费门店</span>
<vue-gic-store-card v-bind="storeParams" :readonly="!isAdd" v-show="consumeChecked.store" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
<template v-if="consumeChecked.store">
<template v-if="wihteList.includes(enterpriseId)">
<el-radio-group :disabled="!isAdd" v-show="consumeChecked.store" v-model="form.consumerStoreType">
<el-radio :label="0">固定门店</el-radio>
<el-radio :label="1">按门店条件</el-radio>
</el-radio-group>
<vue-gic-store-card style="margin:20px 0 0 35px" v-if="form.consumerStoreType === 0" v-bind="storeParams" :readonly="!isAdd" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
<dm-store-selector style="margin:20px 0 0 35px" v-if="form.consumerStoreType === 1" ref="newStoreCard" :readonly="!isAdd" :uuid.sync="form.order_store_new"></dm-store-selector>
</template>
<template v-else>
<vue-gic-store-card v-bind="storeParams" :readonly="!isAdd" ref="storeCard" :uuid.sync="form.order_store"></vue-gic-store-card>
</template>
</template>
</div>
</div>
</el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment