Commit 09095781 by damodmg

更新合并

parent 33f51dd6
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.614b44d1b86ea5a225f50867f4c0df71.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.3c5834cc437c7b2d524e.js></script><script type=text/javascript src=./static/js/app.bf03da701922029fc404.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet type=text/css href=./static/css/iconfont.css><link rel=stylesheet type=text/css href=./static/css/common.css><link rel="shortcut icon" type=image/x-icon href=./static/img/favicon.ico><title>积分商城</title><link href=./static/css/app.04bde472a00b37a2b90cef8d4da75a66.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.35.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.41.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.06.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/people.2.0.26.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.9072594f61a88f768c70.js></script><script type=text/javascript src=./static/js/app.1e5ee97f5a5605d2f4e9.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -10,6 +10,7 @@
</head>
<body>
<div id="app"></div>
<!-- 库引用cdn -->
<script src='//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js'></script>
<script src="//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js"></script>
<script src="//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js"></script>
......@@ -25,6 +26,7 @@
<script src="//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/people.2.0.26.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-card.2.0.18.js"></script>
<!-- <script src="//web-1251519181.cos.ap-shanghai.myqcloud.com/components/space.2.0.00.js"></script> -->
<!-- built files will be auto injected -->
</body>
......
......@@ -39,7 +39,8 @@
<el-button type="primary" @click="addCoupon">新增优惠券</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column label="礼品信息" min-width="260px">
<template slot-scope="scope">
......@@ -59,6 +60,7 @@
<div class="info-name">
<p class="pro-ellipsis">{{ scope.row.proTitle }}</p>
<p class="category-ellipsis">{{ scope.row.proSubTitle }}</p>
<p class="category-ellipsis">{{ scope.row.remarks }}</p>
</div>
</div>
</template>
......@@ -142,6 +144,7 @@
</div>
</div>
</div>
</div>
<!-- 推广 -->
<eqCode :modalData="modalData"></eqCode>
......
......@@ -135,10 +135,13 @@
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的门店分组下有新增的门店,系统不会默认选中此新增门店,请重新确认选择并保存礼品</span>
</el-form-item> -->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative">
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(mallProId && creatorId) || mallProId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组,系统不会默认选中此新增门店分组,请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" :isAdd="isAdd" />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="couponForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
<span v-if="couponForm.limitTimesStatus"><el-input-number controls-position="right" v-model="couponForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number></span>
......@@ -207,7 +210,7 @@
</div>
<div class="confim-btn" :style="{ width: fixedWidth + 'px' }">
<el-form-item class="fix-btn">
<el-button type="primary" size="small" @click="submitForm('couponForm')" :disabled="!canEdit">保存</el-button>
<el-button type="primary" size="small" @click="submitForm('couponForm')" :disabled="!canEdit" :loading="submitLoading">保存</el-button>
<el-button size="small" @click="goBack">返回</el-button>
</el-form-item>
</div>
......@@ -324,9 +327,14 @@ export default {
couponCardStockArr: [],
couponStatus: false, //卡券状态
canEdit: true,
submitLoading: false,
groupIdDisableList: [],
proNameLen: 0,
creatorId: ''
creatorId: '',
useNewStoreWidget: 1, //1新的卡券门店组件 ,0老的门店组件
// 新版门店卡券选择器
uuid: '',
isAdd: true
// 人群筛选器
// // 可传参数
// // projectName: 'integral-mall', // 当前项目名
......@@ -363,6 +371,7 @@ export default {
if (this.mallProId !== '-1') {
this.getInfo();
this.isAdd = false;
} else {
this.getMemberGradeList(); //会员等级列表
}
......@@ -470,7 +479,10 @@ export default {
}
this.creatorId = res.data.result.creatorId;
this.refash = !this.refash;
this.useNewStoreWidget = res.data.result.useNewStoreWidget;
if (this.useNewStoreWidget === 0) {
this.sendChildData.storeType = Number(res.data.result.showStore);
if (this.sendChildData.storeType === 1) {
let arr = res.data.result.storeGroupIds.split(',');
for (let i = 0; i < arr.length; i++) {
......@@ -493,6 +505,13 @@ export default {
this.sendChildData.storeIds = list;
}
this.getSelectGroupData(this.sendChildData);
} else if (this.useNewStoreWidget === 1) {
this.uuid = res.data.result.storeWidgetId;
this.$nextTick(_ => {
// console.log(this.$refs.storeCard);
this.$refs.storeCard.init();
});
}
//限兑
if (res.data.result.limitTimes === -1) {
this.couponForm.limitTimesStatus = false;
......@@ -887,6 +906,8 @@ export default {
memberGrade: this.couponForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
storeWidgetId: '',
useNewStoreWidget: this.useNewStoreWidget,
limitTimes: this.couponForm.limitTimesStatus ? this.couponForm.limitTimes : '-1', //限兑
exchangeDateType: this.couponForm.exchangeDateType, //兑换日期
exchangeFixDateBegin: this.couponForm.exchangeDateType === 2 ? this.getTime(this.couponForm.exchangeFixDate[0]) : '', //固定日期
......@@ -899,6 +920,7 @@ export default {
limitTimeBegin: this.couponForm.releaseType === 2 ? this.getTimeAll(this.couponForm.limitTimeBegin) : '' //定时上架时间
};
// 门店分类
if (this.useNewStoreWidget === 0) {
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
......@@ -915,6 +937,9 @@ export default {
return;
}
}
} else if (this.useNewStoreWidget === 1) {
params.storeWidgetId = this.uuid;
}
// 部分时段时间转换
let timeLink = [];
......
......@@ -54,7 +54,8 @@
<el-button type="primary" @click="addGift">新增礼品</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @sort-change="sortChange" @selection-change="handleSelectAll">
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @sort-change="sortChange" @selection-change="handleSelectAll">
<el-table-column type="selection" width="50" :selectable="selectInit"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
......@@ -148,6 +149,7 @@
</div>
</div>
</div>
</div>
<!-- 修改礼品名称 -->
<editName :editInfoModal="editInfoModal" @getList="getList"></editName>
<!-- 推广 -->
......@@ -185,11 +187,7 @@ export default {
showSelfStatus: false,
showFlag: false,
openFlag: false,
tableDate: [
{
giftName: '1111'
}
],
tableDate: [],
currentPage: 1,
pageSizes: [20, 40, 60, 80],
pageSize: 20,
......
......@@ -133,10 +133,13 @@
</div>
</el-form-item> -->
<span style="display:none">{{ refash }}</span>
<el-form-item label="展现门店" required style="position:relative">
<el-form-item label="展现门店" required style="position:relative" v-if="useNewStoreWidget === 0">
<vue-gic-store-linkage v-if="(giftId && creatorId) || giftId == -1" :creatorId="creatorId" :disabled="isInfo" @getDisGroupList="getDisGroupList" :msg="sendChildData" :openFlag="openFlag" ref="selectTree" @sendSelectGroupData="getSelectGroupData"></vue-gic-store-linkage>
<span v-if="sendChildData.storeType === 1" class="store-tip">若选中的父分组下有新增的门店分组,系统不会默认选中此新增门店分组,请重新确认选择并保存礼品</span>
</el-form-item>
<el-form-item label="展现门店" v-if="useNewStoreWidget === 1">
<vue-gic-store-card class="pt10" ref="storeCard" :uuid.sync="uuid" scenes="" :isAdd="isAdd" />
</el-form-item>
<el-form-item label="限兑">
<el-checkbox v-model="giftForm.limitTimesStatus" @change="refashData()">每个会员限制兑换</el-checkbox>
<span v-if="giftForm.limitTimesStatus"><el-input-number controls-position="right" v-model="giftForm.limitTimes" :precision="0" :min="0" @change="limitTimeChange"></el-input-number></span>
......@@ -205,7 +208,6 @@
<el-date-picker v-model="giftForm.limitTimeBegin" type="datetime" placeholder="选择日期时间"> </el-date-picker>
</el-form-item>
<!-- 实物礼品 -->
<el-form-item label="配送方式" required v-if="giftType === 1" prop="changeTypeList">
<el-checkbox-group v-model="giftForm.changeTypeList" :disabled="editChangeTypeStatus">
<el-checkbox label="2">快递发货</el-checkbox>
......@@ -214,6 +216,17 @@
<span style="font-size: 12px;color: rgb(144, 147, 153);margin-left:10px;display: inline-block;vertical-align: middle;">公众号积分商城不支持此功能,小程序积分商城请升级至V3.1.1及以上版本</span>
</el-checkbox-group>
</el-form-item>
<el-form-item label="自提点" v-if="giftForm.changeTypeList.indexOf('4') != -1">
<template>
<el-radio v-model="giftForm.pickUpPointType" :label="1">全部自提点</el-radio>
<el-radio v-model="giftForm.pickUpPointType" :label="2">部分自提点</el-radio>
</template>
</el-form-item>
<el-form-item label="" prop="pickUpPoint" v-if="giftForm.pickUpPointType === 2">
<el-select v-model="giftForm.pickUpPoint" multiple placeholder="请选择自提点" size="small" class="w-600" filterable remote :remote-method="remoteMethod">
<el-option v-for="item in pickUpPointList" :key="item.integralMallPickUpPointId" :label="item.pickUpPointName" :value="item.integralMallPickUpPointId"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="配送方式" v-if="giftType !== 1" prop="changeType">
<el-radio-group v-model="giftForm.changeType" @change="changeDeliver" :disabled="editChangeTypeStatus">
<el-radio :label="3"
......@@ -315,6 +328,8 @@ import addCate from '../../../components/addGiftCate';
import tinymceEdit from '../../../components/tinymce-edit';
import importCoupon from './importCoupon';
import addSku from './addSku';
import Treeselect from '@riophae/vue-treeselect';
import '@riophae/vue-treeselect/dist/vue-treeselect.css';
export default {
data() {
const validateTime = (rule, value, callback) => {
......@@ -362,6 +377,8 @@ export default {
releaseType: 1, //上架时间
limitTimeBegin: '', //上架时间具体
changeType: 5, //配送方式T
pickUpPointType: 1,
pickUpPoint: [],
changeTypeList: [], //配东方式
refundType: 0, //是否允许退款
costValue: '', //礼品成本
......@@ -389,7 +406,8 @@ export default {
exchangeDateWeekArr: [{ required: true, message: '请选择时间', trigger: 'change' }],
limitTimeBegin: [{ required: true, message: '请选择时间', trigger: 'change' }],
changeTypeList: [{ type: 'array', required: true, message: '请至少选择一个配送方式', trigger: 'change' }],
changeType: [{ required: true, message: '请选择一个配送方式', trigger: 'change' }]
changeType: [{ required: true, message: '请选择一个配送方式', trigger: 'change' }],
pickUpPoint: [{ required: true, message: '请选择自提点', trigger: 'change' }]
},
refundTypeStatus: false,
uploadAction: window.location.origin + '/api-plug/upload-img?requestProject=integral-mall',
......@@ -446,7 +464,7 @@ export default {
textStock: 0, //文本券码库存数
canEdit: true,
groupIdDisableList: [],
creatorId: '' //权限id
creatorId: '', //权限id
// // 人群筛选器
// // 可传参数
// // projectName: 'integral-mall', // 当前项目名
......@@ -459,6 +477,11 @@ export default {
// saveTag: false, // 控制(保存)按钮显示的参数,仅供参考,可自行修改
// searchParams: {}, //查询数据数据
// responseParams: [] //回显的数据
useNewStoreWidget: 1, //1新的卡券门店组件 ,0老的门店组件
pickUpPointList: [], //门店自提列表
// 新版门店卡券选择器
uuid: '',
isAdd: true
};
},
// watch: {
......@@ -469,6 +492,7 @@ export default {
// }
// }
// },
mounted() {
this.getOpenStatus();
window.onbeforeunload = function(e) {
......@@ -483,6 +507,7 @@ export default {
if (this.$route.query.proReferId !== '-1') {
//编辑
this.giftForm.proReferId = this.$route.query.proReferId;
this.isAdd = false;
} else {
//新增
this.giftForm.proReferId = '';
......@@ -660,7 +685,7 @@ export default {
}
},
// 获取详情
getInfo() {
async getInfo() {
let params = {
integralMallProId: this.giftId
};
......@@ -751,6 +776,8 @@ export default {
}
this.giftForm.timeRangeList = timeRangeList;
}
this.useNewStoreWidget = res.data.result.useNewStoreWidget;
if (this.useNewStoreWidget === 0) {
this.sendChildData.storeType = Number(res.data.result.showStore);
// console.log('获取子组件的值', this.groupIdDisableList);
if (this.sendChildData.storeType === 1) {
......@@ -775,6 +802,13 @@ export default {
this.sendChildData.storeIds = list;
}
this.getSelectGroupData(this.sendChildData);
} else {
this.uuid = res.data.result.storeWidgetId;
this.$nextTick(_ => {
// console.log(this.$refs.storeCard);
this.$refs.storeCard.init();
});
}
//显示状态
this.giftForm.proShowStatus = res.data.result.proShowStatus;
//上架时间
......@@ -790,6 +824,16 @@ export default {
//实物礼品
this.giftForm.changeType = Number(res.data.result.changeType);
this.giftForm.changeTypeList = res.data.result.changeType.split(',');
if (this.giftForm.changeTypeList.indexOf('4') != -1) {
this.getPickUpPointList();
}
if (res.data.result.pickUpPoint === '-1') {
this.giftForm.pickUpPoint = [];
this.giftForm.pickUpPointType = 1;
} else {
this.giftForm.pickUpPoint = res.data.result.pickUpPoint ? res.data.result.pickUpPoint.split(',') : [];
this.giftForm.pickUpPointType = 2;
}
} else if (res.data.result.giftType === 0) {
//虚拟礼品
this.giftForm.changeType = Number(res.data.result.changeType);
......@@ -1065,8 +1109,6 @@ export default {
return false;
}
/*eslint-disable*/
console.log(file);
console.log(file.type);
if (file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/jpg' && file.type !== 'image/gif') {
this.$message.error('请上传jpg,png,gif格式的图片');
return false;
......@@ -1193,6 +1235,7 @@ export default {
// 勾选自提点
handleStatus(val) {
if (val) {
this.getPickUpPointList()
request.get('/api-integral-mall/pick-up-point-switch-status').then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.status === 0) {
......@@ -1230,6 +1273,9 @@ export default {
// }
// }
},
remoteMethod(value){
this.getPickUpPointList(value)
},
// 跳转到设置自提点
goDeliverSet() {
this.$router.push({ name: 'deliverSet' });
......@@ -1356,8 +1402,33 @@ export default {
});
}
},
// 门店自提列表
getPickUpPointList(value) {
let params = {
search:value
}
request.post('/api-integral-mall/list-pick-up-points',qs.stringify(params)).then(res => {
this.pickUpPointList = []
if (res.data.errorCode === 0) {
// if(res.data.result) {
// for(let item of res.data.result) {
// this.pickUpPointList.push({
// label:item.pickUpPointName,
// id:item.integralMallPickUpPointId,
// children:null
// })
// }
// }
this.pickUpPointList = res.data.result||[]
} else {
this.$message.error(res.data.message);
}
});
},
// 保存
submitGoodsForm(form) {
async submitGoodsForm(form) {
this.giftForm.detailDescription = this.$refs.tinymceWrap.tinymceHtml;
let giftImageUrls = [];
let giftImageFiledCodes = [];
......@@ -1490,6 +1561,14 @@ export default {
// this.$message.error('请选中人群筛选器的数据');
// return false;
// }
if(this.useNewStoreWidget ===1) {
let data = await this.$refs.storeCard.getRightList();
if (!data.length) {
this.$tips({ type: 'error', message: '门店不能为空' });
return;
}
}
this.$refs[form].validate(valid => {
if (valid) {
let params = {
......@@ -1507,6 +1586,8 @@ export default {
memberGrade: this.giftForm.memberGrade.join(','), //适用会员
showStore: this.sendChildData.storeType, // 显示门店 0所有 1部分分类 2部分门店
storeIds: '', //展现门店id
storeWidgetId:'',
useNewStoreWidget:this.useNewStoreWidget,
limitTimes: this.giftForm.limitTimesStatus ? this.giftForm.limitTimes : '-1', //限兑
exchangeDateType: this.giftForm.exchangeDateType, //兑换日期
exchangeFixDateBegin: this.giftForm.exchangeDateType === 2 ? this.getTime(this.giftForm.exchangeFixDate[0]) : '', //固定日期
......@@ -1527,6 +1608,7 @@ export default {
releaseType: this.giftForm.releaseType, //上架状态
limitTimeBegin: this.giftForm.releaseType === 2 ? this.getTimeAll(this.giftForm.limitTimeBegin) : '', //定时上架时间
changeType: this.giftType === 0 ? String(this.giftForm.changeType) : this.giftForm.changeTypeList.join(','), //配送方式
pickUpPoint:this.giftForm.pickUpPointType ===2?this.giftForm.pickUpPoint.join(','):'-1',
refundType: this.giftForm.refundType, //售后
giftProStandardJson: this.giftProStandardJson ? JSON.stringify(this.giftProStandardJson) : '', //规格列表
skuJson: this.submitSkuJson.length ? JSON.stringify(this.submitSkuJson) : '' //sku数据
......@@ -1534,6 +1616,7 @@ export default {
// responseParams: this.responseParams.length ? this.responseParams : null
};
// 门店分类
if(this.useNewStoreWidget===0) {
if (this.sendChildData.storeType === 1) {
if (this.sendChildData.storeGroupIds) {
params.storeGroupIds = this.sendChildData.storeGroupIds || '';
......@@ -1550,6 +1633,9 @@ export default {
return;
}
}
}else if(this.useNewStoreWidget===1){
params.storeWidgetId = this.uuid
}
// 部分时段时间转换
let timeLink = [];
if (this.giftForm.exchangeTimeType === 2) {
......@@ -1628,6 +1714,7 @@ export default {
// }
},
components: {
Treeselect,
addCate,
tinymceEdit,
addSku,
......
......@@ -51,8 +51,8 @@
<el-tab-pane label="待付款" name="11" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="已付款" name="12" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px">
<template slot-scope="scope">
......@@ -133,12 +133,12 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="pageNum" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
</div>
<!-- 关闭订单 -->
......@@ -193,7 +193,8 @@ export default {
requestProject: 'integral-mall',
placement: 'top-start',
showSelfStatus: false,
showFlag: false
showFlag: false,
loading: false
};
},
watch: {
......
......@@ -55,8 +55,8 @@
<el-tab-pane label="已发货" name="3" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易成功" name="4" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="交易关闭" name="0" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<!-- <el-table-column type="selection" width="40"> </el-table-column> -->
<el-table-column label="礼品信息" width="300px">
<template slot-scope="scope">
......@@ -158,12 +158,12 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
</div>
<!-- 物流详情
......@@ -360,6 +360,7 @@ export default {
shopIntegralMallProExchangeId: '', //门店自提订单id
writeOffCode: '', //核销码
submitLoading: false, //门店自提确认按钮
loading: false,
giftOrderObj: {}, //缓存数据
showSelfStatus: false,
showFlag: false
......
......@@ -48,8 +48,8 @@
<el-tab-pane label="待退款" name="0" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款成功" name="1" class="goods-table-content"> </el-tab-pane>
<el-tab-pane label="退款关闭" name="2" class="goods-table-content"> </el-tab-pane>
<div class="goods-list-content">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange" v-loading="loading">
<div class="goods-list-content" v-loading="loading">
<el-table :data="tableData" ref="multipleTable" style="width: 100%" @sort-change="sortChange">
<el-table-column type="selection" width="50"> </el-table-column>
<el-table-column label="礼品信息" min-width="300px">
<template slot-scope="scope">
......@@ -135,12 +135,12 @@
</div>
</template>
</el-table>
</div>
<div class="pagination-conteiner" style="background:#fff;margin:-50px 24px 0 24px">
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination">
<el-pagination v-if="total != 0" background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page.sync="currentPage" :page-sizes="pageSizes" :page-size="pageSize" layout="total, sizes, prev, pager, next" :total="total"> </el-pagination>
</div>
</div>
</div>
</el-tabs>
</div>
<!-- 门店自提核销 -->
......
......@@ -13,15 +13,18 @@
</h3>
</div>
<div class="section">
<el-form :model="form" ref="form" :rules="formRules" label-width="100px" class="demo-ruleForm" label-position="right">
<el-form-item prop="cardType" label="积分消耗卡">
<el-form :model="form" ref="form" :rules="formRules" label-width="150px" class="demo-ruleForm" label-position="right">
<!-- <el-form-item prop="cardType" label="积分消耗卡">
<el-select v-model="form.cardType" placeholder="积分消耗卡">
<el-option label="集团卡" :value="2"></el-option>
<el-option label="品牌卡" :value="1"></el-option>
</el-select>
</el-form-item> -->
<el-form-item prop="openAutoShelf" label="礼品无库存自动下架">
<el-switch v-model="form.openAutoShelf"></el-switch>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSubmit('form')">确定</el-button>
<el-button type="primary" @click="handleSubmit('form')" :loading="btnLoading">确定</el-button>
</el-form-item>
</el-form>
</div>
......@@ -38,11 +41,14 @@ export default {
data() {
return {
form: {
cardType: ''
cardType: '',
openAutoShelf: false
},
formRules: {
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }]
}
cardType: [{ required: true, message: '请选择积分消耗卡', trigger: 'change' }],
openAutoShelf: [{ required: true, message: '请设置无库存自动下架', trigger: 'change' }]
},
btnLoading: false
};
},
created() {
......@@ -53,6 +59,7 @@ export default {
request.get('/api-integral-mall/get-card-config').then(res => {
if (res.data.errorCode === 0) {
this.form.cardType = res.data.result.cardType || '';
this.form.openAutoShelf = res.data.result.openAutoShelf === 1 ? true : false;
} else {
this.$message.error(res.data.message);
}
......@@ -62,10 +69,14 @@ export default {
this.$refs[form].validate(valid => {
if (valid) {
let params = {
cardType: this.form.cardType
// cardType: this.form.cardType,
openAutoShelf: this.form.openAutoShelf ? 1 : 0
};
this.btnLoading = true;
request.get('/api-integral-mall/save-card-config', { params }).then(res => {
if (res.data.errorCode === 0) {
this.$message.success('保存成功');
this.btnLoading = false;
this.getMess();
} else {
this.$message.error(res.data.message);
......
......@@ -37,11 +37,13 @@
</div>
</div>
<div class="fr">
<el-button plain @click="exportData"><i class="iconfont icon-icon_yunxiazai" style="margin-right:5px"></i>导出自提点</el-button>
<el-button plain @click="setPicked">自提设置</el-button>
<el-button type="primary" @click="addStore('-1')">新增自提点</el-button>
</div>
</div>
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" v-loading="loading" @selection-change="handleSelectAll">
<div v-loading="loading">
<el-table ref="multipleTable" :data="tableDate" style="width: 100%" @selection-change="handleSelectAll">
<el-table-column type="selection" width="55"> </el-table-column>
<el-table-column prop="pickUpPointName" label="自提点名称" min-width="200px"> </el-table-column>
<el-table-column prop="pickUpPointAddress" label="自提点地址" min-width="200px"> </el-table-column>
......@@ -83,8 +85,11 @@
</div>
</div>
</div>
</div>
<!-- 自提点设置 -->
<pickedAuto :pickedForm="pickedForm" @getList="getList"></pickedAuto>
<!-- 导出自提点 -->
<vue-gic-export-excel :dataArr="tableDate" :dialogVisible.sync="dialogVisible" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>
</div>
</template>
......@@ -113,7 +118,12 @@ export default {
selectIdList: [], //复选框选中的数据的id
list: [{ timeRange: [] }] //初始数据
},
enableAccessControl: false
enableAccessControl: false,
// 导出
dialogVisible: false,
excelUrl: '/api-integral-mall/pick-up-points-excel',
params: { search: '', dataType: 2, requestProject: 'integral-mall' },
projectName: 'integral-mall'
};
},
created() {
......@@ -285,6 +295,33 @@ export default {
// 编辑
goAdd(item) {
this.$router.push({ name: 'editDeliver', query: { integralMallPickUpPointId: item.integralMallPickUpPointId } });
},
// 导出数据
exportData() {
let params = {
search: this.searchValue
};
request
.post('/api-integral-mall/pick-up-points-excel', qs.stringify(params))
.then(res => {
if (res.data.errorCode === 0) {
setTimeout(() => {
window.open(window.location.origin + '/mall/#/reportList', '_self');
}, 1000);
} else {
this.$message.error(res.data.message);
return false;
}
})
.catch(error => {
this.$message.error({
duration: 1000,
message: error.message
});
return false;
});
// this.dialogVisible = true;
// this.params.search = this.searchValue;
}
},
components: {
......
......@@ -631,6 +631,7 @@ export default {
} else {
params.settingVo.fixedDate = [];
}
this.submitLoading = true;
request.post(url, params).then(res => {
if (res.data.errorCode === 0) {
this.submitLoading = false;
......
......@@ -24,7 +24,8 @@
</div>
</div>
</div>
<el-table :data="tableDate" style="width: 100%" v-loading="loading">
<div v-loading="loading">
<el-table :data="tableDate" style="width: 100%">
<el-table-column prop="author" label="操作人"> </el-table-column>
<el-table-column prop="integralMallProName" label="礼品/卡券名称">
<template slot-scope="scope">
......@@ -61,6 +62,7 @@
</div>
</div>
</div>
</div>
</template>
<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