|
|
@@ -2,7 +2,6 @@
|
|
|
<div v-loading="loading">
|
|
|
<div class="white-box">
|
|
|
<el-table class="withdraw-table" :data="tableData" style="width: 100%;" :span-method="objectSpanMethod">
|
|
|
- <el-table-column width="120" label="订单类型" prop="ORDER_TYPE"></el-table-column>
|
|
|
<el-table-column label="商品编号" prop="SKU_CODE"></el-table-column>
|
|
|
<el-table-column label="商品名称" prop="GOODS_TITLE"></el-table-column>
|
|
|
<el-table-column label="数量" prop="BUY_NUMS"></el-table-column>
|
|
|
@@ -22,6 +21,7 @@
|
|
|
<el-table-column label="收货人" prop="CONSIGNEE"></el-table-column>
|
|
|
<el-table-column label="收货电话" prop="MOBILE"></el-table-column>
|
|
|
<el-table-column label="支付时间" prop="PAY_AT"></el-table-column>
|
|
|
+ <el-table-column label="订单类型" prop="ORDER_TYPE"></el-table-column>
|
|
|
</el-table>
|
|
|
<div class="white-box-footer">
|
|
|
<pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
|
|
|
@@ -74,7 +74,8 @@
|
|
|
obj.columnIndex === 7 ||
|
|
|
obj.columnIndex === 8 ||
|
|
|
obj.columnIndex === 9 ||
|
|
|
- obj.columnIndex === 10
|
|
|
+ obj.columnIndex === 10 ||
|
|
|
+ obj.columnIndex === 11
|
|
|
) {
|
|
|
// ⼆维数组存储的数据取出
|
|
|
var _row = this.spanArr[obj.rowIndex];
|