|
|
@@ -5,7 +5,7 @@
|
|
|
<el-tab-pane label="拒收产品维度" name="product"></el-tab-pane>
|
|
|
</el-tabs>
|
|
|
|
|
|
- <!-- 订单类型选择 -->
|
|
|
+ <!-- 订单类型选择：仅保留外部订单，其余先注释
|
|
|
<el-form :inline="true" style="margin-bottom: 10px;">
|
|
|
<el-form-item label="订单类型">
|
|
|
<el-radio-group v-model="orderType" size="small" @change="handleOrderTypeChange">
|
|
|
@@ -15,6 +15,7 @@
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
+ -->
|
|
|
|
|
|
<!-- 拒收时间维度查询条件 -->
|
|
|
<el-form v-show="activeTab === 'order'" :model="orderQuery" ref="orderQueryForm" :inline="true" label-width="90px">
|
|
|
@@ -81,8 +82,8 @@
|
|
|
<el-form-item label="电话2" prop="memberPhone">
|
|
|
<el-input v-model="orderQuery.memberPhone" placeholder="请输入电话2" clearable size="small" @keyup.enter.native="handleOrderQuery" />
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="销售姓名" prop="companyUserName">
|
|
|
- <el-input v-model="orderQuery.companyUserName" placeholder="请输入销售姓名" clearable size="small" @keyup.enter.native="handleOrderQuery" />
|
|
|
+ <el-form-item label="坐席姓名" prop="companyUserName">
|
|
|
+ <el-input v-model="orderQuery.companyUserName" placeholder="请输入坐席姓名" clearable size="small" @keyup.enter.native="handleOrderQuery" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="订购产品" prop="productName">
|
|
|
<el-input v-model="orderQuery.productName" placeholder="请输入产品名称" clearable size="small" @keyup.enter.native="handleOrderQuery" />
|
|
|
@@ -103,7 +104,7 @@
|
|
|
</el-row>
|
|
|
|
|
|
<!-- 拒收时间维度列表 -->
|
|
|
- <el-table v-show="activeTab === 'order'" v-loading="orderLoading" border :data="orderList" style="width:100%" show-summary :summary-method="getSummaries" @filter-change="handleFilterChange">
|
|
|
+ <el-table v-show="activeTab === 'order'" v-loading="orderLoading" border :data="orderList" style="width:100%" height="500" show-summary :summary-method="getSummaries" @filter-change="handleFilterChange">
|
|
|
<el-table-column label="订单编号" align="center" prop="orderCode" min-width="160" column-key="orderCode" :filters="getFilters(orderList, 'orderCode')" :filtered-value="columnFilters.orderCode" />
|
|
|
<el-table-column label="快递单号" align="center" prop="deliverySn" min-width="140" show-overflow-tooltip column-key="deliverySn" :filters="getFilters(orderList, 'deliverySn')" :filtered-value="columnFilters.deliverySn" />
|
|
|
<el-table-column label="会员姓名" align="center" prop="userName" min-width="80" column-key="userName" :filters="getFilters(orderList, 'userName')" :filtered-value="columnFilters.userName" />
|
|
|
@@ -132,8 +133,8 @@
|
|
|
<el-table-column label="拒收人" align="center" prop="rejectUser" min-width="90" column-key="rejectUser" :filters="getFilters(orderList, 'rejectUser')" :filtered-value="columnFilters.rejectUser" />
|
|
|
<el-table-column label="电话1" align="center" prop="userPhone" min-width="120" column-key="userPhone" :filters="getFilters(orderList, 'userPhone')" :filtered-value="columnFilters.userPhone" />
|
|
|
<el-table-column label="电话2" align="center" prop="memberPhone" min-width="120" column-key="memberPhone" :filters="getFilters(orderList, 'memberPhone')" :filtered-value="columnFilters.memberPhone" />
|
|
|
- <el-table-column label="销售姓名" align="center" prop="companyUserName" min-width="90" column-key="companyUserName" :filters="getFilters(orderList, 'companyUserName')" :filtered-value="columnFilters.companyUserName" />
|
|
|
- <el-table-column label="订购产品" align="center" prop="productNames" min-width="180" show-overflow-tooltip column-key="productNames" :filters="getFilters(orderList, 'productNames')" :filtered-value="columnFilters.productNames" />
|
|
|
+ <el-table-column label="坐席姓名" align="center" prop="companyUserName" min-width="90" column-key="companyUserName" :filters="getFilters(orderList, 'companyUserName')" :filtered-value="columnFilters.companyUserName" />
|
|
|
+ <el-table-column label="商品名称*数量" align="center" prop="productInfo" min-width="220" show-overflow-tooltip column-key="productInfo" :filters="getFilters(orderList, 'productInfo')" :filtered-value="columnFilters.productInfo" />
|
|
|
<el-table-column label="地址" align="center" prop="userAddress" min-width="180" show-overflow-tooltip column-key="userAddress" :filters="getFilters(orderList, 'userAddress')" :filtered-value="columnFilters.userAddress" />
|
|
|
</el-table>
|
|
|
|
|
|
@@ -172,7 +173,7 @@
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-show="activeTab === 'product'" v-loading="productLoading" border :data="productList" style="width:100%" show-summary :summary-method="getSummaries" @filter-change="handleFilterChange">
|
|
|
+ <el-table v-show="activeTab === 'product'" v-loading="productLoading" border :data="productList" style="width:100%" height="500" show-summary :summary-method="getSummaries" @filter-change="handleFilterChange">
|
|
|
<el-table-column label="订购产品" align="center" prop="productName" min-width="200" show-overflow-tooltip column-key="productName" :filters="getFilters(productList, 'productName')" :filtered-value="columnFilters.productName" />
|
|
|
<el-table-column label="快递公司" align="center" prop="deliveryName" min-width="120" column-key="deliveryName" :filters="getFilters(productList, 'deliveryName')" :filtered-value="columnFilters.deliveryName" />
|
|
|
<el-table-column label="数量" align="center" prop="num" min-width="100" column-key="num" :filters="getFilters(productList, 'num', true)" :filtered-value="columnFilters.num" />
|
|
|
@@ -190,7 +191,7 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listRejectOrderReport, exportRejectOrderReport, listRejectProductReport, exportRejectProductReport, listStoreRejectOrderReport, exportStoreRejectOrderReport, listStoreRejectProductReport, exportStoreRejectProductReport, listGuCoinRejectOrderReport, exportGuCoinRejectOrderReport, listGuCoinRejectProductReport, exportGuCoinRejectProductReport } from '@/api/store/rejectReport'
|
|
|
+import { listRejectOrderReport, exportRejectOrderReport, listRejectProductReport, exportRejectProductReport /*, listStoreRejectOrderReport, exportStoreRejectOrderReport, listStoreRejectProductReport, exportStoreRejectProductReport, listGuCoinRejectOrderReport, exportGuCoinRejectOrderReport, listGuCoinRejectProductReport, exportGuCoinRejectProductReport */ } from '@/api/store/rejectReport'
|
|
|
|
|
|
export default {
|
|
|
name: 'RejectReport',
|
|
|
@@ -250,7 +251,7 @@ export default {
|
|
|
orderCode: [], deliverySn: [], userName: [], externalCreateTime: [],
|
|
|
deliveryTime: [], totalPrice: [], deliveryName: [], followTime: [],
|
|
|
rejectReturnTime: [], rejectUser: [], userPhone: [], memberPhone: [],
|
|
|
- companyUserName: [], productNames: [], userAddress: [],
|
|
|
+ companyUserName: [], productInfo: [], userAddress: [],
|
|
|
productName: [], num: []
|
|
|
}
|
|
|
}
|
|
|
@@ -290,7 +291,7 @@ export default {
|
|
|
deliveryTime: ['deliveryStartTime', 'deliveryEndTime'],
|
|
|
rejectReturnTime: ['rejectReturnTimeStart', 'rejectReturnTimeEnd']
|
|
|
} : {}
|
|
|
- const fieldMap = { productNames: 'productName', rejectUser: 'returnUser' }
|
|
|
+ const fieldMap = { productInfo: 'productName', rejectUser: 'returnUser' }
|
|
|
const isExternal = this.orderType === 'external'
|
|
|
Object.keys(filters).forEach(key => {
|
|
|
const vals = filters[key] || []
|
|
|
@@ -347,7 +348,7 @@ export default {
|
|
|
deliveryTime: ['deliveryStartTime', 'deliveryEndTime'],
|
|
|
rejectReturnTime: ['rejectReturnTimeStart', 'rejectReturnTimeEnd']
|
|
|
}
|
|
|
- const fieldMap = { productNames: 'productName', rejectUser: 'returnUser' }
|
|
|
+ const fieldMap = { productInfo: 'productName', rejectUser: 'returnUser' }
|
|
|
Object.keys(this.columnFilters).forEach(key => {
|
|
|
const fieldName = fieldMap[key] || key
|
|
|
if (orderTimeRangeMap[key]) {
|
|
|
@@ -395,8 +396,8 @@ export default {
|
|
|
const params = { ...this.orderQuery }
|
|
|
if (params.totalPrice === 0) params.totalPrice = null
|
|
|
let api = listRejectOrderReport
|
|
|
- if (this.orderType === 'store') api = listStoreRejectOrderReport
|
|
|
- else if (this.orderType === 'guCoin') api = listGuCoinRejectOrderReport
|
|
|
+ // if (this.orderType === 'store') api = listStoreRejectOrderReport
|
|
|
+ // else if (this.orderType === 'guCoin') api = listGuCoinRejectOrderReport
|
|
|
api(params).then(response => {
|
|
|
this.orderList = response.rows || []
|
|
|
this.orderTotal = response.total || 0
|
|
|
@@ -465,8 +466,8 @@ export default {
|
|
|
delete params.pageSize
|
|
|
if (params.totalPrice === 0) params.totalPrice = null
|
|
|
let api = exportRejectOrderReport
|
|
|
- if (this.orderType === 'store') api = exportStoreRejectOrderReport
|
|
|
- else if (this.orderType === 'guCoin') api = exportGuCoinRejectOrderReport
|
|
|
+ // if (this.orderType === 'store') api = exportStoreRejectOrderReport
|
|
|
+ // else if (this.orderType === 'guCoin') api = exportGuCoinRejectOrderReport
|
|
|
return api(params)
|
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
|
|
@@ -483,8 +484,8 @@ export default {
|
|
|
if (params.totalNum === 0) params.totalNum = null
|
|
|
if (params.totalPrice === 0) params.totalPrice = null
|
|
|
let api = listRejectProductReport
|
|
|
- if (this.orderType === 'store') api = listStoreRejectProductReport
|
|
|
- else if (this.orderType === 'guCoin') api = listGuCoinRejectProductReport
|
|
|
+ // if (this.orderType === 'store') api = listStoreRejectProductReport
|
|
|
+ // else if (this.orderType === 'guCoin') api = listGuCoinRejectProductReport
|
|
|
api(params).then(response => {
|
|
|
this.productList = response.rows || []
|
|
|
this.productTotal = response.total || 0
|
|
|
@@ -517,8 +518,8 @@ export default {
|
|
|
if (params.totalNum === 0) params.totalNum = null
|
|
|
if (params.totalPrice === 0) params.totalPrice = null
|
|
|
let api = exportRejectProductReport
|
|
|
- if (this.orderType === 'store') api = exportStoreRejectProductReport
|
|
|
- else if (this.orderType === 'guCoin') api = exportGuCoinRejectProductReport
|
|
|
+ // if (this.orderType === 'store') api = exportStoreRejectProductReport
|
|
|
+ // else if (this.orderType === 'guCoin') api = exportGuCoinRejectProductReport
|
|
|
return api(params)
|
|
|
}).then(response => {
|
|
|
this.download(response.msg)
|
