zhenghuang
/
bsdgy-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
feature_0521
zhenghuang 5 years ago
parent 9a5da5ff12
commit 683ef7da59
3 changed files with 96 additions and 105 deletions
Show Stats Download Patch File Download Diff File

2
src/pages/activity/ActivityManager.vue
Unescape Escape View File

@ -27,7 +27,7 @@
</Card> </Card>
</i-col> </i-col>
</Row> </Row>
<Row> <Row v-show="roleCode === 'GLY-ADMIN'">
<i-col span="7" <i-col span="7"
offset="1"> offset="1">
<div @click="dispalyAddActivity('')" <div @click="dispalyAddActivity('')"

137
src/pages/activity/ActivityPlan.vue
Unescape Escape View File

@ -1,103 +1,92 @@
<template> <template>
<div> <div>
<Spin v-if="saving" fix>加载中...</Spin> <Spin v-if="saving"
<Form ref="formValidate" :model="formValidate" :label-width="80"> fix>加载中...</Spin>
<Form ref="formValidate"
:model="formValidate"
:label-width="80">
<Row :gutter="10"> <Row :gutter="10">
<i-col span="4"> <i-col span="4">
<FormItem label="选择日期" prop=""> <FormItem label="选择日期"
<Date-picker prop="">
v-model="formValidate.date" <Date-picker v-model="formValidate.date"
type="daterange" type="daterange"
placement="bottom-end" placement="bottom-end"
placeholder="选择日期区间" placeholder="选择日期区间"></Date-picker>
></Date-picker>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="6"> <i-col span="6">
<FormItem label="零售公司" prop=""> <FormItem label="零售公司"
<Select prop="">
v-model="formValidate.organizationId" <Select v-model="formValidate.organizationId"
filterable filterable
@on-change="selectCompany" @on-change="selectCompany"
placeholder="全部" placeholder="全部"
clearable clearable>
> <Option v-for="(item, index) in companyList"
<Option
v-for="(item, index) in companyList"
:key="index" :key="index"
:value="item.value" :value="item.value">{{ item.label }}
>{{ item.label }}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="6"> <i-col span="6">
<FormItem label="店铺" prop=""> <FormItem label="店铺"
<Select prop="">
v-model="formValidate.storeId" <Select v-model="formValidate.storeId"
filterable filterable
placeholder="全部" placeholder="全部"
clearable clearable>
> <Option v-for="(item, index) in shopList"
<Option
v-for="(item, index) in shopList"
:key="index" :key="index"
:value="item.value" :value="item.value">{{ item.label }}
>{{ item.label }}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="4"> <i-col span="4">
<FormItem label="活动状态" prop=""> <FormItem label="活动状态"
prop="">
<Select v-model="formValidate.status"> <Select v-model="formValidate.status">
<Option <Option v-for="(item, index) in activityStatusList"
v-for="(item, index) in activityStatusList"
:key="index" :key="index"
:value="item.value" :value="item.value">{{ item.label }}
>{{ item.label }}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="4"> <i-col span="4">
<Button type="primary" @click="searchTable">查询</Button> <Button type="primary"
@click="searchTable">查询</Button>
</i-col> </i-col>
</Row> </Row>
<Row style="margin-top:50px"> <Row style="margin-top:50px">
<Table <Table :loading="loading"
:loading="loading"
border border
@on-row-dblclick="showDetail" @on-row-dblclick="showDetail"
:columns="columns1" :columns="columns1"
:data="data" :data="data"></Table>
></Table> <Page :total="totalSize"
<Page
:total="totalSize"
:current="pageNum" :current="pageNum"
:page-size="pageSize" :page-size="pageSize"
show-elevator show-elevator
show-total show-total
placement="top" placement="top"
@on-change="handlePage" @on-change="handlePage"
class-name="ks-page" class-name="ks-page"></Page>
></Page>
</Row> </Row>
</Form> </Form>
<useTable <useTable ref="useTable"
ref="useTable"
@doShow="doShow" @doShow="doShow"
:show="showUse" :show="showUse"
:isModify="true" :isModify="true"
:schedule="activityInstance.scheduleVO" :schedule="activityInstance.scheduleVO"></useTable>
></useTable> <Modal v-model="isShowDetail"
<Modal
v-model="isShowDetail"
title="活动计划详情" title="活动计划详情"
width="70%" width="70%"
:footer-hide="true" :footer-hide="true">
> <planDetail v-if="isShowDetail"
<planDetail v-if="isShowDetail" :detail="detail"></planDetail> :detail="detail"></planDetail>
</Modal> </Modal>
</div> </div>
</template> </template>
@ -116,7 +105,7 @@ export default {
useTable, useTable,
planDetail, planDetail,
}, },
data() { data () {
const _this = this; const _this = this;
return { return {
loading: false, loading: false,
@ -178,7 +167,7 @@ export default {
{ {
title: "活动类型", title: "活动类型",
key: "scheduleVO.name", key: "scheduleVO.name",
render(h, params) { render (h, params) {
return h("span", params.row["params"][0]["defaultVal"]); return h("span", params.row["params"][0]["defaultVal"]);
}, },
}, },
@ -186,14 +175,14 @@ export default {
title: "活动时间", title: "活动时间",
key: "beginTime", key: "beginTime",
width: 230, width: 230,
render(h, params) { render (h, params) {
return h("span", params.row.beginTime + " - " + params.row.endTime); return h("span", params.row.beginTime + " - " + params.row.endTime);
}, },
}, },
{ {
title: "零售公司", title: "零售公司",
key: "shop", key: "shop",
render(h, params) { render (h, params) {
return h( return h(
"span", "span",
params.row.companyName + params.row.companyName +
@ -206,7 +195,7 @@ export default {
{ {
title: "店铺", title: "店铺",
key: "shop", key: "shop",
render(h, params) { render (h, params) {
return h( return h(
"span", "span",
params.row.storeName + params.row.storeName +
@ -219,21 +208,21 @@ export default {
{ {
title: "添加好友数", title: "添加好友数",
key: "addFriendNum", key: "addFriendNum",
render(h, params) { render (h, params) {
return h("span", (params.row.friends || 0) + "人"); return h("span", (params.row.friends || 0) + "人");
}, },
}, },
{ {
title: "参与活动客户数", title: "参与活动客户数",
key: "joinActivityClientNum", key: "joinActivityClientNum",
render(h, params) { render (h, params) {
return h("span", (params.row.friends || 0) + "人"); return h("span", (params.row.friends || 0) + "人");
}, },
}, },
{ {
title: "活动码", title: "活动码",
key: "activityCode", key: "activityCode",
render(h, p) { render (h, p) {
return h( return h(
"Button", "Button",
{ {
@ -247,7 +236,7 @@ export default {
{ {
title: "活动状态", title: "活动状态",
key: "status", key: "status",
render(h, p) { render (h, p) {
const status = p.row.status; const status = p.row.status;
if (status === 1) return h("span", "未开始"); if (status === 1) return h("span", "未开始");
if (status === 2) return h("span", "进行中"); if (status === 2) return h("span", "进行中");
@ -259,7 +248,7 @@ export default {
title: "操作", title: "操作",
key: "action", key: "action",
width: 200, width: 200,
render(h, p) { render (h, p) {
return h("div", [ return h("div", [
h( h(
"Button", "Button",
@ -286,29 +275,30 @@ export default {
], ],
}; };
}, },
mounted() { mounted () {
this.setMenuName("活动管理", "活动计划"); this.setMenuName("活动管理", "活动计划");
this.getCompanyInfo(); this.getCompanyInfo();
this.getShopInfo(); this.getShopInfo();
this.searchTable(); this.searchTable();
}, },
methods: { methods: {
doShow(show) { doShow (show) {
this.showUse = show; this.showUse = show;
this.searchTable();
}, },
showDetail(detail) { showDetail (detail) {
let _this = this; let _this = this;
this.getDetail(detail.id).then((res) => { this.getDetail(detail.id).then((res) => {
_this.detail = res; _this.detail = res;
_this.isShowDetail = true; _this.isShowDetail = true;
}); });
}, },
getCompanyInfo() { getCompanyInfo () {
let that = this; let that = this;
let data = { let data = {
userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
}; };
ActivityManager.getCompany(data, function(data) { ActivityManager.getCompany(data, function (data) {
that.companyList = []; that.companyList = [];
data.data.results.forEach((element) => { data.data.results.forEach((element) => {
that.companyList.push({ that.companyList.push({
@ -318,17 +308,17 @@ export default {
}); });
}); });
}, },
selectCompany(value) { selectCompany (value) {
this.customerId = value; this.customerId = value;
this.getShopInfo(); this.getShopInfo();
}, },
getShopInfo() { getShopInfo () {
let that = this; let that = this;
let data = { let data = {
userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
customerIds: this.customerId, customerIds: this.customerId,
}; };
ActivityManager.getShop(data, function(data) { ActivityManager.getShop(data, function (data) {
that.shopList = []; that.shopList = [];
data.data.results.forEach((element) => { data.data.results.forEach((element) => {
that.shopList.push({ that.shopList.push({
@ -338,11 +328,11 @@ export default {
}); });
}); });
}, },
handlePage: function(value) { handlePage: function (value) {
this.pageNum = value; this.pageNum = value;
this.searchTable(); this.searchTable();
}, },
stop(instance) { stop (instance) {
let _this = this; let _this = this;
this.$Modal.confirm({ this.$Modal.confirm({
title: "您确认要终止?", title: "您确认要终止?",
@ -361,10 +351,10 @@ export default {
} }
); );
}, },
onCancel: () => {}, onCancel: () => { },
}); });
}, },
getDetail(instanceId) { getDetail (instanceId) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
ActivityManager.instanceDetail( ActivityManager.instanceDetail(
{ {
@ -376,7 +366,7 @@ export default {
); );
}); });
}, },
modify(instance) { modify (instance) {
let _this = this; let _this = this;
this.getDetail(instance.id).then((res) => { this.getDetail(instance.id).then((res) => {
store.commit("SET_useData", res); store.commit("SET_useData", res);
@ -384,13 +374,13 @@ export default {
_this.showUse = true; _this.showUse = true;
}); });
}, },
navigateCode(instance) { navigateCode (instance) {
this.$router.push({ this.$router.push({
path: "/activity/plan/code", path: "/activity/plan/code",
query: { instanceId: instance.id }, query: { instanceId: instance.id },
}); });
}, },
searchTable(params = {}) { searchTable (params = {}) {
this.loading = true; this.loading = true;
if ( if (
this.formValidate.date !== null && this.formValidate.date !== null &&
@ -410,6 +400,7 @@ export default {
params.pageNum = this.pageNum; params.pageNum = this.pageNum;
params.pageSize = this.pageSize; params.pageSize = this.pageSize;
params = { ...params, ...this.formValidate }; params = { ...params, ...this.formValidate };
params.userId = JSON.parse(sessionStorage.getItem("loginInfo")).userId;
if (params.status == 0) { if (params.status == 0) {
params.status = undefined; params.status = undefined;
} }

2
src/pages/activity/useActivityStepThree.vue
Unescape Escape View File

@ -119,7 +119,6 @@ export default {
}); });
} }
this.isSelect = this._.filter(this.isSelect, item => item) this.isSelect = this._.filter(this.isSelect, item => item)
console.log(that.shopList)
}, },
onChange (data) { onChange (data) {
let _this = this; let _this = this;
@ -153,6 +152,7 @@ export default {
let data = { let data = {
userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId, userId: JSON.parse(sessionStorage.getItem("loginInfo")).userId,
customerIds: companyIds.join(","), customerIds: companyIds.join(","),
scheduleId: store.getters.useData.scheduleId
}; };
that.loading = true; that.loading = true;
ActivityManager.getShop(data, function (data) { ActivityManager.getShop(data, function (data) {

Write Preview
Loading…
Cancel
Save