This commit is contained in:
wuweihua
2026-11-18 18:31:12 +08:00
40 changed files with 2495 additions and 1033 deletions
+6 -2
View File
@@ -88,8 +88,12 @@ export function getArBillVoidTask(taskId) {
return request({ url: '/ar/bill/void/task/' + taskId, method: 'get' })
}
export function exportArBill(arBillId) {
return request({ url: '/ar/bill/' + arBillId + '/export', method: 'post' })
export function listArBillExportTemplates(arBillId) {
return request({ url: '/ar/bill/' + arBillId + '/export-templates', method: 'get' })
}
export function exportArBill(arBillId, data) {
return request({ url: '/ar/bill/' + arBillId + '/export', method: 'post', data })
}
export function listArBillExports(arBillId) {
@@ -19,6 +19,20 @@
<!-- 账单明细独立分页;费用明细在展开行时再懒加载。 -->
<div class="section-title">账单明细({{ detail.orderCount || 0 }})</div>
<el-form :model="detailSearchForm" label-width="44px" size="small" class="detail-search-form" @submit.prevent>
<el-form-item label="单号">
<el-input v-model="detailSearchForm.orderKeyword" placeholder="订单号、运单号或转单号" clearable
:maxlength="64" @keyup.enter="handleDetailSearch" />
</el-form-item>
<el-form-item label="产品">
<el-input v-model="detailSearchForm.productKeyword" placeholder="产品代码或名称" clearable
:maxlength="100" @keyup.enter="handleDetailSearch" />
</el-form-item>
<el-form-item class="detail-search-actions" label-width="0">
<el-button type="primary" icon="Search" @click="handleDetailSearch">搜索</el-button>
<el-button icon="Refresh" @click="resetDetailSearch">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="detailListLoading" :data="detailRows" row-key="detailId" border size="small" @expand-change="handleExpandChange">
<el-table-column type="expand">
<template #default="{ row }">
@@ -48,18 +62,18 @@
<el-table-column prop="redlineAmount" label="整单红线价" width="130" align="right"><template #default="{ row }">{{ amount4(row.redlineAmount) }}</template></el-table-column>
</el-table>
<el-pagination
v-if="detailTotal > 0"
v-if="detailTotal > 0 || appliedDetailQuery.orderKeyword || appliedDetailQuery.productKeyword"
class="detail-pagination"
v-model:current-page="detailPageNum"
v-model:page-size="detailPageSize"
:current-page="detailPageNum"
:page-size="detailPageSize"
:page-sizes="[10, 20, 50]"
layout="total, sizes, prev, pager, next, jumper"
:total="detailTotal"
@current-change="loadDetails"
@current-change="handleDetailPageChange"
@size-change="handleDetailSizeChange"
/>
<div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" v-hasPermi="['ar:bill:export']" :loading="exporting" :disabled="exporting" @click="$emit('export')">{{ exporting ? '生成中' : '导出账单明细' }}</el-button></div>
<div class="section-title export-title"><span>导出历史</span><el-button size="small" type="primary" plain icon="Download" v-hasPermi="['ar:bill:export']" @click="$emit('export')">导出账单明细</el-button></div>
<el-table :data="detail.exports || []" border size="small">
<el-table-column prop="fileName" label="文件名" min-width="250" show-overflow-tooltip />
<el-table-column prop="templateVersion" label="模板版本" width="100" />
@@ -86,8 +100,10 @@ const detailPageNum = ref(1)
// 详情默认每页 10 条,避免几十万条账单明细一次性进入浏览器内存。
const detailPageSize = ref(10)
const detailListLoading = ref(false)
const detailSearchForm = reactive({ orderKeyword: '', productKeyword: '' })
// 翻页沿用最后一次搜索的条件,输入中的文本只在点击搜索或回车时应用。
const appliedDetailQuery = ref({ orderKeyword: '', productKeyword: '' })
let detailRequestSerial = 0
const exporting = computed(() => props.detail?.exports?.some(item => item.exportStatus === AR_EXPORT_STATUS.PROCESSING))
// 切换账单时重置分页和请求序号,旧账单的慢响应不能覆盖新账单。
watch(() => props.detail?.arBillId, billId => {
@@ -95,6 +111,9 @@ watch(() => props.detail?.arBillId, billId => {
detailPageNum.value = 1
detailTotal.value = 0
detailRows.value = []
detailListLoading.value = false
Object.assign(detailSearchForm, { orderKeyword: '', productKeyword: '' })
appliedDetailQuery.value = { orderKeyword: '', productKeyword: '' }
if (billId) loadDetails()
}, { immediate: true })
@@ -104,16 +123,45 @@ function loadDetails() {
if (!billId) return
const serial = ++detailRequestSerial
detailListLoading.value = true
listArBillDetails(billId, { pageNum: detailPageNum.value, pageSize: detailPageSize.value }).then(res => {
listArBillDetails(billId, {
...appliedDetailQuery.value,
pageNum: detailPageNum.value,
pageSize: detailPageSize.value
}).then(res => {
if (serial !== detailRequestSerial) return
detailRows.value = (res.rows || []).map(row => ({ ...row, fees: [], feesLoaded: false, feeLoading: false }))
detailTotal.value = Number(res.total) || 0
}).catch(() => {
if (serial !== detailRequestSerial) return
detailRows.value = []
detailTotal.value = 0
}).finally(() => {
if (serial === detailRequestSerial) detailListLoading.value = false
})
}
function handleDetailSearch() {
appliedDetailQuery.value = {
orderKeyword: detailSearchForm.orderKeyword.trim(),
productKeyword: detailSearchForm.productKeyword.trim()
}
detailPageNum.value = 1
loadDetails()
}
function resetDetailSearch() {
Object.assign(detailSearchForm, { orderKeyword: '', productKeyword: '' })
handleDetailSearch()
}
function handleDetailPageChange(page) {
if (page === detailPageNum.value) return
detailPageNum.value = page
loadDetails()
}
function handleDetailSizeChange(size) {
if (size === detailPageSize.value) return
detailPageSize.value = size
detailPageNum.value = 1
loadDetails()
@@ -152,6 +200,9 @@ function mask(value) { if (!value) return '-'; return value.length <= 4 ? '****'
.section-title::before { content: ''; width: 3px; height: 15px; border-radius: 2px; background: var(--el-color-primary); }
.export-title { justify-content: space-between; }
.export-title::before { margin-right: auto; }
.detail-search-form { display: flex; flex-wrap: wrap; align-items: center; gap: 12px; margin-bottom: 12px; }
.detail-search-form :deep(.el-form-item) { flex: 1 1 260px; max-width: 360px; margin: 0; }
.detail-search-form :deep(.detail-search-actions) { flex: 0 0 auto; max-width: none; }
.detail-pagination { justify-content: flex-end; margin: 12px 0 4px; }
.fee-panel { min-height: 54px; padding: 4px 12px 8px 42px; background: #fafafa; }
.fee-table { background: #fafafa; }
@@ -0,0 +1,86 @@
<template>
<el-dialog :model-value="modelValue" title="导出账单" width="480px" append-to-body
:close-on-click-modal="false" :close-on-press-escape="!submitting" :show-close="!submitting"
@update:model-value="$emit('update:modelValue', $event)">
<el-form label-width="88px" v-loading="loading">
<el-form-item label="账单号">
<span>{{ bill?.billNo || '-' }}</span>
</el-form-item>
<el-form-item label="导出模板" required>
<el-select v-model="templateId" placeholder="请选择导出模板" :disabled="loading || submitting" style="width: 100%">
<el-option v-for="item in templates" :key="item.templateId" :value="item.templateId"
:label="item.templateName" />
</el-select>
</el-form-item>
</el-form>
<div v-if="loadError" class="template-load-error">
<span>模板加载失败</span>
<el-button link type="primary" @click="loadTemplates">重新加载</el-button>
</div>
<el-alert v-else-if="!loading && !templates.length" title="暂无可用的账单导出模板" type="info" :closable="false" />
<template #footer>
<el-button :disabled="submitting" @click="$emit('update:modelValue', false)">取消</el-button>
<el-button type="primary" :loading="submitting" :disabled="loading || !templateId" @click="submit">开始导出</el-button>
</template>
</el-dialog>
</template>
<script setup>
import { exportArBill, listArBillExportTemplates } from '@/api/ar/bill'
const props = defineProps({ modelValue: Boolean, bill: { type: Object, default: null } })
const emit = defineEmits(['update:modelValue', 'success', 'submitting'])
const templates = ref([])
const templateId = ref()
const loading = ref(false)
const loadError = ref(false)
const submitting = ref(false)
let requestSerial = 0
watch(() => [props.modelValue, props.bill?.arBillId], ([open]) => {
requestSerial += 1
if (open) loadTemplates()
})
async function loadTemplates() {
const billId = props.bill?.arBillId
if (!billId) return
const serial = ++requestSerial
templates.value = []
templateId.value = undefined
loadError.value = false
loading.value = true
try {
const res = await listArBillExportTemplates(billId)
if (serial !== requestSerial) return
templates.value = res.data || []
templateId.value = templates.value.find(item => String(item.isDefault) === '1')?.templateId
?? templates.value[0]?.templateId
} catch (_) {
if (serial === requestSerial) loadError.value = true
} finally {
if (serial === requestSerial) loading.value = false
}
}
async function submit() {
if (submitting.value || loading.value || !templateId.value || !props.bill?.arBillId) return
const bill = props.bill
submitting.value = true
emit('submitting', true)
try {
const res = await exportArBill(bill.arBillId, { templateId: templateId.value })
emit('update:modelValue', false)
emit('success', { bill, exportTask: res.data })
} catch (_) {
// 请求错误统一由 request 封装提示,保留弹窗中的选择便于重试。
} finally {
submitting.value = false
emit('submitting', false)
}
}
</script>
<style scoped>
.template-load-error { display: flex; align-items: center; gap: 12px; color: var(--el-color-danger); }
</style>
+17 -14
View File
@@ -60,6 +60,8 @@
<bill-detail v-model="detailOpen" :detail="detail" :loading="detailLoading" @download="downloadExport" @export="exportBill(detail)" />
<generate-bill-dialog v-model="generateOpen" @success="handleGenerateSuccess" />
<export-bill-dialog v-model="exportOpen" :bill="exportBillTarget" @success="handleExportSuccess"
@submitting="exportSubmittingCount = $event ? 1 : 0" />
<el-dialog v-model="cancelConfirmVisible" title="取消账单生成" width="420px" append-to-body
:close-on-click-modal="false" :close-on-press-escape="!cancelConfirmLoading"
:show-close="!cancelConfirmLoading" @closed="handleCancelConfirmClosed">
@@ -75,9 +77,10 @@
<script setup name="ArBill">
import { saveAs } from 'file-saver'
import { listArBillCustomerOptions, listArBill, getArBill, confirmArBill, voidArBill, getArBillVoidTask, exportArBill, getArBillExport, downloadArBillExport, getArBillExportDownloadInfo, getArBillGenerateTask, listActiveArBillGenerateTasks, cancelArBillGenerateTask, retryArBillGenerateTask } from '@/api/ar/bill'
import { listArBillCustomerOptions, listArBill, getArBill, confirmArBill, voidArBill, getArBillVoidTask, getArBillExport, downloadArBillExport, getArBillExportDownloadInfo, getArBillGenerateTask, listActiveArBillGenerateTasks, cancelArBillGenerateTask, retryArBillGenerateTask } from '@/api/ar/bill'
import BillDetail from './components/BillDetail.vue'
import GenerateBillDialog from './components/GenerateBillDialog.vue'
import ExportBillDialog from './components/ExportBillDialog.vue'
import { AR_BILL_STATUS, AR_BILL_STATUS_OPTIONS, AR_BILL_STATUS_TYPES } from '@/constants/ar/bill'
const { proxy } = getCurrentInstance()
@@ -102,6 +105,8 @@ const voidPollTimers = new Map()
let voidPageClosed = false
const openedBillId = ref()
const generateOpen = ref(false)
const exportOpen = ref(false)
const exportBillTarget = ref(null)
// 任务可能在首次轮询前就完成,至少展示一段时间让用户感知到“正在生成”。
const MIN_GENERATE_STATUS_VISIBLE_MS = 1800
// 每个任务独立保存轮询、收尾定时器和开始展示时间,避免多个账单任务互相覆盖。
@@ -377,19 +382,17 @@ function pollVoidTask(billId, taskId) {
}
function exportBill(row) {
if (!row?.arBillId) return
exportSubmittingCount.value += 1
exportArBill(row.arBillId).then(res => {
const exportTask = res.data
tableRef.value?.refresh()
// 导出同样是异步任务;打开详情展示“生成中”状态及完成后的下载入口。
viewBill(row)
if (exportTask?.exportId) {
exportTasks.set(exportTask.exportId, exportTask)
startExportPolling(exportTask.exportId)
}
}).finally(() => {
exportSubmittingCount.value = Math.max(0, exportSubmittingCount.value - 1)
})
exportBillTarget.value = row
exportOpen.value = true
}
function handleExportSuccess({ bill, exportTask }) {
tableRef.value?.refresh()
viewBill(bill)
if (exportTask?.exportId) {
exportTasks.set(exportTask.exportId, exportTask)
startExportPolling(exportTask.exportId)
}
}
onMounted(loadActiveGenerateTasks)
@@ -42,6 +42,9 @@
<el-table-column prop="customerName" label="客户" min-width="140" show-overflow-tooltip />
<el-table-column prop="productName" label="产品" min-width="160" show-overflow-tooltip />
<el-table-column prop="countryName" label="目的国" width="110" show-overflow-tooltip />
<el-table-column prop="destPostcode" label="邮编" width="120" show-overflow-tooltip>
<template #default="{ row }">{{ row.destPostcode || '-' }}</template>
</el-table-column>
<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">
@@ -59,7 +62,7 @@
</el-table-column>
<el-table-column prop="bizDate" label="计费时间" width="170" align="center" />
<el-table-column prop="updateBy" label="更新人" width="110" show-overflow-tooltip>
<template #default="{ row }">{{ row.updateBy || '-' }}</template>
<template #default="{ row }">{{ actorName(row.updateBy) }}</template>
</el-table-column>
<el-table-column prop="updateTime" label="更新时间" width="170" align="center">
<template #default="{ row }">{{ row.updateTime || '-' }}</template>
@@ -116,10 +119,12 @@
<template #default="{ row }">{{ sourceText(row.feeSource) }}</template>
</el-table-column>
<el-table-column label="创建人" min-width="1" header-align="center" show-overflow-tooltip>
<template #default="{ row }">{{ row.createBy || '-' }}</template>
<template #default="{ row }">{{ actorName(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 label="更新人" min-width="1" header-align="center" show-overflow-tooltip>
<template #default="{ row }">{{ actorName(row.updateBy) }}</template>
</el-table-column>
<el-table-column prop="updateTime" label="更新时间" min-width="1" header-align="center" show-overflow-tooltip />
<el-table-column label="操作" min-width="1" header-align="center" align="center" class-name="fee-op">
<template #default="{ row }">
@@ -159,7 +164,9 @@
<dict-tag :options="bms_pay_fee_log_type" :value="row.operationType" />
</template>
</el-table-column>
<el-table-column prop="createBy" label="操作人" width="120" header-align="center" show-overflow-tooltip />
<el-table-column label="操作人" width="120" header-align="center" show-overflow-tooltip>
<template #default="{ row }">{{ actorName(row.createBy) }}</template>
</el-table-column>
<el-table-column prop="createTime" label="操作时间" width="170" header-align="center" align="center" />
</el-table>
<pagination v-show="logTotal > 0" :total="logTotal" v-model:page="logQuery.pageNum" v-model:limit="logQuery.pageSize" @pagination="loadLogs" />
@@ -338,6 +345,14 @@ function sourceText(value) {
return sources[value] || value || '-'
}
function actorName(value) {
const text = value == null ? '' : String(value).trim()
if (!text) {
return '-'
}
return text.toLowerCase() === 'system' ? '系统自动' : text
}
function logLines(row, side) {
const name = row?.[side + 'FeeName']
const amount = row?.[side + 'Amount']