1
This commit is contained in:
@@ -1,122 +1,134 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :inline="true" :model="queryParams" label-width="80px">
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="queryParams.remark" placeholder="单据备注" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="分销标记">
|
||||
<el-input v-model="queryParams.distributionMark" placeholder="分销标记" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="型号">
|
||||
<el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="订单号">
|
||||
<el-input v-model="queryParams.orderId" placeholder="订单号" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下单人">
|
||||
<el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="地址">
|
||||
<el-input v-model="queryParams.address" placeholder="收货地址" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-input v-model="queryParams.status" placeholder="备注/状态" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下单时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
range-separator="至"
|
||||
@change="handleDateRangeChange"
|
||||
<div>
|
||||
<list-layout>
|
||||
<!-- 搜索区域 -->
|
||||
<template #search>
|
||||
<el-form :inline="true" :model="queryParams" label-width="80px">
|
||||
<el-form-item label="备注">
|
||||
<el-input v-model="queryParams.remark" placeholder="单据备注" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="分销标记">
|
||||
<el-input v-model="queryParams.distributionMark" placeholder="分销标记" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="型号">
|
||||
<el-input v-model="queryParams.modelNumber" placeholder="型号" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="订单号">
|
||||
<el-input v-model="queryParams.orderId" placeholder="订单号" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下单人">
|
||||
<el-input v-model="queryParams.buyer" placeholder="下单人" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="地址">
|
||||
<el-input v-model="queryParams.address" placeholder="收货地址" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-input v-model="queryParams.status" placeholder="备注/状态" clearable size="small" @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下单时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="daterange"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="yyyy-MM-dd"
|
||||
size="small"
|
||||
range-separator="至"
|
||||
@change="handleDateRangeChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
<el-button type="warning" size="small" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:jdorder:export']">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<!-- 表格区域 -->
|
||||
<template #table>
|
||||
<el-table :data="list" v-loading="loading" border stripe :default-sort="{prop: 'createTime', order: 'descending'}">
|
||||
<el-table-column label="ID" prop="id" width="80" />
|
||||
<el-table-column label="内部单号" prop="remark" width="160" sortable/>
|
||||
|
||||
<el-table-column label="订单号" prop="orderId" width="200">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<span style="margin-right: 8px;">{{ scope.row.orderId }}</span>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
icon="el-icon-copy-document"
|
||||
@click="copyToClipboard(scope.row.orderId)"
|
||||
title="复制订单号"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="标记" prop="distributionMark" width="80"/>
|
||||
<el-table-column label="型号" prop="modelNumber" width="180"/>
|
||||
<el-table-column label="地址" prop="address" min-width="280" show-overflow-tooltip/>
|
||||
<el-table-column label="付款金额" prop="paymentAmount" width="120">
|
||||
<template slot-scope="scope">{{ toYuan(scope.row.paymentAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="后返金额" prop="rebateAmount" width="120">
|
||||
<template slot-scope="scope">{{ toYuan(scope.row.rebateAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下单人" prop="buyer" width="140"/>
|
||||
<el-table-column label="备注/状态" prop="status" min-width="160"/>
|
||||
|
||||
<el-table-column label="物流链接" prop="logisticsLink" width="200">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.logisticsLink">
|
||||
<a :href="scope.row.logisticsLink" target="_blank" style="margin-right: 8px;">查看物流</a>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
icon="el-icon-copy-document"
|
||||
@click="copyToClipboard(scope.row.logisticsLink)"
|
||||
title="复制链接"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="赔付金额" prop="proPriceAmount" width="140"/>
|
||||
|
||||
<el-table-column label="创建时间" prop="createTime" width="160">
|
||||
<template slot-scope="scope">{{ parseTime(scope.row.createTime) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成时间" prop="finishTime" width="160">
|
||||
<template slot-scope="scope">{{ parseTime(scope.row.finishTime) }}</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
|
||||
<!-- 分页区域 -->
|
||||
<template #pagination>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">搜索</el-button>
|
||||
<el-button size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
|
||||
<el-button type="warning" size="small" icon="el-icon-download" @click="handleExport" v-hasPermi="['system:jdorder:export']">导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-table :data="list" v-loading="loading" border stripe :default-sort="{prop: 'createTime', order: 'descending'}">
|
||||
<el-table-column label="ID" prop="id" width="80" />
|
||||
<el-table-column label="内部单号" prop="remark" width="160" sortable/>
|
||||
|
||||
<el-table-column label="订单号" prop="orderId" width="200">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<span style="margin-right: 8px;">{{ scope.row.orderId }}</span>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
icon="el-icon-copy-document"
|
||||
@click="copyToClipboard(scope.row.orderId)"
|
||||
title="复制订单号"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="标记" prop="distributionMark" width="80"/>
|
||||
<el-table-column label="型号" prop="modelNumber" width="180"/>
|
||||
<el-table-column label="地址" prop="address" min-width="280" show-overflow-tooltip/>
|
||||
<el-table-column label="付款金额" prop="paymentAmount" width="120">
|
||||
<template slot-scope="scope">{{ toYuan(scope.row.paymentAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="后返金额" prop="rebateAmount" width="120">
|
||||
<template slot-scope="scope">{{ toYuan(scope.row.rebateAmount) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下单人" prop="buyer" width="140"/>
|
||||
<el-table-column label="备注/状态" prop="status" min-width="160"/>
|
||||
|
||||
|
||||
<el-table-column label="物流链接" prop="logisticsLink" width="200">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.logisticsLink">
|
||||
<a :href="scope.row.logisticsLink" target="_blank" style="margin-right: 8px;">查看物流</a>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
icon="el-icon-copy-document"
|
||||
@click="copyToClipboard(scope.row.logisticsLink)"
|
||||
title="复制链接"
|
||||
>
|
||||
复制
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
proPriceAmount
|
||||
<el-table-column label="赔付金额" prop="proPriceAmount" width="140"/>
|
||||
|
||||
<el-table-column label="创建时间" prop="createTime" width="160">
|
||||
<template slot-scope="scope">{{ parseTime(scope.row.createTime) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="完成时间" prop="finishTime" width="160">
|
||||
<template slot-scope="scope">{{ parseTime(scope.row.finishTime) }}</template>
|
||||
</el-table-column>
|
||||
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</template>
|
||||
</list-layout>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listJDOrders } from '@/api/system/jdorder'
|
||||
import ListLayout from '@/components/ListLayout'
|
||||
|
||||
export default {
|
||||
name: 'JDOrderList',
|
||||
components: {
|
||||
ListLayout
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
@@ -142,7 +154,7 @@ export default {
|
||||
created() {
|
||||
// 设置默认日期为今天
|
||||
this.setDefaultDateRange()
|
||||
this.getList()
|
||||
this.getListWithFallback()
|
||||
},
|
||||
methods: {
|
||||
/** 设置默认日期范围为今天 */
|
||||
@@ -168,6 +180,53 @@ export default {
|
||||
this.loading = false
|
||||
}).catch(() => { this.loading = false })
|
||||
},
|
||||
/** 智能查询列表，如果今天数据为空则查询昨天 */
|
||||
async getListWithFallback() {
|
||||
this.loading = true
|
||||
|
||||
try {
|
||||
const res = await listJDOrders(this.queryParams)
|
||||
this.list = (res.rows || res.data || [])
|
||||
this.total = res.total || 0
|
||||
|
||||
// 如果今天的数据为空，且是默认查询（没有手动选择日期），则尝试查询昨天
|
||||
if (this.list.length === 0 && this.isDefaultQuery()) {
|
||||
this.$message.info('今天暂无慢单数据，正在查询昨天的数据...')
|
||||
|
||||
// 获取昨天的日期
|
||||
const yesterday = new Date()
|
||||
yesterday.setDate(yesterday.getDate() - 1)
|
||||
const yesterdayStr = this.formatDate(yesterday)
|
||||
|
||||
// 更新查询参数为昨天
|
||||
this.queryParams.beginTime = yesterdayStr
|
||||
this.queryParams.endTime = yesterdayStr
|
||||
this.dateRange = [yesterdayStr, yesterdayStr]
|
||||
|
||||
// 查询昨天的数据
|
||||
const yesterdayRes = await listJDOrders(this.queryParams)
|
||||
this.list = (yesterdayRes.rows || yesterdayRes.data || [])
|
||||
this.total = yesterdayRes.total || 0
|
||||
|
||||
if (this.list.length > 0) {
|
||||
this.$message.success(`已查询到昨天(${yesterdayStr})的慢单数据`)
|
||||
} else {
|
||||
this.$message.warning('昨天也没有慢单数据')
|
||||
}
|
||||
}
|
||||
|
||||
this.loading = false
|
||||
} catch (error) {
|
||||
this.loading = false
|
||||
this.$message.error('查询失败，请稍后重试')
|
||||
}
|
||||
},
|
||||
/** 判断是否为默认查询（今天的数据） */
|
||||
isDefaultQuery() {
|
||||
const today = new Date()
|
||||
const todayStr = this.formatDate(today)
|
||||
return this.queryParams.beginTime === todayStr && this.queryParams.endTime === todayStr
|
||||
},
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
@@ -189,7 +248,7 @@ export default {
|
||||
}
|
||||
// 重置后重新设置默认日期为今天
|
||||
this.setDefaultDateRange()
|
||||
this.getList()
|
||||
this.getListWithFallback()
|
||||
},
|
||||
/** 日期范围变化处理 */
|
||||
handleDateRangeChange(dates) {
|
||||
|
||||
Reference in New Issue
Block a user