调整应付配置和应付列表订单的费用重算

This commit is contained in:
liuminghui
2026-11-17 17:47:01 +08:00
parent 9483bb4899
commit 6b2b205083
45 changed files with 1448 additions and 2131 deletions
@@ -44,7 +44,9 @@
<el-table-column prop="countryName" label="目的国" width="110" show-overflow-tooltip />
<el-table-column prop="channelName" label="渠道" min-width="140" show-overflow-tooltip />
<el-table-column prop="chargeWeight" label="计费重" width="90" align="right" />
<el-table-column prop="payTotal" label="应付总额" width="110" align="right" />
<el-table-column prop="payTotal" label="应付总额" width="110" align="right">
<template #default="{ row }">{{ money2(row.payTotal) }}</template>
</el-table-column>
<el-table-column prop="currency" label="币种" width="80" align="center" />
<el-table-column label="计费状态" width="100" align="center">
<template #default="{ row }">
@@ -92,8 +94,8 @@
</el-table-column>
<el-table-column label="金额" min-width="1" header-align="center" align="right" show-overflow-tooltip>
<template #default="{ row }">
<el-input-number v-if="row.editing" v-model="row.amount" :precision="2" :controls="false" />
<span v-else>{{ row.amount }}</span>
<el-input-number v-if="row.editing" v-model="row.amount" :precision="3" :controls="false" />
<span v-else>{{ money3(row.amount) }}</span>
</template>
</el-table-column>
<el-table-column label="币种" min-width="1" header-align="center" align="center" show-overflow-tooltip>
@@ -113,7 +115,9 @@
<el-table-column label="来源" min-width="1" header-align="center" align="center" show-overflow-tooltip>
<template #default="{ row }">{{ sourceText(row.feeSource) }}</template>
</el-table-column>
<el-table-column prop="createBy" label="创建人" min-width="1" header-align="center" show-overflow-tooltip />
<el-table-column label="创建人" min-width="1" header-align="center" show-overflow-tooltip>
<template #default="{ row }">{{ row.createBy || '-' }}</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="1" header-align="center" show-overflow-tooltip />
<el-table-column prop="updateBy" label="更新人" min-width="1" header-align="center" show-overflow-tooltip />
<el-table-column prop="updateTime" label="更新时间" min-width="1" header-align="center" show-overflow-tooltip />
@@ -241,8 +245,7 @@
</template>
<script setup name="PayOrderList">
import { getBill } from '@/api/price/billing'
import { addPayOrderFee, cancelPayOrderRecalc, getPayOrderRecalcTask, listPayOrder, listPayOrderFeeLogs, listPayOrderFees, pollPayOrderRecalc, removePayOrderFee, submitPayOrderRecalc } from '@/api/price/payOrder'
import { addPayOrderFee, cancelPayOrderRecalc, getPayOrder, getPayOrderRecalcTask, listPayOrder, listPayOrderFeeLogs, listPayOrderFees, pollPayOrderRecalc, removePayOrderFee, submitPayOrderRecalc } from '@/api/price/payOrder'
import { ElMessage, ElMessageBox } from 'element-plus'
import BillDetail from '../components/BillDetail.vue'
@@ -319,6 +322,18 @@ const sources = {
MANUAL: '手工'
}
function money2(value) {
if (value === null || value === undefined || value === '') return '-'
const num = Number(value)
return Number.isNaN(num) ? value : num.toFixed(2)
}
function money3(value) {
if (value === null || value === undefined || value === '') return '-'
const num = Number(value)
return Number.isNaN(num) ? value : num.toFixed(3)
}
function sourceText(value) {
return sources[value] || value || '-'
}
@@ -381,7 +396,7 @@ function openDetail(row) {
detail.value = null
detailOpen.value = true
detailLoading.value = true
getBill(row.billId).then(res => {
getPayOrder(row.billId).then(res => {
detail.value = res.data || null
}).finally(() => {
detailLoading.value = false