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

1

Browse Source
feature_0521
zhenghuang 5 years ago
parent d00e6e8752
commit ba8d3a8a48
3 changed files with 148 additions and 142 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,107 +1,105 @@
<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.startDate" <Date-picker v-model="formValidate.startDate"
:options='startDateOptions' :options='startDateOptions'
type="date" type="date"
placement="bottom-end" placement="bottom-end"
placeholder="选择日期区间" placeholder="选择日期区间"
format="yyyy-MM-dd" format="yyyy-MM-dd"
@on-change="startDateChange" @on-change="startDateChange"></Date-picker>
></Date-picker>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="4"> <i-col span="4">
<FormItem label="结束日期" prop> <FormItem label="结束日期"
<Date-picker prop>
v-model="formValidate.endDate" <Date-picker v-model="formValidate.endDate"
:options='endDateOptions' :options='endDateOptions'
type="date" type="date"
placement="bottom-end" placement="bottom-end"
placeholder="选择结束日期" placeholder="选择结束日期"
format="yyyy-MM-dd" format="yyyy-MM-dd"
@on-change="endDateChange" @on-change="endDateChange"></Date-picker>
></Date-picker>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="4"> <i-col span="4">
<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 }}</Option>
>{{ item.label }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="6"> <i-col span="6">
<FormItem label="店铺" prop> <FormItem label="店铺"
<Select v-model="formValidate.storeId" filterable placeholder="全部" clearable> prop>
<Option <Select v-model="formValidate.storeId"
v-for="(item, index) in shopList" filterable
placeholder="全部"
clearable>
<Option v-for="(item, index) in shopList"
:key="index" :key="index"
:value="item.value" :value="item.value">{{ item.label }}</Option>
>{{ item.label }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="3"> <i-col span="3">
<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 }}</Option>
>{{ item.label }}</Option>
</Select> </Select>
</FormItem> </FormItem>
</i-col> </i-col>
<i-col span="3"> <i-col span="3">
<Button type="primary" @click="() => {pageNum = 1;searchTable()}">查询</Button> <Button type="primary"
@click="() => {pageNum = 1;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="活动计划详情" width="70%" :footer-hide="true"> title="活动计划详情"
<planDetail v-if="isShowDetail" :detail="detail"></planDetail> width="70%"
:footer-hide="true">
<planDetail v-if="isShowDetail"
:detail="detail"></planDetail>
</Modal> </Modal>
</div> </div>
</template> </template>
@ -413,12 +411,12 @@ export default {
}, },
searchTable (params = {}) { searchTable (params = {}) {
this.loading = true; this.loading = true;
if (this.formValidate.startDate !== "") { if (this.formValidate.startDate) {
this.formValidate.startDate = formatDate(this.formValidate.startDate); this.formValidate.startDate = formatDate(this.formValidate.startDate);
} else { } else {
this.formValidate.startDate = undefined; this.formValidate.startDate = undefined;
} }
if (!!this.formValidate.endDate) { if (this.formValidate.endDate) {
this.formValidate.endDate = formatDate(this.formValidate.endDate); this.formValidate.endDate = formatDate(this.formValidate.endDate);
} else { } else {
this.formValidate.endDate = undefined; this.formValidate.endDate = undefined;

30
src/pages/activity/addActivity.vue
Unescape Escape View File

@ -1,10 +1,8 @@
<template> <template>
<Modal v-model="dispalyModal" <Modal v-model="dispalyModal"
width="1000" width="1000"
:loading="loading" :loading="true"
:mask-closable="false" :mask-closable="false">
@on-cancel="cancel"
@on-ok="save">
<p slot="header" <p slot="header"
style="color:#f60;text-align:left"> style="color:#f60;text-align:left">
<span>配置活动</span> <span>配置活动</span>
@ -97,6 +95,16 @@
<Button style="margin-top: 10px" <Button style="margin-top: 10px"
type="primary" type="primary"
@click="addActivityInput">+添加活动类型</Button> @click="addActivityInput">+添加活动类型</Button>
<div slot="footer">
<Button type="primary"
shape="circle"
:loading="modal_loading"
@click="cancel">取消</Button>
<Button type="primary"
shape="circle"
:loading="modal_loading"
@click="save">确定</Button>
</div>
</Modal> </Modal>
</template> </template>
<script> <script>
@ -133,7 +141,6 @@ export default {
}, },
watch: { watch: {
addActivityModal (val) { addActivityModal (val) {
console.log(111, val);
this.dispalyModal = val; this.dispalyModal = val;
if (val === true && this.id) { if (val === true && this.id) {
this.getActivityData(); this.getActivityData();
@ -159,6 +166,7 @@ export default {
}, },
]; ];
} }
this.$forceUpdate();
}, },
}, },
mounted () { }, mounted () { },
@ -224,20 +232,20 @@ export default {
}, },
save () { save () {
let that = this; let that = this;
that.modal_loading = true;
let i = 0; let i = 0;
this.loading = true;
if ( if (
typeof that.formValidate.logo == "undefined" || typeof that.formValidate.logo == "undefined" ||
that.formValidate.logo == "" || that.formValidate.logo == "" ||
that.formValidate.logo.length <= 0 that.formValidate.logo.length <= 0
) { ) {
that.$Message.error("请上传活动封面!"); that.$Message.error("请上传活动封面!");
that.loading = false; that.modal_loading = false;
return false; return false;
} }
if (that.formValidate.params.length <= 0) { if (that.formValidate.params.length <= 0) {
that.$Message.error("至少需要填写一个活动类型!"); that.$Message.error("至少需要填写一个活动类型!");
that.loading = false; that.modal_loading = false;
return false; return false;
} }
for (const key in that.formValidate.params) { for (const key in that.formValidate.params) {
@ -250,12 +258,11 @@ export default {
} }
if (element.defaultVal.length <= 0) { if (element.defaultVal.length <= 0) {
that.$Message.error(`请输入类型${i}的参数!`); that.$Message.error(`请输入类型${i}的参数!`);
that.loading = false; that.modal_loading = false;
return false; return false;
} }
} }
} }
this.loading = true;
this.$refs["formValidate"].validate((valid) => { this.$refs["formValidate"].validate((valid) => {
if (valid) { if (valid) {
// param = JSON.stringify(param) // param = JSON.stringify(param)
@ -263,12 +270,13 @@ export default {
ActivityManager.addOreditActivity(data, function (data) { ActivityManager.addOreditActivity(data, function (data) {
that.addActivityModal = false; that.addActivityModal = false;
that.formValidate = {}; that.formValidate = {};
that.modal_loading = false;
that.$emit("dispalyAddActivityModal", false, true); that.$emit("dispalyAddActivityModal", false, true);
}); });
} else { } else {
that.modal_loading = false;
that.$Message.error("表单验证失败!"); that.$Message.error("表单验证失败!");
} }
that.loading = false;
}); });
}, },
}, },

2
vue.config.js
Unescape Escape View File

@ -31,7 +31,7 @@ module.exports = {
// proxy: 'http://192.168.1.123:8312/' // proxy: 'http://192.168.1.123:8312/'
// proxy: 'http://192.168.31.177:8312/' // proxy: 'http://192.168.31.177:8312/'
// proxy: 'http://localhost:8312/' // proxy: 'http://localhost:8312/'
proxy: "http://111.231.218.44:8080/", proxy: 'http://localhost:8080/',
// proxy: 'http://localhost:8080/', // proxy: 'http://localhost:8080/',
// proxy: 'http://jdxdev.vipgz4.idcfengye.com/' // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
}, },

Write Preview
Loading…
Cancel
Save