Authored by lzhy

修改

@@ -32,8 +32,14 @@ @@ -32,8 +32,14 @@
32 <td>{{ goods.activityDiscount }}</td> 32 <td>{{ goods.activityDiscount }}</td>
33 <td>{{ returnedReason[goods.returnedReason] }}</td> 33 <td>{{ returnedReason[goods.returnedReason] }}</td>
34 <template v-if="index == 0"> 34 <template v-if="index == 0">
35 - <td :rowspan="tableData.length" style="color: red">  
36 - <h3>{{ returnedAmount }}</h3> 35 + <td :rowspan="tableData.length">
  36 + {{ returnedInfo.realReturnedAmount }}
  37 + </td>
  38 + <td :rowspan="tableData.length">
  39 + {{ returnedInfo.returnShippingCost }}
  40 + </td>
  41 + <td :rowspan="tableData.length">
  42 + {{ returnedInfo.realReturnedAmount + returnedInfo.returnShippingCost }}
37 </td> 43 </td>
38 </template> 44 </template>
39 </tr> 45 </tr>
@@ -58,7 +64,7 @@ @@ -58,7 +64,7 @@
58 import prodImage from 'util/prod-image'; 64 import prodImage from 'util/prod-image';
59 export default { 65 export default {
60 name: 'ReturnedGoodsInfo', 66 name: 'ReturnedGoodsInfo',
61 - props: ['tableData', 'returnedReason', 'returnedAmount'], 67 + props: ['tableData', 'returnedReason', 'returnedInfo'],
62 data() { 68 data() {
63 return { 69 return {
64 tableCols: [ 70 tableCols: [
@@ -73,6 +79,8 @@ export default { @@ -73,6 +79,8 @@ export default {
73 { title: '礼品卡', width: '6%' }, 79 { title: '礼品卡', width: '6%' },
74 { title: '活动优惠', width: '6%' }, 80 { title: '活动优惠', width: '6%' },
75 { title: '退款原因', width: '6%' }, 81 { title: '退款原因', width: '6%' },
  82 + { title: '退货款金额', width: '6%' },
  83 + { title: '退运费金额', width: '6%' },
76 { title: '退款总金额', width: '6%' }, 84 { title: '退款总金额', width: '6%' },
77 ], 85 ],
78 }; 86 };
@@ -30,6 +30,10 @@ @@ -30,6 +30,10 @@
30 <template v-if="key == 0"> 30 <template v-if="key == 0">
31 <td :rowspan="item.returnedGoodsListBoArray.length">{{ item.consigneeName }}</td> 31 <td :rowspan="item.returnedGoodsListBoArray.length">{{ item.consigneeName }}</td>
32 <td :rowspan="item.returnedGoodsListBoArray.length">{{ item.realReturnedAmount }}</td> 32 <td :rowspan="item.returnedGoodsListBoArray.length">{{ item.realReturnedAmount }}</td>
  33 + <td :rowspan="item.returnedGoodsListBoArray.length">{{ item.returnShippingCost }}</td>
  34 + <td :rowspan="item.returnedGoodsListBoArray.length">
  35 + {{ item.realReturnedAmount + item.returnShippingCost }}
  36 + </td>
33 <td :rowspan="item.returnedGoodsListBoArray.length">退货</td> 37 <td :rowspan="item.returnedGoodsListBoArray.length">退货</td>
34 <td :rowspan="item.returnedGoodsListBoArray.length">{{ shopStatus[item.shopStatus] || '无' }}</td> 38 <td :rowspan="item.returnedGoodsListBoArray.length">{{ shopStatus[item.shopStatus] || '无' }}</td>
35 <td :rowspan="item.returnedGoodsListBoArray.length"> 39 <td :rowspan="item.returnedGoodsListBoArray.length">
@@ -65,7 +69,9 @@ export default { @@ -65,7 +69,9 @@ export default {
65 { title: 'SKN', width: '5%' }, 69 { title: 'SKN', width: '5%' },
66 { title: 'SKU', width: '5%' }, 70 { title: 'SKU', width: '5%' },
67 { title: '收货人', width: '5%' }, 71 { title: '收货人', width: '5%' },
68 - { title: '退款金额', width: '5%' }, 72 + { title: '退货款金额', width: '5%' },
  73 + { title: '退运费金额', width: '5%' },
  74 + { title: '退款总金额', width: '5%' },
69 { title: '售后类型', width: '5%' }, 75 { title: '售后类型', width: '5%' },
70 { title: '退款状态', width: '5%' }, 76 { title: '退款状态', width: '5%' },
71 { title: '操作', width: '10%' }, 77 { title: '操作', width: '10%' },
@@ -21,11 +21,7 @@ @@ -21,11 +21,7 @@
21 <!--订单基本信息--> 21 <!--订单基本信息-->
22 <order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info> 22 <order-base-info :order-info="orderInfo" :order-status="orderStatus"></order-base-info>
23 <!--退货商品信息--> 23 <!--退货商品信息-->
24 - <returned-goods-info  
25 - :table-data="returnGoods"  
26 - :returned-reason="returnedReasonArr"  
27 - :returned-amount="returnTotalAmount"  
28 - > 24 + <returned-goods-info :table-data="returnGoods" :returned-reason="returnedReasonArr" :returned-info="returnedInfo">
29 </returned-goods-info> 25 </returned-goods-info>
30 <div class="ivu-card"> 26 <div class="ivu-card">
31 <div class="ivu-card-head"> 27 <div class="ivu-card-head">