Skip to content

M
marketing
Commit 78f9a96f by caoyanzhi
Options

update; e袋洗菜单调整

parent aeb3511a
Showing with 30 additions and 55 deletions
src/views/ewash/analysis.vue
......@@ -3,8 +3,10 @@
<!-- 渠道分析 -->
<div class="dm-form__wrap" v-if="$route.meta.type !== 'shelf'">
<h3 class="dm-title__label">
<span class="card-chart__title">渠道分析</span>
<el-date-picker class="fr ml5 mr20" v-model="dateTime2" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="cardChannelAnalysis"></el-date-picker>
渠道分析
<div class="fr">
<el-date-picker class="ml5 mr20" v-model="dateTime2" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="cardChannelAnalysis"></el-date-picker>
</div>
</h3>
<el-table tooltipEffect="light" :data="tableList" style="width:100%" v-loading="loading">
<el-table-column v-for="(v, i) in tableHeader" :key="i" :align="v.align" :width="v.width" :min-width="v.minWidth" :prop="v.prop" :label="v.label" :formatter="v.formatter"></el-table-column>
......@@ -13,11 +15,13 @@
<!-- 卡券报表趋势分析 -->
<div class="dm-form__wrap">
<h3 class="dm-title__label clearfix">
<span class="card-chart__title">卡券报表趋势分析</span>
<el-date-picker class="fr ml5 mr20" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="cardTrendEchart"></el-date-picker>
<el-select class="fr w200" v-model="chartParams.kpiName" placeholder="选择状态" @change="cardTrendEchart">
<el-option v-for="(v, i) in kpiNameOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
卡券报表趋势分析
<div class="fr">
<el-select class="w200" v-model="chartParams.kpiName" placeholder="选择状态" @change="cardTrendEchart">
<el-option v-for="(v, i) in kpiNameOptions" :key="i" :label="v.label" :value="v.value"></el-option>
</el-select>
<el-date-picker class="ml5 mr20" v-model="dateTime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="cardTrendEchart"></el-date-picker>
</div>
</h3>
<div id="mountNode" ref="mountNode" v-show="list.length"></div>
<div class="chart--nodata" v-show="!list.length"></div>
......@@ -105,7 +109,6 @@ export default {
};
this.kpiNameOptions = [{ label: '领取次数', value: 'shelf-cards1' }, { label: '使用次数', value: 'shelf-cards2' }, { label: '销售额', value: 'shelf-cards3' }]; // eslint-disable-line
this.cardTrendEchart();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '卡券营销', path: '' }, { name: '卡券展架', path: '/card/shelf' }, { name: '卡券展架报表', path: '' }]); // eslint-disable-line
} else {
this.chartParams = {
kpiName: 'card-puton1',
......@@ -116,7 +119,6 @@ export default {
};
(this.kpiNameOptions = [{ label: '领取次数', value: 'card-puton1' }, { label: '使用次数', value: 'card-puton2' }, { label: '销售额', value: 'card-puton3' }]), this.cardChannelAnalysis(); // eslint-disable-line
this.cardTrendEchart();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: 'e袋洗服务', path: '' }, { name: '卡券报表', path: '' }]); // eslint-disable-line
}
},
methods: {
......@@ -238,7 +240,6 @@ export default {
.card-chart__title {
display: inline-block;
vertical-align: middle;
padding-top: 13px;
font-weight: 700;
}
</style>
src/views/ewash/form.js
......@@ -848,8 +848,5 @@ export default {
if (this.isAdd) {
this.$refs.storeCard.init();
}
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '/ewash/list' }, { name: `${this.isAdd ? '新增' : '编辑'}卡券`, path: '' }]); // eslint-disable-line
}
};
src/views/ewash/form.vue
......@@ -173,10 +173,10 @@
<dm-input class="w400" type="textarea" :rows="4" v-model="form.useDescript" :maxlength="500" :disabled="isInfo"></dm-input>
</el-form-item>
<div class="btn-wrap_fixed" :class="{ on: asideShow }">
<dm-form-bottom>
<el-button type="primary" @click="submitForm('form')" v-loading="submitLoading" v-show="!isInfo && canEdit && $store.state.marketing.appletEnable">保存</el-button>
<el-button @click="$router.go(-1)">返 回</el-button>
</div>
</dm-form-bottom>
</el-form>
<el-dialog title="适用类目" :visible.sync="ableCategoryVisible" width="500px">
<good-category ref="category" />
......
src/views/ewash/group-send.vue
<template>
<el-form class="content" :model="form" ref="form" :rules="rules" label-width="100px" v-loading="loading">
<div class="dm-form__wrap">
<h3 class="dm-title__label">基础设置</h3>
<div class="page-tip">风险提示：大规模投放卡券可能导致模板消息被封</div>
<h3 class="dm-title__label border-bottom">基础设置</h3>
<el-form-item label="活动名称" prop="putOnName">
<dm-input class="w250" v-model="form.putOnName" :maxlength="9" :disabled="isInfo"></dm-input>
</el-form-item>
......@@ -21,7 +22,7 @@
</el-form-item>
</div>
<div class="dm-form__wrap">
<h3 class="dm-title__label">会员设置</h3>
<h3 class="dm-title__label border-bottom">会员设置</h3>
<div class="pb20">
<span class="dm-input_label pr10">选择会员</span>
<el-radio :disabled="isInfo" v-model="form.memberType" :label="0">会员筛选</el-radio>
......@@ -45,7 +46,7 @@
</div>
<!-- 只有存在卡券的情况下出现卡券通知方式 -->
<section class="dm-form__wrap">
<h3 class="dm-title__label">卡券通知方式配置</h3>
<h3 class="dm-title__label border-bottom">卡券通知方式配置</h3>
<el-form-item label="通知方式" class="is-required" prop="noticeType">
<el-radio v-model="form.noticeType" :label="0" :disabled="!isEditTemplate || isInfo"
>不通知
......@@ -109,10 +110,10 @@
</div> -->
</el-form-item>
</section>
<div class="btn-wrap_fixed" :class="{ on: asideShow }">
<dm-form-bottom>
<el-button v-if="!isInfo" type="primary" @click="submit('form')">提 交</el-button>
<el-button @click="$router.go(-1)">返回</el-button>
</div>
</dm-form-bottom>
<var-dialog :options="options" :show.sync="varShow" @get-data="insetVar"></var-dialog>
<el-dialog title="修改模板消息" :visible.sync="editDialogShow" width="600px" :before-close="close">
<div class="ecm-msg__edit">
......@@ -241,23 +242,6 @@ export default {
created() {
this.listTemplateVariables();
this.sceneSettingList();
this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: 'e袋洗服务', path: '/ewash' }, { name: '服务列表', path: '/ewash/list' }, { name: '卡券群发', path: '' }]); // eslint-disable-line
},
mounted() {
this.$store.commit(
'mutations_layoutTips',
`<div class="layout--tips">
<i class="el-icon-info"></i>
风险提示：大规模投放卡券可能导致模板消息被封
</div>
`
);
setTimeout(_ => {
this.$store.commit('mutations_layoutTips', '');
}, 10000);
},
beforeDestroy() {
this.$store.commit('mutations_layoutTips', '');
},
methods: {
filterWord(prop) {
......
src/views/ewash/list.vue
......@@ -72,7 +72,6 @@ export default {
created() {
window.scrollTo(0, 0);
this.getTableList();
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '服务列表', path: '' }]); // eslint-disable-line
},
methods: {
//编辑库存 前置
......
src/views/ewash/statements-detail.vue
<template>
<div v-loading="loading">
<el-row>
<el-col :gutter="10" :span="18">
<div v-loading="loading" style="background: #f0f2f5">
<el-row :gutter="16">
<el-col :span="18">
<!-- 预约单信息 -->
<section class="dm-form__wrap statement-edit__info">
<h3 class="dm-title__label">预约单信息</h3>
<h3 class="dm-title__label border-bottom">预约单信息</h3>
<el-row :gutter="20">
<el-col :span="12">
<span class="primary-font-color">达摩订单号：</span><span class="regular-font-color">{{ info.orderNumber || '--' }}</span>
......@@ -51,7 +51,7 @@
</section>
<!-- e袋洗订单信息 -->
<section class="dm-form__wrap statement-edit__info">
<h3 class="dm-title__label">e袋洗订单信息</h3>
<h3 class="dm-title__label border-bottom">e袋洗订单信息</h3>
<el-row :gutter="20">
<el-col :span="12">
<span class="primary-font-color">e袋洗单号：</span><span class="regular-font-color">{{ info.edaixiOrderNumber || '--' }}</span>
......@@ -97,7 +97,7 @@
</section>
<!-- 分拣信息 status > 5 && status !== 10 -->
<section class="dm-form__wrap statement-edit__info" v-if="info.status > 5 && info.status !== 10">
<h3 class="dm-title__label">分拣明细</h3>
<h3 class="dm-title__label border-bottom">分拣明细</h3>
<el-table :data="sortTable" style="width: 100%" class="mt20">
<el-table-column prop="categoryName" label="名称" minWidth="180"></el-table-column>
<el-table-column prop="total" label="数量" minWidth="180"></el-table-column>
......@@ -121,7 +121,7 @@
</el-col>
<el-col :span="6">
<section class="dm-form__wrap statement-edit__info ml5">
<h3 class="dm-title__label"><i class="el-icon-s-order primary-color mr5"></i>订单状态</h3>
<h3 class="dm-title__label border-bottom"><i class="el-icon-s-order primary-color mr5"></i>订单状态</h3>
<el-timeline>
<el-timeline-item v-for="(order, index) in orderStatus" :key="index" :icon="order.icon" :type="order.type" :color="order.color" :size="order.size" :timestamp="order.timestamp">
{{ order.content }}
......@@ -129,7 +129,7 @@
</el-timeline>
</section>
<section class="dm-form__wrap statement-edit__info ml5">
<h3 class="dm-title__label"><i class="el-icon-location danger-color mr5"></i>物流跟踪</h3>
<h3 class="dm-title__label border-bottom"><i class="el-icon-location danger-color mr5"></i>物流跟踪</h3>
<el-timeline v-if="logistics.length">
<el-timeline-item v-for="(logistic, index) in logistics" :key="index" :color="index === logistics.length - 1 ? '#f5222d' : ''" :timestamp="logistic.time" :size="logistic.size">
{{ logistic.text }}
......@@ -243,14 +243,14 @@ export default {
},
mounted() {
this.handleDetail();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '门店管理', path: '/ewash/store' }, { name: 'e袋洗账单', path: '/ewash/statements' }, { name: '账单详情', path: '' }]);
}
};
</script>
<style lang="scss" scoped>
.dm-form__wrap + .dm-form__wrap {
margin-top: 20px;
}
.statement-edit {
&__info {
/deep/ .el-col {
......
src/views/ewash/statements.vue
......@@ -82,9 +82,6 @@ export default {
mounted() {
this.getTableList();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '门店管理', path: '/ewash/store' }, { name: 'e袋洗账单', path: '' }]); // eslint-disable-line
},
methods: {
formatDateTimeByType,
exportExcel() {
......
src/views/ewash/store-list.vue
......@@ -119,9 +119,6 @@ export default {
},
mounted() {
this.getTableList();
},
created() {
this.$store.commit('mutations_breadcrumb', [{ name: 'e袋洗服务', path: '' }, { name: '门店管理', path: '/ewash/store' }]); // eslint-disable-line
}
};
</script>
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