|
@@ -3,27 +3,69 @@
|
|
|
<div class="filter-container">
|
|
|
<div class="filter-control">
|
|
|
<span>子订单ID:</span>
|
|
|
- <el-input v-model="listQuery.shopOrderId" style="width:180px;" placeholder="子订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.shopOrderId"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="子订单ID"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>子订单编号:</span>
|
|
|
- <el-input v-model="listQuery.shopOrderNo" style="width:180px;" placeholder="子订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.shopOrderNo"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="子订单编号"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>订单ID:</span>
|
|
|
- <el-input v-model="listQuery.orderId" style="width:180px;" placeholder="订单ID" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.orderId"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="订单ID"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>订单编号:</span>
|
|
|
- <el-input v-model="listQuery.orderNo" style="width:180px;" placeholder="订单编号" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.orderNo"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="订单编号"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>供应商:</span>
|
|
|
- <el-input v-model="listQuery.shopName" style="width:180px;" placeholder="供应商" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.shopName"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="供应商"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>机构名称:</span>
|
|
|
- <el-input v-model="listQuery.clubName" style="width:180px;" placeholder="机构名称" clearable @keyup.enter.native="getList" @clear="getList" />
|
|
|
+ <el-input
|
|
|
+ v-model="listQuery.clubName"
|
|
|
+ style="width:180px;"
|
|
|
+ placeholder="机构名称"
|
|
|
+ clearable
|
|
|
+ @keyup.enter.native="getList"
|
|
|
+ @clear="getList"
|
|
|
+ />
|
|
|
</div>
|
|
|
<div class="filter-control">
|
|
|
<span>下单时间:</span>
|
|
@@ -129,7 +171,7 @@
|
|
|
<span>{{ row.productAmount | amountfilters }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="机构" align="center" prop="buyer" />
|
|
|
+ <el-table-column label="机构名称" align="center" prop="clubName" />
|
|
|
<el-table-column label="机构运费" align="center" prop="freight">
|
|
|
<template slot-scope="{row}">
|
|
|
<span>{{ row.postageInfo }}</span>
|
|
@@ -151,9 +193,9 @@
|
|
|
<span class="el-span-danger">{{ row.shouldPayShopAmount | amountfilters }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="操作" align="center">
|
|
|
+ <el-table-column label="操作" align="center" width="120">
|
|
|
<template slot-scope="{row}">
|
|
|
- <el-button type="text" size="mini" @click="handleToRecord(row.shopOrderId)">退/付款记录</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="handleToRecord(row.shopOrderId)">退/付款记录</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -272,20 +314,6 @@ export default {
|
|
|
console.log('error', error)
|
|
|
}
|
|
|
},
|
|
|
- // 数组是否有重复
|
|
|
- checkForDuplicates(arr, id = 'shopId') {
|
|
|
- const newShopArr = []
|
|
|
- let flag = false
|
|
|
- for (const item of arr) {
|
|
|
- newShopArr.push(item[id])
|
|
|
- for (const el of newShopArr) {
|
|
|
- if (item[id] !== el) {
|
|
|
- flag = true
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- return flag
|
|
|
- },
|
|
|
handleToRecord(shopOrderId) {
|
|
|
this.$router.push({ path: '/finance/payment-record', query: { shopOrderId: shopOrderId }})
|
|
|
}
|