|
@@ -129,8 +129,30 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
+ </div>
|
|
|
|
|
|
-
|
|
|
+ <div class="order-detail" v-if="orderDetail.orderOldProductDTOList && orderDetail.orderOldProductDTOList.length > 0" style="margin-bottom: 20px;">
|
|
|
+ <!-- 回收 -->
|
|
|
+ <el-table :data="orderDetail.orderOldProductDTOList" style="width: 100%;" size="small" border>
|
|
|
+ <el-table-column prop="bigName" label="大类" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="mainName" label="小类" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="specName" label="型号" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="itemList" label="属性" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{scope.row.itemList.map(o => o.dictName).join('、')}}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="unit" label="单位" align="center">
|
|
|
+ <template>台</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="num" label="数量" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="payAmount" label="旧机金额" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="yjhxDkFlag" label="支付方式" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ {1: '线上支付抵扣订单货款', 2: '仅线上展示旧机价值'}[scope.row.yjhxDkFlag] }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
</div>
|
|
|
|
|
|
<div class="order-detail" v-if="compensateList.length > 0" style="margin-bottom: 20px;">
|
|
@@ -176,15 +198,15 @@
|
|
|
<el-table-column prop="discountAmount" label="优惠金额" align="center"></el-table-column>
|
|
|
<!-- <el-table-column prop="zkAmount" label="折扣优惠" align="center"></el-table-column> -->
|
|
|
<el-table-column prop="applyAmount" label="优惠价格申请" align="center" min-width="110"></el-table-column>
|
|
|
- <el-table-column prop="profitAmount" label="实际销售金额" align="center">
|
|
|
+ <el-table-column prop="profitAmount" label="实际销售金额" align="center" min-width="110">
|
|
|
<template slot-scope="scope">
|
|
|
{{ orderDetail.workerId || orderDetail.promotionGroupUserId ? scope.row.profitAmount : scope.row.payAmount }}
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="payAmount" label="商品总金额" align="center" min-width="100"></el-table-column>
|
|
|
<el-table-column prop="freight" label="运费" align="center"></el-table-column>
|
|
|
- <el-table-column prop="userRefundNum" label="用户维权数量" align="center"></el-table-column>
|
|
|
- <el-table-column prop="userRefundAmount" label="用户维权金额" align="center"></el-table-column>
|
|
|
+ <el-table-column prop="userRefundNum" label="用户维权数量" align="center" min-width="110"></el-table-column>
|
|
|
+ <el-table-column prop="userRefundAmount" label="用户维权金额" align="center" min-width="110"></el-table-column>
|
|
|
<el-table-column prop="refundNum" label="退款数量" align="center"></el-table-column>
|
|
|
<el-table-column prop="refundAmount" label="退款金额" align="center"></el-table-column>
|
|
|
<el-table-column label="操作" align="center" width="160" v-if="orderDetail.orderStatus != 'CLOSE' && orderDetail.payTypeId == 'WECHAT'">
|