feature_0521
zhenghuang 5 years ago
parent ab777874ef
commit 4ab2dc27e7

@ -77,6 +77,7 @@
<useTable ref="useTable" <useTable ref="useTable"
@doShow="doShow" @doShow="doShow"
:show="showUse" :show="showUse"
:isModify="true"
:schedule="activityInstance.scheduleVO"></useTable> :schedule="activityInstance.scheduleVO"></useTable>
</div> </div>
</template> </template>

@ -1,67 +1,91 @@
<template> <template>
<div> <div>
<Form <Form ref="formValidate"
ref="formValidate"
:model="formValidate" :model="formValidate"
:rules="ruleValidate" :rules="ruleValidate"
:label-width="80" :label-width="80">
>
<Row> <Row>
<i-col span="20" offset="2"> <i-col span="20"
<FormItem label="活动名称" prop="name"> offset="2">
<FormItem label="活动名称"
prop="name">
<div> <div>
<i-input <i-input disabled
disabled
type="text" type="text"
v-model="schedule.name" v-model="schedule.name"
placeholder placeholder></i-input>
></i-input>
</div> </div>
</FormItem> </FormItem>
<div class="dateClass"> <div class="dateClass">
<Form-item label="活动时间" prop="activityStartDate"> <Form-item label="活动时间"
<Date-picker prop="activityStartDate">
@on-change="storeStartDate" <Date-picker @on-change="storeStartDate"
type="date"
v-if="isModify"
disabled
v-model="formValidate.beginTime"
format="yyyy-MM-dd"
placeholder="请选择开始日期"
style="width: 200px"></Date-picker>
<Date-picker @on-change="storeStartDate"
type="date" type="date"
v-else
v-model="formValidate.beginTime" v-model="formValidate.beginTime"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="请选择开始日期" placeholder="请选择开始日期"
style="width: 200px" style="width: 200px"></Date-picker>
></Date-picker>
</Form-item> </Form-item>
<div class="text"></div> <div class="text"></div>
<Form-item label prop="activityEndDate"> <Form-item label
<Date-picker prop="activityEndDate">
@on-change="storeEndDate" <Date-picker @on-change="storeEndDate"
type="date"
v-if="isModify"
disabled
v-model="formValidate.endTime"
format="yyyy-MM-dd"
placeholder="请选择结束日期"
style="width: 200px"></Date-picker>
<Date-picker @on-change="storeEndDate"
type="date" type="date"
v-else
v-model="formValidate.endTime" v-model="formValidate.endTime"
format="yyyy-MM-dd" format="yyyy-MM-dd"
placeholder="请选择结束日期" placeholder="请选择结束日期"
style="width: 200px" style="width: 200px"></Date-picker>
></Date-picker>
</Form-item> </Form-item>
</div> </div>
<FormItem label="活动类型" prop="activityStyle"> <FormItem label="活动类型"
<RadioGroup prop="activityStyle">
@on-change="onChange" <RadioGroup @on-change="onChange"
v-model="formValidate.activityStyle" v-model="formValidate.activityStyle"
vertical vertical>
> <Radio :border="true"
<Radio v-for="(item, index) in schedule.params"
:border="true" :key="index"
:label="item.id"
v-if="isModify"
disabled
style="margin-bottom: 10px">
<Icon type="social-apple"></Icon>
<span>{{
item.name
}}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
item.key
}}</span>
</Radio>
<Radio :border="true"
v-for="(item, index) in schedule.params" v-for="(item, index) in schedule.params"
:key="index" :key="index"
:label="item.id" :label="item.id"
style="margin-bottom: 10px" v-else
> style="margin-bottom: 10px">
<Icon type="social-apple"></Icon> <Icon type="social-apple"></Icon>
<span <span>{{
>{{
item.name item.name
}}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{ }}&nbsp;&nbsp;&nbsp;&nbsp;----&nbsp;&nbsp;&nbsp;&nbsp;{{
item.key item.key
}}</span }}</span>
>
</Radio> </Radio>
</RadioGroup> </RadioGroup>
</FormItem> </FormItem>
@ -76,7 +100,7 @@ import { mapGetters } from "vuex";
export default { export default {
name: "useActivityStepOne", name: "useActivityStepOne",
data() { data () {
return { return {
formValidate: store.getters.useData, formValidate: store.getters.useData,
ruleValidate: { ruleValidate: {
@ -105,8 +129,9 @@ export default {
}, },
props: { props: {
schedule: Object, schedule: Object,
isModify: Boolean
}, },
created() { created () {
let _this = this; let _this = this;
this.formValidate = store.getters.useData; this.formValidate = store.getters.useData;
this.formValidate.activityStyle = ""; this.formValidate.activityStyle = "";
@ -118,7 +143,7 @@ export default {
console.log(22, this.formValidate); console.log(22, this.formValidate);
}, },
methods: { methods: {
onChange(e) { onChange (e) {
let _this = this; let _this = this;
this.formValidate.activityStyle = e; this.formValidate.activityStyle = e;
let type = {}; let type = {};
@ -129,10 +154,10 @@ export default {
}); });
store.getters.useData.params = [type]; store.getters.useData.params = [type];
}, },
storeStartDate(date) { storeStartDate (date) {
store.getters.useData.beginTime = date; store.getters.useData.beginTime = date;
}, },
storeEndDate(date) { storeEndDate (date) {
store.getters.useData.endTime = date; store.getters.useData.endTime = date;
}, },
}, },

@ -1,60 +1,49 @@
<template> <template>
<div class="use_box"> <div class="use_box">
<Modal <Modal :scrollable="false"
:scrollable="false"
v-model="showUse" v-model="showUse"
title="使用活动" title="使用活动"
@on-cancel="cancel" @on-cancel="cancel"
:loading="true" :loading="true"
width="70%" width="70%">
> <Steps style="padding: 40px;"
<Steps style="padding: 40px;" :current="currentStep"> :current="currentStep">
<Step title="基本信息"></Step> <Step title="基本信息"></Step>
<Step title="选择零售公司" content></Step> <Step :title="isModify ? '修改零售公司' : '选择零售公司'"
<Step title="选择店铺" content></Step> content></Step>
<Step title="确认信息" content></Step> <Step :title="isModify ? '修改店铺' : '选择店铺'"
content></Step>
<Step title="确认信息"
content></Step>
</Steps> </Steps>
<useActivityStepOne <useActivityStepOne :schedule="schedule"
:schedule="schedule" :isModify="isModify"
v-if="currentStep == 0 && show" v-if="currentStep == 0 && show"></useActivityStepOne>
></useActivityStepOne> <useActivityStepTwo :schedule="schedule"
<useActivityStepTwo :isModify="isModify"
:schedule="schedule" v-if="currentStep == 1"></useActivityStepTwo>
v-if="currentStep == 1" <useActivityStepThree :schedule="schedule"
></useActivityStepTwo> :isModify="isModify"
<useActivityStepThree v-if="currentStep == 2"></useActivityStepThree>
:schedule="schedule" <useActivityStepFoure :schedule="schedule"
v-if="currentStep == 2" :isModify="isModify"
></useActivityStepThree> v-if="currentStep == 3"></useActivityStepFoure>
<useActivityStepFoure
:schedule="schedule"
v-if="currentStep == 3"
></useActivityStepFoure>
<div slot="footer"> <div slot="footer">
<Button <Button v-if="currentStep !== 0"
v-if="currentStep !== 0"
type="primary" type="primary"
shape="circle" shape="circle"
:loading="modal_loading" :loading="modal_loading"
@click="back" @click="back">上一步</Button>
>上一步</Button <Button v-if="currentStep !== 3"
>
<Button
v-if="currentStep !== 3"
type="primary" type="primary"
shape="circle" shape="circle"
:loading="modal_loading" :loading="modal_loading"
@click="next" @click="next">下一步</Button>
>下一步</Button <Button v-if="currentStep == 3"
>
<Button
v-if="currentStep == 3"
type="primary" type="primary"
shape="circle" shape="circle"
:loading="modal_loading" :loading="modal_loading"
@click="finish" @click="finish">完成</Button>
>完成</Button
>
</div> </div>
</Modal> </Modal>
</div> </div>
@ -74,7 +63,7 @@ export default {
useActivityStepThree, useActivityStepThree,
useActivityStepFoure, useActivityStepFoure,
}, },
data() { data () {
return { return {
currentStep: 0, currentStep: 0,
modal_loading: false, modal_loading: false,
@ -85,28 +74,29 @@ export default {
id: String, id: String,
schedule: Object, schedule: Object,
show: Boolean, show: Boolean,
isModify: Boolean
}, },
watch: { watch: {
show() { show () {
this.showUse = this.show; this.showUse = this.show;
}, },
schedule() { schedule () {
store.getters.useData.scheduleId = this.schedule.id; store.getters.useData.scheduleId = this.schedule.id;
}, },
}, },
mounted() {}, mounted () { },
methods: { methods: {
cancel() { cancel () {
this.currentStep = 0; this.currentStep = 0;
}, },
cancel() { cancel () {
store.commit("RSET_useData"); store.commit("RSET_useData");
this.$emit("doShow", false); this.$emit("doShow", false);
this.modal_loading = false; this.modal_loading = false;
this.showUse = false; this.showUse = false;
this.currentStep = 0; this.currentStep = 0;
}, },
next() { next () {
let data = store.getters.useData; let data = store.getters.useData;
data.name = this.schedule.name; data.name = this.schedule.name;
if (this.currentStep === 0) { if (this.currentStep === 0) {
@ -142,15 +132,15 @@ export default {
store.commit("SET_useData", data); store.commit("SET_useData", data);
this.currentStep = this.currentStep + 1; this.currentStep = this.currentStep + 1;
}, },
back() { back () {
this.currentStep = this.currentStep - 1; this.currentStep = this.currentStep - 1;
}, },
finish() { finish () {
let that = this; let that = this;
let data = store.getters.useData; let data = store.getters.useData;
data.isGetActivityInfo = true; data.isGetActivityInfo = true;
this.modal_loading = true; this.modal_loading = true;
ActivityManager.saveActivityData(store.getters.useData, function(data) { ActivityManager.saveActivityData(store.getters.useData, function (data) {
store.commit("RSET_useData"); store.commit("RSET_useData");
that.$emit("doShow", false); that.$emit("doShow", false);
that.$router.push("/activity/plan"); that.$router.push("/activity/plan");

Loading…
Cancel
Save