Skip to content

I
integral-mall
Commit 527877a5 by huaying
Options

Merge branch 'bugfix/积分订单导出订单时间限制' into test 

# Conflicts:
#	src/views/order/couponExchange.vue
parents 344a7ff7 fa67060d
Showing with 224 additions and 73 deletions
src/views/order/couponExchange.vue
......@@ -19,7 +19,8 @@
<div class="operate-top">
<div class="fl">
<div class="search-item m-r-10">
<span>下单时间</span><el-date-picker
<span>下单时间</span
><el-date-picker
class="date-picker"
@change="changeTime"
v-model="dateValue"
......@@ -39,7 +40,7 @@
<el-input
placeholder="请输入关键词搜索"
v-model.trim="searchValue"
style="width:280px;"
style="width: 280px"
clearable
@keyup.enter.native="handleInputSearch(searchValue)"
@clear="handleInputSearch(searchValue)"
......@@ -48,7 +49,7 @@
v-model="searchType"
slot="prepend"
placeholder="请选择"
style="width:100px;"
style="width: 100px"
>
<el-option label="订单编号" :value="1" />
<el-option label="卡券名称" :value="2" />
......@@ -80,7 +81,9 @@
<div class="fr">
<el-button
@click="exportExcel"
v-if="integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
v-if="
integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)
"
type="primary"
:limit-code="$buttonCode.couponExchangeExport"
>
......@@ -88,11 +91,16 @@
</el-button>
<el-button
@click="exportExcelAll"
v-if="!integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)"
v-if="
!integralMallProId && $getButtonLimit($buttonCode.couponExchangeExport)
"
type="primary"
:limit-code="$buttonCode.couponExchangeExport"
>
<i class="iconfont icon-icon_yunxiazai" style="margin-right:5px" />导出订单
<i
class="iconfont icon-icon_yunxiazai"
style="margin-right: 5px"
/>导出订单
</el-button>
</div>
</div>
......@@ -119,27 +127,60 @@
<!-- 折扣券 -->
<!-- <img v-if="scope.row.cardType === 1" src="../../../static/img/zhe.png" alt="" /> -->
<!-- 兑换券 -->
<img v-if="scope.row.giftMainPic" :src="scope.row.giftMainPic" alt="">
<img v-if="scope.row.cardType === 2 && !scope.row.giftMainPic" src="../../../static/img/quan02.png" alt="">
<img v-if="scope.row.giftMainPic" :src="scope.row.giftMainPic" alt="" />
<img
v-if="scope.row.cardType === 2 && !scope.row.giftMainPic"
src="../../../static/img/quan02.png"
alt=""
/>
<!-- 抵金券 -->
<img v-if="scope.row.cardType === 0 && !scope.row.giftMainPic" src="../../../static/img/quan01.png" alt="">
<img
v-if="scope.row.cardType === 0 && !scope.row.giftMainPic"
src="../../../static/img/quan01.png"
alt=""
/>
<!-- 折扣券 -->
<img v-if="scope.row.cardType === 1 && !scope.row.giftMainPic" src="../../../static/img/quan03.png" alt="">
<img
v-if="scope.row.cardType === 1 && !scope.row.giftMainPic"
src="../../../static/img/quan03.png"
alt=""
/>
<!-- 商场券 -->
<img v-if="scope.row.cardType === 3 && !scope.row.giftMainPic" src="../../../static/img/quan04.png" alt>
<img
v-if="scope.row.cardType === 3 && !scope.row.giftMainPic"
src="../../../static/img/quan04.png"
alt
/>
<div class="info-name">
<p class="pro-ellipsis">
{{ scope.row.giftName }}
</p>
<el-tooltip :content="scope.row.proReferId" placement="top" v-if="scope.row.proReferId.indexOf(',') === -1">
<p style="font-size:13px;color:#909399;overflow: hidden;text-overflow:ellipsis;white-space: nowrap;">
<el-tooltip
:content="scope.row.proReferId"
placement="top"
v-if="scope.row.proReferId.indexOf(',') === -1"
>
<p
style="
font-size: 13px;
color: #909399;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
"
>
卡券编号：{{ scope.row.proReferId }}
</p>
</el-tooltip>
<p style="font-size:13px;color:#909399" v-if="scope.row.proReferId.indexOf(',') === -1">
<p
style="font-size: 13px; color: #909399"
v-if="scope.row.proReferId.indexOf(',') === -1"
>
<span v-if="scope.row.status === 2">已领取</span>
<span v-if="scope.row.status <= 1 && scope.row.status != -2">待领取</span>
<span v-if="scope.row.status <= 1 && scope.row.status != -2"
>待领取</span
>
<span v-if="scope.row.status != -2"> / </span>
<span v-if="scope.row.useStatus === 5">已使用</span>
<span v-if="scope.row.useStatus === 0">待使用</span>
......@@ -156,25 +197,43 @@
sortable="custom"
>
<template slot-scope="scope">
<p style="line-height:18px">
{{ scope.row.createTime ? getTime(scope.row.createTime) : '--' }}
<p style="line-height: 18px">
{{ scope.row.createTime ? getTime(scope.row.createTime) : "--" }}
</p>
<p style="line-height:18px" class="gray-color">
{{ scope.row.createTime ? getSeconds(scope.row.createTime) : '--' }}
<p style="line-height: 18px" class="gray-color">
{{ scope.row.createTime ? getSeconds(scope.row.createTime) : "--" }}
</p>
</template>
</el-table-column>
<el-table-column prop="creatorName" label="优惠券创建人" min-width="130px" />
<el-table-column prop="definedCode" label="订单编号" min-width="170px">
<template slot-scope="scope">
<el-dropdown @visible-change="i => getOrderInfo(i, scope.row.integralMallProExchangeId)" trigger="click" class="drop-list">
<span class="el-dropdown-link"> {{ scope.row.definedCode }}<i class="iconfont icon-icon-" /> </span>
<el-dropdown
@visible-change="
(i) => getOrderInfo(i, scope.row.integralMallProExchangeId)
"
trigger="click"
class="drop-list"
>
<span class="el-dropdown-link">
{{ scope.row.definedCode }}<i class="iconfont icon-icon-" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="orderInfo.definedCode">
订单编号：{{ orderInfo.orderNumber }}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
兑换渠道：{{ orderInfo.source === '0' ? '小程序' : orderInfo.source === '1' ? '二维码扫描' : orderInfo.source === '3' ? '常规兑换' : orderInfo.source === '2' ? '其他' : '' }}
兑换渠道：{{
orderInfo.source === "0"
? "小程序"
: orderInfo.source === "1"
? "二维码扫描"
: orderInfo.source === "3"
? "常规兑换"
: orderInfo.source === "2"
? "其他"
: ""
}}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
商户支付号：{{ orderInfo.merchantNumber }}
......@@ -183,19 +242,28 @@
支付流水号：{{ orderInfo.payNumber }}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
下单时间：{{ orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : '--' }}
下单时间：{{
orderInfo.orderTime ? getTimeAll(orderInfo.orderTime) : "--"
}}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
付款时间：{{ orderInfo.payTime ? getTimeAll(orderInfo.payTime) : '--' }}
付款时间：{{
orderInfo.payTime ? getTimeAll(orderInfo.payTime) : "--"
}}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
发货时间：{{ orderInfo.deliveryTime ? getTimeAll(orderInfo.deliveryTime) : '--' }}
发货时间：{{
orderInfo.deliveryTime ? getTimeAll(orderInfo.deliveryTime) : "--"
}}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
交易完成时间：{{ orderInfo.finishTime ? getTimeAll(orderInfo.finishTime) : '--' }}
交易完成时间：{{
orderInfo.finishTime ? getTimeAll(orderInfo.finishTime) : "--"
}}
</el-dropdown-item>
<el-dropdown-item command="orderInfo.definedCode">
收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }} {{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}
收货信息：{{ orderInfo.definedCode }} {{ orderInfo.consignee }}
{{ orderInfo.consigneePhone }} {{ orderInfo.receivingAddress }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -203,7 +271,11 @@
</el-table-column>
<el-table-column label="会员" min-width="150px">
<template slot-scope="scope">
<memberInfo :memberObj="scope.row" :requestProject="requestProject" :placement="placement" />
<memberInfo
:memberObj="scope.row"
:requestProject="requestProject"
:placement="placement"
/>
</template>
</el-table-column>
<!-- <el-table-column prop="memberCardStatus" label="会员状态" min-width="120px">
......@@ -218,12 +290,8 @@
min-width="120px"
>
<template slot-scope="scope">
<p style="line-height:18px">
积分：{{ scope.row.unitCostIntegral }}
</p>
<p style="line-height:18px">
现金：￥{{ scope.row.payCost }}
</p>
<p style="line-height: 18px">积分：{{ scope.row.unitCostIntegral }}</p>
<p style="line-height: 18px">现金：￥{{ scope.row.payCost }}</p>
</template>
</el-table-column>
<el-table-column
......@@ -233,15 +301,21 @@
min-width="170px"
>
<template slot-scope="scope">
<p style="line-height:18px">
<p style="line-height: 18px">
<span v-if="scope.row.status <= 0">交易关闭</span>
<span v-if="scope.row.status === 2 || scope.row.status === 1">买家已付款</span>
<span v-if="scope.row.status === 2 || scope.row.status === 1"
>买家已付款</span
>
<span v-if="scope.row.status === 11">待付款</span>
</p>
<p style="line-height:18px">
<p style="line-height: 18px">
<el-button
type="text"
v-if="scope.row.status === 11 && scope.row.refundStatus !== 2 && $getButtonLimit($buttonCode.couponExchangeClose)"
v-if="
scope.row.status === 11 &&
scope.row.refundStatus !== 2 &&
$getButtonLimit($buttonCode.couponExchangeClose)
"
@click="closeOrderNoPay(scope.row)"
:limit-code="$buttonCode.couponExchangeClose"
>
......@@ -253,13 +327,13 @@
<template slot="empty">
<div class="no-data-wrap">
<div class="no-data-icon">
<img src="../../../static/img/no-data_icon.png">
<img src="../../../static/img/no-data_icon.png" />
</div>
<p>暂无数据</p>
</div>
</template>
</el-table>
<div class="pagination-conteiner" style="background:#fff;">
<div class="pagination-conteiner" style="background: #fff">
<div class="pagination">
<dm-pagination
v-if="total != 0"
......@@ -385,7 +459,7 @@ export default {
const params = {
creatorName: v,
};
request.get('/api-integral-mall/list-creator', { params }).then(res => {
request.get('/api-integral-mall/list-creator', { params }).then((res) => {
if (res.data.errorCode === 0) {
if (res.data.result) {
cb(res.data.result);
......@@ -399,7 +473,7 @@ export default {
});
},
getStatus () {
request.post('/api-integral-mall/is-show-self ').then(res => {
request.post('/api-integral-mall/is-show-self ').then((res) => {
if (res.data.errorCode === 0) {
this.showFlag = res.data.result.showFlag;
// this.openFlag = res.data.result.openFlag;
......@@ -445,7 +519,8 @@ export default {
}
this.params = {
orderStatus: this.orderStatus,
changeType: this.changeType,
// changeType: this.changeType,
changeType: -1,
searchParams: this.searchValue,
searchType: this.searchType,
beginTime: this.beginTime,
......@@ -458,7 +533,40 @@ export default {
this.dialogVisible = true;
// window.location = `${exportOnlineListExcel}?orderStatus=${this.listParams.orderStatus}&changeType=${this.listParams.changeType}&searchParams=${this.listParams.searchParams}&beginTime=${this.listParams.beginTime}&endTime=${this.listParams.endTime}&requestProject=marketing`;
},
// 计算自然月
natureMonth (curDate, step) {
if (!curDate || !step) return curDate;
if (typeof curDate === 'string') {
curDate = new Date(curDate.replace(/[\/|\.]/g, '-'));
} // new Date(str) 对str格式的，ios只支持yyyy-MM-dd
const targetDateLastDay = new Date(
curDate.getFullYear(),
curDate.getMonth() + step + 1,
0,
);
const targetDate = new Date(
curDate.getFullYear(),
curDate.getMonth() + step,
Math.min(curDate.getDate(), targetDateLastDay.getDate()),
);
return this.formatDate(targetDate, 'yyyy-MM-dd');
},
formatDate (dateObj, format) {
const month = dateObj.getMonth() + 1;
const date = dateObj.getDate();
return format.replace(/yyyy|MM|dd/g, (field) => {
switch (field) {
case 'yyyy':
return dateObj.getFullYear();
case 'MM':
return month < 10 ? '0' + month : month;
case 'dd':
return date < 10 ? '0' + date : date;
}
});
},
// 导出列表
exportExcelAll () {
if (this.dateValue) {
......@@ -472,10 +580,16 @@ export default {
this.$message.error('时间不能为空');
return;
}
if (new Date(this.endTime).getTime() - new Date(this.beginTime).getTime() > 90 * 24 * 3600 * 1000) {
const data = this.natureMonth(this.beginTime, 3);
const endTimes = this.endTime.split(' ')[0];
if (new Date(data).getTime() - 1 * 24 * 1000 < new Date(endTimes).getTime()) {
this.$message.error('导出订单不支持导出超过3个月时长的数据，请重新选择时间');
return;
}
// if (new Date(this.endTime).getTime() - new Date(this.beginTime).getTime() > 90 * 24 * 3600 * 1000) {
// this.$message.error('导出订单不支持导出超过3个月时长的数据，请重新选择时间');
// return;
// }
this.paramsAll = {
orderStatus: this.orderStatus,
changeType: -1,
......@@ -496,18 +610,20 @@ export default {
const params = {
integralMallProExchangeId: integralMallProExchangeId,
};
request.get('/api-integral-mall/get-order-information', { params }).then(res => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result) {
this.orderInfo = res.data.result;
request
.get('/api-integral-mall/get-order-information', { params })
.then((res) => {
if (res.data.errorCode === 0) {
// this.loading = false;
if (res.data.result) {
this.orderInfo = res.data.result;
} else {
this.orderInfo = {};
}
} else {
this.orderInfo = {};
this.$message.error(res.data.message);
}
} else {
this.$message.error(res.data.message);
}
});
});
}
},
// 排序
......@@ -551,25 +667,27 @@ export default {
integralMallProId: this.integralMallProId ? this.integralMallProId : '',
};
this.loading = true;
request.post('/api-integral-mall/page-undeliver', qs.stringify(params)).then(res => {
if (res.data.errorCode === 0) {
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
for (const item of this.tableData) {
if (item.sku) {
item.sku = JSON.parse(item.sku);
request
.post('/api-integral-mall/page-undeliver', qs.stringify(params))
.then((res) => {
if (res.data.errorCode === 0) {
if (res.data.result.rows) {
this.tableData = res.data.result.rows;
this.total = res.data.result.total;
for (const item of this.tableData) {
if (item.sku) {
item.sku = JSON.parse(item.sku);
}
}
} else {
this.tableData = [];
this.total = 0;
}
this.loading = false;
} else {
this.tableData = [];
this.total = 0;
this.$message.error(res.data.message);
}
this.loading = false;
} else {
this.$message.error(res.data.message);
}
});
});
},
// 关闭订单
// closeOrder(item) {
......@@ -583,7 +701,7 @@ export default {
integralMallProExchangeId: item.integralMallProExchangeId,
optType: 4,
};
request.get('/api-integral-mall/order-opt', { params }).then(res => {
request.get('/api-integral-mall/order-opt', { params }).then((res) => {
if (res.data.errorCode === 0) {
this.$message.success('关闭订单成功');
this.getList();
......@@ -597,8 +715,8 @@ export default {
</script>
<style lang="less" scoped>
/deep/.el-tabs__header .el-tabs__nav-wrap::after {
content: "";
height: 1px!important;
content: "";
height: 1px !important;
}
.m-r-10 {
margin-right: 10px;
......
src/views/order/giftExchange.vue
......@@ -833,6 +833,30 @@ export default {
betachDeliver () {
this.deliverModal.dialogVisible = true;
},
// 计算自然月
natureMonth (curDate, step) {
if (!curDate || !step) return curDate;
if (typeof curDate === 'string') curDate = new Date(curDate.replace(/[\/|\.]/g, '-')); // new Date(str) 对str格式的，ios只支持yyyy-MM-dd
const targetDateLastDay = new Date(curDate.getFullYear(), curDate.getMonth() + step + 1, 0);
const targetDate = new Date(curDate.getFullYear(), curDate.getMonth() + step, Math.min(curDate.getDate(), targetDateLastDay.getDate()));
return this.formatDate(targetDate, 'yyyy-MM-dd');
},
formatDate (dateObj, format) {
const month = dateObj.getMonth() + 1;
const date = dateObj.getDate();
return format.replace(/yyyy|MM|dd/g, field => {
switch (field) {
case 'yyyy':
return dateObj.getFullYear();
case 'MM':
return month < 10 ? '0' + month : month;
case 'dd':
return date < 10 ? '0' + date : date;
}
});
},
// 导出发货单
exportExcel () {
if (this.dateValue) {
......@@ -846,10 +870,19 @@ export default {
this.$message.error('时间不能为空');
return;
}
if (new Date(this.endTime).getTime() - new Date(this.beginTime).getTime() > 90 * 24 * 3600 * 1000) {
const data = this.natureMonth(this.beginTime, 3);
const endTimes = this.endTime.split(' ')[0];
// console.log(this.endTime.split(' '), 'iiii');
// console.log(data, typeof data, '选择时间', this.endTime, typeof this.endTime);
// console.log(new Date(data).getTime(), new Date(this.endTime).getTime());
if (new Date(data).getTime() - 1 * 24 * 1000 < new Date(endTimes).getTime()) {
this.$message.error('导出订单不支持导出超过3个月时长的数据，请重新选择时间');
return;
}
// if (new Date(this.endTime).getTime() - new Date(this.beginTime).getTime() > 90 * 24 * 3600 * 1000) {
// this.$message.error('导出订单不支持导出超过3个月时长的数据，请重新选择时间');
// return;
// }
this.params = {
orderStatus: this.orderStatus,
changeType: this.changeType ? this.changeType : -1,
......
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