优化计费任务列表状态过滤逻辑,更新计费重和客户确认重字段名称

This commit is contained in:
wuweihua
2026-11-17 10:13:09 +08:00
committed by caojia
parent ea62697b98
commit 7500728c1d
12 changed files with 85 additions and 75 deletions
+3 -2
View File
@@ -33,6 +33,7 @@ export const ORDER_BILL_EXPORT_FIELDS = [
{ prop: 'countryName', label: '国家/地区' },
{ prop: 'pieces', label: '件数' },
{ prop: 'weight', label: '计费重' },
{ prop: 'chargeWeight', label: '客户确认重' },
{ prop: 'volumeWeight', label: '体积重' },
{ prop: 'receiveWeight', label: '实重' },
{ prop: 'destPostcode', label: '收件人邮编' },
@@ -57,8 +58,8 @@ export const BILLING_BILL_EXPORT_FIELDS = [
{ prop: 'countryCode', label: '国家代码' },
{ prop: 'countryName', label: '国家/地区' },
{ prop: 'pieces', label: '件数' },
{ prop: 'chargeWeight', label: '计费重' },
{ prop: 'weight', label: '原计费重' },
{ prop: 'chargeWeight', label: '客户确认重' },
{ prop: 'weight', label: '计费重' },
{ prop: 'receiveWeight', label: '收货重' },
{ prop: 'incomeTotal', label: '应收总额' },
{ prop: 'payTotal', label: '应付总额' },
@@ -81,9 +81,6 @@ import { listBillingTask, retryBillingTask, retryBillingTaskBatch } from '@/api/
import BillingTaskDetailDrawer from './components/BillingTaskDetailDrawer.vue'
import BillingTaskFilterRetryDialog from './components/BillingTaskFilterRetryDialog.vue'
import {
statusOptions,
billTypeOptions,
failCodeOptions,
billTypeLabel,
statusLabel,
statusTag
@@ -97,16 +94,11 @@ const retryingId = ref(null)
const batchLoading = ref(false)
const retryFloat = ref(null)
const defaultParams = { successStatus: 'FAILED' }
const defaultParams = {}
const searchColumns = [
{ label: '状态', prop: 'successStatus', component: 'select', options: statusOptions, placeholder: '请选择状态', width: '140px', props: { clearable: true } },
{ label: '计费类型', prop: 'billType', component: 'select', options: billTypeOptions, placeholder: '请选择类型', width: '140px', props: { clearable: true } },
{ label: '失败码', prop: 'failCode', component: 'select', options: failCodeOptions, placeholder: '请选择失败码', width: '220px', props: { clearable: true, filterable: true } },
{ label: '客户代码', prop: 'customerCode', component: 'input', placeholder: '客户代码', width: '160px' },
{ label: '订单号', prop: 'orderNo', component: 'input', placeholder: '订单号', width: '180px' },
{ label: '运单号', prop: 'trackingNo', component: 'input', placeholder: '运单号', width: '180px' },
{ label: '转单号', prop: 'transferNo', component: 'input', placeholder: '转单号', width: '180px' },
{ label: '客户代码', prop: 'customerCode', component: 'input', placeholder: '客户代码', width: '160px' },
{ label: '计费时间', prop: 'dateRange', component: 'daterange', width: '308px' }
]
+9 -3
View File
@@ -106,6 +106,12 @@
<template #col-chargeWeight="{ row }">
{{ formatWeight(row.chargeWeight) }}
</template>
<template #col-weight="{ row }">
{{ formatWeight(row.weight) }}
</template>
<template #col-receiveWeight="{ row }">
{{ formatWeight(row.receiveWeight) }}
</template>
<template #col-orderStatus="{ row }">
{{ orderStatusLabel(row.orderStatus) }}
</template>
@@ -577,9 +583,9 @@ const columns = [
{ label: '产品', prop: 'product', minWidth: 160, slot: 'product' },
{ label: '国家', prop: 'country', minWidth: 130, slot: 'country' },
{ label: '件数', prop: 'pieces', align: 'center', width: 70 },
{ label: '计费重', prop: 'chargeWeight', align: 'center', width: 90, slot: 'chargeWeight' },
{ label: '原计费重', prop: 'weight', align: 'center', width: 100, slot: 'chargeWeight' },
{ label: '收货重', prop: 'receiveWeight', align: 'center', width: 90, slot: 'chargeWeight' },
{ label: '客户确认重', prop: 'chargeWeight', align: 'center', width: 110, slot: 'chargeWeight' },
{ label: '计费重', prop: 'weight', align: 'center', width: 90, slot: 'weight' },
{ label: '收货重', prop: 'receiveWeight', align: 'center', width: 90, slot: 'receiveWeight' },
{ label: '应收总额', prop: 'incomeTotal', align: 'right', width: 120, slot: 'incomeTotal' },
{ label: '应付总额', prop: 'payTotal', align: 'right', width: 120, slot: 'payTotal' },
{ label: '订单状态', prop: 'orderStatus', align: 'center', width: 110, slot: 'orderStatus' },
@@ -76,6 +76,7 @@
</div>
<el-descriptions class="detail-desc" :column="2" border size="small">
<el-descriptions-item label="产品">{{ productLabel(detail) }}</el-descriptions-item>
<el-descriptions-item label="客户确认重(kg)">{{ formatWeight(detail.chargeWeight) }}</el-descriptions-item>
<el-descriptions-item label="计费重量(kg)">{{ formatWeight(detail.chargeWeight ?? detail.weight) }}</el-descriptions-item>
<el-descriptions-item label="原计费重(kg)">{{ formatWeight(detail.weight) }}</el-descriptions-item>
<el-descriptions-item label="重量段">{{ detail.weightLabel || '-' }}</el-descriptions-item>
@@ -179,6 +179,9 @@
<template #col-weight="{ row }">
{{ formatWeight(row.weight) }}
</template>
<template #col-chargeWeight="{ row }">
{{ formatWeight(row.chargeWeight) }}
</template>
<template #col-volumeWeight="{ row }">
{{ formatWeight(row.volumeWeight) }}
</template>
@@ -599,6 +602,7 @@ const columns = [
{ label: '渠道', prop: 'channel', minWidth: 160, slot: 'channel' },
{ label: '国家', prop: 'country', minWidth: 130, slot: 'country' },
{ label: '计费重', prop: 'weight', align: 'center', width: 90, slot: 'weight' },
{ label: '客户确认重', prop: 'chargeWeight', align: 'center', width: 110, slot: 'chargeWeight' },
{ label: '体积重', prop: 'volumeWeight', align: 'center', width: 90, slot: 'volumeWeight' },
{ label: '实重', prop: 'receiveWeight', align: 'center', width: 90, slot: 'receiveWeight' },
{ label: '收件人邮编', prop: 'destPostcode', minWidth: 120, showOverflowTooltip: true },