feature_0521
郑皇 6 years ago
parent 3acf0dd4e6
commit a5d7e15f06

@ -4,34 +4,58 @@
<Row> <Row>
<i-col span="6"> <i-col span="6">
<FormItem label="零售公司" prop=""> <FormItem label="零售公司" prop="">
<Select v-model="formValidate.companyData" filterable placeholder="全部" clearable> <Select
<Option v-for="(item,index) in companyList" :key="index" :value="item.value">{{ item.label v-model="formValidate.organizationId"
}} filterable
placeholder="全部"
clearable
>
<Option
v-for="(item, index) in companyList"
:key="index"
:value="item.value"
>{{ 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="店铺" prop="">
<Select v-model="formValidate.shopData" filterable placeholder="全部" clearable> <Select
<Option v-for="(item,index) in shopList" :key="index" :value="item.value">{{ item.label }} v-model="formValidate.storeId"
filterable
placeholder="全部"
clearable
>
<Option
v-for="(item, index) in shopList"
:key="index"
:value="item.value"
>{{ 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.activityStatus"> <Select v-model="formValidate.status">
<Option v-for="(item,index) in activityStatusList" :key="index" :value="item.value">{{ <Option
item.label }} v-for="(item, index) in activityStatusList"
:key="index"
:value="item.value"
>{{ item.label }}
</Option> </Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="7"> <i-col span="7">
<FormItem label="选择日期" prop=""> <FormItem label="选择日期" prop="">
<Date-picker :value="formValidate.date" type="daterange" placement="bottom-end" <Date-picker
placeholder="选择日期区间"></Date-picker> v-model="formValidate.date"
type="daterange"
placement="bottom-end"
placeholder="选择日期区间"
></Date-picker>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="1"> <i-col span="1">
@ -40,22 +64,31 @@
</Row> </Row>
<Row style="margin-top:50px"> <Row style="margin-top:50px">
<Table border :columns="columns1" :data="data"></Table> <Table border :columns="columns1" :data="data"></Table>
<Page :total="totalSize" :current="pageNum" :page-size="pageSize" show-elevator show-total <Page
placement="top" @on-change="handlePage" class-name="ks-page"></Page> :total="totalSize"
:current="pageNum"
:page-size="pageSize"
show-elevator
show-total
placement="top"
@on-change="handlePage"
class-name="ks-page"
></Page>
</Row> </Row>
</Form> </Form>
<!-- <useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>--> <!-- <useTable @dispalyuseModal="dispalyuseModal" :useModal="useModal" :id="id"></useTable>-->
</div> </div>
</template> </template>
<script> <script>
import ActivityManager from "../../services/ActivityManager/ActivityManager"; import ActivityManager from "../../services/ActivityManager/ActivityManager";
import useTable from './useTable' import useTable from "./useTable";
import http from '../../services/CommonHttp' import http from "../../services/CommonHttp";
import { formatDate } from "../../utils/Common";
export default { export default {
name: "ActivityPlan", name: "ActivityPlan",
inject: ['setMenuName'], inject: ["setMenuName"],
components: { components: {
useTable, useTable,
}, },
@ -67,167 +100,212 @@
data: [], data: [],
companyList: [], companyList: [],
shopList: [], shopList: [],
activityStatus: '进行中',
formValidate: { formValidate: {
date: '', date: null,
companyData: '', organizationId: null,
shopData: '', storeId: null,
activityStatus: '进行中', status: 0,
}, },
activityData: [{ activityData: [
activityStatus: '进行中' {
}, { activityStatus: "进行中",
activityStatus: '已结束' },
}], {
activityStatusList: [{ activityStatus: "已结束",
label: '全部', },
value: '全部' ],
}, { activityStatusList: [
label: '进行中', {
value: '进行中' label: "全部",
}, { value: 0,
label: '未开始', },
value: '未开始' {
}, { label: "进行中",
label: '已结束', value: 2,
value: '已结束' },
}], {
columns1: [{ label: "未开始",
type: 'index', value: 1,
},
{
label: "已结束",
value: 3,
},
],
columns1: [
{
type: "index",
width: 60, width: 60,
align: 'center' align: "center",
}, },
{ {
title: '活动名称', title: "活动名称",
key: 'name' key: "name",
}, },
{ {
title: '活动类型', title: "活动类型",
key: 'scheduleVO.name', key: "scheduleVO.name",
render(h, params) { render(h, params) {
return h("span", params.row['scheduleVO']['name']); return h("span", params.row["scheduleVO"]["name"]);
} },
}, },
{ {
title: '活动开始时间', title: "活动开始时间",
key: 'beginTime' key: "beginTime",
}, },
{ {
title: '活动结束时间', title: "活动结束时间",
key: 'endTime' key: "endTime",
}, },
// { // {
// title: '', // title: '',
// key: 'company' // key: 'company'
// }, // },
{ {
title: '店铺', title: "店铺",
key: 'shop', key: "shop",
render(h, params) { render(h, params) {
return h("span", (params.row.stores.length || 0) + '家') return h("span", (params.row.stores.length || 0) + "家");
} },
}, },
{ {
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) { render(h) {
return h('Button', { props: { type: 'primary', size: 'small' } }, '查看详情') return h(
} "Button",
{ props: { type: "primary", size: "small" } },
"查看详情"
);
},
}, },
{ {
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", "进行中");
if (status === 3) return h('span', '已结束'); if (status === 3) return h("span", "已结束");
if (status === 4) return h('span', '取消'); if (status === 4) return h("span", "取消");
} },
}, },
{ {
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', { props: { type: 'primary', size: 'small' }, style: { marginRight: '8px' }, on: { click: () => this.stop(p.row) } }, '终止'), "Button",
h('Button', { props: { type: 'primary', size: 'small' }, on: { click: () => this.modify(p.row) } }, '修改') {
] props: { type: "primary", size: "small" },
) style: { marginRight: "8px" },
} on: { click: () => this.stop(p.row) },
}] },
} "终止"
),
h(
"Button",
{
props: { type: "primary", size: "small" },
on: { click: () => this.modify(p.row) },
},
"修改"
),
]);
},
},
],
};
}, },
mounted() { mounted() {
this.setMenuName("活动管理", "活动计划") this.setMenuName("活动管理", "活动计划");
this.getCompanyInfo() this.getCompanyInfo();
this.getShopInfo() this.getShopInfo();
this.searchTable(); this.searchTable();
}, },
methods: { methods: {
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({
label: element.name, label: element.name,
value: element.id value: element.id,
}) });
});
}); });
})
}, },
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,
} };
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({
label: element.name, label: element.name,
value: element.id value: element.id,
}) });
});
}); });
})
}, },
handlePage: function (value) { handlePage: function(value) {
this.pageNum = value; this.pageNum = value;
this.searchTable(); this.searchTable();
}, },
searchTable(params = {}) { searchTable(params = {}) {
console.log(this.formValidate.date);
if (
this.formValidate.date !== null &&
this.formValidate.date.length > 0
) {
if (this.formValidate.date[0] !== "") {
this.formValidate.startDate = formatDate(this.formValidate.date[0]);
} else {
this.formValidate.startDate = undefined;
}
if (this.formValidate.date[1] !== "") {
this.formValidate.endDate = formatDate(this.formValidate.date[1]);
} else {
this.formValidate.endDate = undefined;
}
}
params.pageNum = this.pageNum; params.pageNum = this.pageNum;
params.pageSize = this.pageSize; params.pageSize = this.pageSize;
http.get('/activity/instance/list', params).then(res => { params = { ...params, ...this.formValidate };
if (params.status == 0) {
params.status = undefined;
}
params.date = undefined;
http.get("/activity/instance/list", params).then((res) => {
const data = res.data.results.this || {}; const data = res.data.results.this || {};
this.data = data.list || []; this.data = data.list || [];
this.totalSize = data.total || 0; this.totalSize = data.total || 0;
}) });
} },
} },
} };
</script> </script>
<style scoped> <style scoped></style>
</style>

@ -5,7 +5,7 @@
* @company kiisoo * @company kiisoo
*/ */
import roter from '../router' import roter from "../router";
// import store from '../store' // import store from '../store'
/** /**
@ -13,11 +13,21 @@ import roter from '../router'
* @author dexiang.jiang * @author dexiang.jiang
* @date 2019/04/18 11:19 * @date 2019/04/18 11:19
*/ */
export function goToLogin(){ export function goToLogin() {
// store.commit("LOGOUT"); // store.commit("LOGOUT");
roter.push('/login'); roter.push("/login");
} }
export default { export function formatDate(dt) {
goToLogin dt = new Date(dt);
let year = dt.getFullYear();
let month = dt.getMonth() + 1;
let day = dt.getDate();
month = month < 10 ? "0" + month : month;
day = day < 10 ? "0" + day : day;
return year + "-" + month + "-" + day;
} }
export default {
goToLogin,
};

Loading…
Cancel
Save