Authored by lzhy

修改

... ... @@ -32,8 +32,14 @@
<td>{{ goods.activityDiscount }}</td>
<td>{{ returnedReason[goods.returnedReason] }}</td>
<template v-if="index == 0">
<td :rowspan="tableData.length" style="color: red">
<h3>{{ returnedAmount }}</h3>
<td :rowspan="tableData.length">
{{ returnedInfo.realReturnedAmount }}
</td>
<td :rowspan="tableData.length">
{{ returnedInfo.returnShippingCost }}
</td>
<td :rowspan="tableData.length">
{{ returnedInfo.realReturnedAmount + returnedInfo.returnShippingCost }}
</td>
</template>
</tr>
... ... @@ -58,7 +64,7 @@
import prodImage from 'util/prod-image';
export default {
name: 'ReturnedGoodsInfo',
props: ['tableData', 'returnedReason', 'returnedAmount'],
props: ['tableData', 'returnedReason', 'returnedInfo'],
data() {
return {
tableCols: [
... ... @@ -73,6 +79,8 @@ export default {
{ title: '礼品卡', width: '6%' },
{ title: '活动优惠', width: '6%' },
{ title: '退款原因', width: '6%' },
{ title: '退货款金额', width: '6%' },
{ title: '退运费金额', width: '6%' },
{ title: '退款总金额', width: '6%' },
],
};
... ...
... ... @@ -30,6 +30,10 @@
<template v-if="key == 0">
<td :rowspan="item.returnedGoodsListBoArray.length">{{ item.consigneeName }}</td>
<td :rowspan="item.returnedGoodsListBoArray.length">{{ item.realReturnedAmount }}</td>
<td :rowspan="item.returnedGoodsListBoArray.length">{{ item.returnShippingCost }}</td>
<td :rowspan="item.returnedGoodsListBoArray.length">
{{ item.realReturnedAmount + item.returnShippingCost }}
</td>
<td :rowspan="item.returnedGoodsListBoArray.length">退货</td>
<td :rowspan="item.returnedGoodsListBoArray.length">{{ shopStatus[item.shopStatus] || '无' }}</td>
<td :rowspan="item.returnedGoodsListBoArray.length">
... ... @@ -65,7 +69,9 @@ export default {
{ title: 'SKN', width: '5%' },
{ title: 'SKU', width: '5%' },
{ title: '收货人', width: '5%' },
{ title: '退款金额', width: '5%' },
{ title: '退货款金额', width: '5%' },
{ title: '退运费金额', width: '5%' },
{ title: '退款总金额', width: '5%' },
{ title: '售后类型', width: '5%' },
{ title: '退款状态', width: '5%' },
{ title: '操作', width: '10%' },
... ...
... ... @@ -21,11 +21,7 @@
<!--订单基本信息-->
<order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
<!--退货商品信息-->
<returned-goods-info
:table-data="returnGoods"
:returned-reason="returnedReasonArr"
:returned-amount="returnTotalAmount"
>
<returned-goods-info :table-data="returnGoods" :returned-reason="returnedReasonArr" :returned-info="returnedInfo">
</returned-goods-info>
<div class="ivu-card">
<div class="ivu-card-head">
... ...