Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -48,7 +48,7 @@ export function listProfitProducts(params) {
|
||||
}
|
||||
|
||||
export function exportProfitOrders(params) {
|
||||
return createProfitExport('/report/profit/orders/export', params)
|
||||
return request({ url: '/report/profit/orders/export', method: 'post', data: params })
|
||||
}
|
||||
|
||||
export function exportProfitProducts(params) {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
function formatLocalDate(date) {
|
||||
const year = date.getFullYear()
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(date.getDate()).padStart(2, '0')
|
||||
return `${year}-${month}-${day}`
|
||||
}
|
||||
|
||||
// 次月没有对应日期时取月末,再减一天;起止日期均包含当天。
|
||||
export function maxEndDate(start) {
|
||||
const [year, month, day] = start.split('-').map(Number)
|
||||
const lastDayOfNextMonth = new Date(year, month + 1, 0).getDate()
|
||||
const limit = new Date(year, month, Math.min(day, lastDayOfNextMonth))
|
||||
limit.setDate(limit.getDate() - 1)
|
||||
return formatLocalDate(limit)
|
||||
}
|
||||
|
||||
export function defaultDateRange() {
|
||||
const end = new Date()
|
||||
const start = new Date(end.getFullYear(), end.getMonth(), end.getDate())
|
||||
const endText = formatLocalDate(end)
|
||||
start.setDate(start.getDate() - 31)
|
||||
while (maxEndDate(formatLocalDate(start)) < endText) start.setDate(start.getDate() + 1)
|
||||
return [formatLocalDate(start), endText]
|
||||
}
|
||||
@@ -112,6 +112,14 @@
|
||||
style="margin-bottom: 12px"
|
||||
title="计费重 = max(长×宽×高(cm)/8000, 收货重);无尺寸时不覆盖"
|
||||
/>
|
||||
<el-alert
|
||||
v-if="form.ruleType === 'USE_RECEIVE_WEIGHT'"
|
||||
type="info"
|
||||
:closable="false"
|
||||
show-icon
|
||||
style="margin-bottom: 12px"
|
||||
title="命中后按取值字段取重;实重优先 actual_weight,次收货重 receive_weight"
|
||||
/>
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio value="0">正常</el-radio>
|
||||
|
||||
@@ -33,8 +33,9 @@
|
||||
<el-table-column :label="colBoundChannels" min-width="180" show-overflow-tooltip>
|
||||
<template #default="{ row }">{{ boundChannelText(row) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="colAction" width="90" align="center" fixed="right">
|
||||
<el-table-column :label="colAction" width="160" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="openDetail(row)" v-hasPermi="['price:label:query']">查看详情</el-button>
|
||||
<el-button link type="primary" @click="openBindList(row)" v-hasPermi="['price:label:edit']">绑定</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@@ -112,6 +113,23 @@
|
||||
<el-button type="primary" :loading="addSaving" @click="submitAddChannels">保存</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<el-drawer
|
||||
v-model="detailVisible"
|
||||
:title="detailTitle"
|
||||
size="78%"
|
||||
append-to-body
|
||||
destroy-on-close
|
||||
@closed="onDetailClosed"
|
||||
>
|
||||
<div v-loading="detailLoading">
|
||||
<label-config-detail v-if="detailProduct" :product="detailProduct" :editable="false" />
|
||||
<el-empty v-else-if="!detailLoading" description="暂无产品明细" />
|
||||
</div>
|
||||
<template #footer>
|
||||
<el-button @click="detailVisible = false">关闭</el-button>
|
||||
</template>
|
||||
</el-drawer>
|
||||
</el-drawer>
|
||||
</template>
|
||||
|
||||
@@ -119,9 +137,11 @@
|
||||
import {
|
||||
listLabelProducts,
|
||||
listLabelProductChannels,
|
||||
replaceLabelProductChannels
|
||||
replaceLabelProductChannels,
|
||||
getLabelProduct
|
||||
} from '@/api/price/label'
|
||||
import { listChannelOptions } from '@/api/masterdata/serviceChannel'
|
||||
import LabelConfigDetail from './LabelConfigDetail.vue'
|
||||
|
||||
const props = defineProps({
|
||||
visible: { type: Boolean, default: false },
|
||||
@@ -145,6 +165,14 @@ const addVisible = ref(false)
|
||||
const addLoading = ref(false)
|
||||
const addSaving = ref(false)
|
||||
const addChannelIds = ref([])
|
||||
const detailVisible = ref(false)
|
||||
const detailLoading = ref(false)
|
||||
const detailProduct = ref(null)
|
||||
|
||||
const detailTitle = computed(() => {
|
||||
if (!detailProduct.value) return '产品明细'
|
||||
return detailProduct.value.productName || detailProduct.value.sheetName || '产品明细'
|
||||
})
|
||||
|
||||
const phSearch = '产品名称 / 绑定渠道'
|
||||
const colId = '产品编号'
|
||||
@@ -261,6 +289,26 @@ async function loadBoundChannels() {
|
||||
}
|
||||
}
|
||||
|
||||
async function openDetail(row) {
|
||||
if (!row?.productId) return
|
||||
detailVisible.value = true
|
||||
detailLoading.value = true
|
||||
detailProduct.value = null
|
||||
try {
|
||||
const res = await getLabelProduct(row.productId, row.versionId || row.termId)
|
||||
detailProduct.value = res.data || row
|
||||
} catch (e) {
|
||||
detailProduct.value = row
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function onDetailClosed() {
|
||||
detailProduct.value = null
|
||||
detailLoading.value = false
|
||||
}
|
||||
|
||||
async function openBindList(row) {
|
||||
if (!row?.productId) return
|
||||
bindProductId.value = row.productId
|
||||
|
||||
@@ -1,31 +1,45 @@
|
||||
<template>
|
||||
<div class="app-container ar-profit-report">
|
||||
<el-card shadow="never">
|
||||
<el-form :model="query" inline @submit.prevent>
|
||||
<el-form-item label="账单日期">
|
||||
<el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
|
||||
</el-form-item>
|
||||
<el-form-item label="客户">
|
||||
<customer-select v-model="query.customerId" :fetch-options="listArBillCustomerOptions"
|
||||
placeholder="请输入客户名称或代码搜索" :remote-search="true" :page-size="20" />
|
||||
</el-form-item>
|
||||
<el-form-item label="销售员">
|
||||
<el-select v-model="query.salesUserId" placeholder="姓名或工号搜索" clearable filterable remote
|
||||
:remote-method="searchSales" :loading="salesLoading" style="width: 180px"
|
||||
@input="handleSalesInput">
|
||||
<el-option v-for="person in salesOptions" :key="person.userId" :label="person.name || person.code || String(person.userId)" :value="person.userId">
|
||||
<span>{{ person.name || person.code || person.userId }}</span>
|
||||
<span v-if="person.code" class="sales-code">{{ person.code }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="账单号"><el-input v-model="query.billNo" clearable @keyup.enter="search" /></el-form-item>
|
||||
<el-form-item label="状态">
|
||||
<el-select v-model="query.status" placeholder="全部状态" clearable style="width: 140px">
|
||||
<el-option label="已确认" value="CONFIRMED" /><el-option label="部分核销" value="PARTIAL_WRITTEN_OFF" /><el-option label="已核销" value="WRITTEN_OFF" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item><el-button type="primary" icon="Search" @click="search">搜索</el-button><el-button icon="Refresh" @click="reset">重置</el-button></el-form-item>
|
||||
<el-card shadow="never" class="search-card">
|
||||
<el-form :model="query" label-width="88px" @submit.prevent>
|
||||
<el-row :gutter="16">
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="账单日期" class="filter-item" :error="dateRangeError" required>
|
||||
<el-date-picker v-model="dateRange" type="daterange" value-format="YYYY-MM-DD" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" class="filter-control" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="客户" class="filter-item">
|
||||
<customer-select v-model="query.customerId" :fetch-options="listArBillCustomerOptions"
|
||||
placeholder="请输入客户名称或代码搜索" :remote-search="true" :page-size="20" class="filter-control" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="销售员" class="filter-item">
|
||||
<el-select v-model="query.salesUserId" placeholder="姓名或工号搜索" clearable filterable remote
|
||||
:remote-method="searchSales" :loading="salesLoading" class="filter-control"
|
||||
@input="handleSalesInput">
|
||||
<el-option v-for="person in salesOptions" :key="person.userId" :label="person.name || person.code || String(person.userId)" :value="person.userId">
|
||||
<span>{{ person.name || person.code || person.userId }}</span>
|
||||
<span v-if="person.code" class="sales-code">{{ person.code }}</span>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="账单号" class="filter-item"><el-input v-model="query.billNo" clearable class="filter-control" @keyup.enter="search" /></el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="状态" class="filter-item">
|
||||
<el-select v-model="query.status" placeholder="全部状态" clearable class="filter-control">
|
||||
<el-option label="已确认" value="CONFIRMED" /><el-option label="部分核销" value="PARTIAL_WRITTEN_OFF" /><el-option label="已核销" value="WRITTEN_OFF" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<div class="filter-item filter-actions"><el-button type="primary" icon="Search" @click="search">搜索</el-button><el-button icon="Refresh" @click="reset">重置</el-button></div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-form>
|
||||
</el-card>
|
||||
|
||||
@@ -179,6 +193,7 @@
|
||||
import { listArBillCustomerOptions } from '@/api/ar/bill'
|
||||
import { addArProfitRate, confirmArProfitMissingRate, listArProfitAreaRules, listArProfitBillDetails, listArProfitBills, listArProfitCommissions, listArProfitCommissionSummary, listArProfitFees, listArProfitMissingRates, listArProfitRates, listArProfitSalesOptions, listArProfitSummary, listArProfitWriteoffRates } from '@/api/report/arProfit'
|
||||
import { parseTime } from '@/utils/bms'
|
||||
import { defaultDateRange, maxEndDate } from '@/utils/reportDateRange'
|
||||
import { ElMessage } from 'element-plus'
|
||||
|
||||
const { proxy } = getCurrentInstance()
|
||||
@@ -187,7 +202,11 @@ const salesOptions = ref([])
|
||||
const salesLoading = ref(false)
|
||||
let salesSearchVersion = 0
|
||||
const areaRules = ref({})
|
||||
const dateRange = ref(defaultBillDateRange())
|
||||
const dateRange = ref(defaultDateRange())
|
||||
const dateRangeError = computed(() => {
|
||||
if (!dateRange.value?.[0] || !dateRange.value?.[1]) return ''
|
||||
return dateRange.value[1] > maxEndDate(dateRange.value[0]) ? '账单日期最多查询一个月' : ''
|
||||
})
|
||||
const pageNum = ref(1), pageSize = ref(10), total = ref(0), rows = ref([]), loading = ref(false)
|
||||
const summaries = ref([]), summaryLoaded = ref(false)
|
||||
const detailsVisible = ref(false), detailsLoading = ref(false), details = ref([]), detailsTotal = ref(0)
|
||||
@@ -211,18 +230,20 @@ const missingRates = ref([]), missingTotal = ref(0), missingPage = ref(1), missi
|
||||
const confirmVisible = ref(false), confirmForm = reactive({ writeoffId: null, billNo: '', rate: null, remark: '' })
|
||||
const writeoffRatesVisible = ref(false), writeoffRatesLoading = ref(false), writeoffRates = ref([])
|
||||
|
||||
function formatLocalDate(offset) {
|
||||
const date = new Date()
|
||||
date.setDate(date.getDate() + offset)
|
||||
const year = date.getFullYear()
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(date.getDate()).padStart(2, '0')
|
||||
return `${year}-${month}-${day}`
|
||||
function validateDateRange(showMessage = true) {
|
||||
if (!dateRange.value?.[0] || !dateRange.value?.[1]) {
|
||||
if (showMessage) ElMessage.warning('请选择完整的账单日期')
|
||||
return false
|
||||
}
|
||||
if (dateRangeError.value) {
|
||||
if (showMessage) ElMessage.warning(dateRangeError.value)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
function defaultBillDateRange() { return [formatLocalDate(-30), formatLocalDate(0)] }
|
||||
function params() { return { ...query, beginBillDate: dateRange.value?.[0], endBillDate: dateRange.value?.[1] } }
|
||||
function search() { pageNum.value = 1; loadRows(); loadSummary() }
|
||||
function reset() { Object.assign(query, { customerId: null, salesUserId: null, billNo: '', status: '' }); dateRange.value = defaultBillDateRange(); search() }
|
||||
function search() { if (!validateDateRange()) return; pageNum.value = 1; loadRows(); loadSummary() }
|
||||
function reset() { Object.assign(query, { customerId: null, salesUserId: null, billNo: '', status: '' }); dateRange.value = defaultDateRange(); search() }
|
||||
function handleSalesInput() {
|
||||
salesSearchVersion++
|
||||
salesOptions.value = []
|
||||
@@ -241,6 +262,7 @@ async function searchSales(keyword) {
|
||||
}
|
||||
}
|
||||
function loadRows() {
|
||||
if (!validateDateRange()) return
|
||||
const version = ++requestVersion
|
||||
loading.value = true
|
||||
rows.value = []
|
||||
@@ -250,6 +272,7 @@ function loadRows() {
|
||||
}
|
||||
let summaryVersion = 0
|
||||
function loadSummary() {
|
||||
if (!validateDateRange(false)) return
|
||||
const version = ++summaryVersion
|
||||
summaryLoaded.value = false
|
||||
listArProfitSummary(params()).then(res => { if (version === summaryVersion) { summaries.value = res.data || []; summaryLoaded.value = true } })
|
||||
@@ -263,7 +286,7 @@ async function loadBillDetails() {
|
||||
finally { if (version === detailsVersion) detailsLoading.value = false }
|
||||
}
|
||||
async function openFees(row) { feeVisible.value = true; feeLoading.value = true; fees.value = []; try { fees.value = (await listArProfitFees(row.detailId)).data || [] } finally { feeLoading.value = false } }
|
||||
function exportRows() { proxy.download('/report/ar-profit/export', params(), `应收账单毛利分析_${Date.now()}.xlsx`) }
|
||||
function exportRows() { if (validateDateRange()) proxy.download('/report/ar-profit/export', params(), `应收账单毛利分析_${Date.now()}.xlsx`) }
|
||||
function exportCommissions() { proxy.download('/report/ar-profit/commissions/export', {}, `应收账单提成明细_${Date.now()}.xlsx`) }
|
||||
function money(v) { return v === null || v === undefined || v === '' || !Number.isFinite(Number(v)) ? '-' : Number(v).toFixed(2) }
|
||||
function rate(v) { return v === null || v === undefined || v === '' || !Number.isFinite(Number(v)) ? '-' : Number(v).toFixed(2) + '%' }
|
||||
@@ -318,11 +341,26 @@ async function confirmRate() {
|
||||
if (confirmForm.rate === null || !confirmForm.remark.trim()) return ElMessage.warning('请填写比例及核对说明')
|
||||
await confirmArProfitMissingRate(confirmForm); confirmVisible.value = false; ElMessage.success('已确认提成比例'); loadCommissionTab()
|
||||
}
|
||||
watch(dateRange, () => {
|
||||
requestVersion++
|
||||
summaryVersion++
|
||||
rows.value = []
|
||||
total.value = 0
|
||||
loading.value = false
|
||||
summaries.value = []
|
||||
summaryLoaded.value = false
|
||||
}, { flush: 'sync' })
|
||||
listArProfitAreaRules().then(res => { areaRules.value = res.data || {} })
|
||||
search()
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.search-card :deep(.el-card__body) { padding: 18px 20px 8px; }
|
||||
.filter-item { width: 100%; margin-bottom: 14px; }
|
||||
.filter-item :deep(.el-form-item__content) { min-width: 0; }
|
||||
.filter-item :deep(.el-date-editor.el-input__wrapper) { width: 100%; }
|
||||
.filter-control { width: 100%; }
|
||||
.filter-actions { display: flex; align-items: center; }
|
||||
.summary-card, .data-card { margin-top: 14px; }
|
||||
.metrics { display: grid; grid-template-columns: repeat(auto-fit, minmax(min(100%, 150px), 1fr)); gap: 14px; }
|
||||
.metrics > div { min-width: 0; padding: 10px; background: var(--el-fill-color-lighter); color: var(--el-text-color-secondary); }
|
||||
|
||||
@@ -1,7 +1,22 @@
|
||||
<template>
|
||||
<div class="app-container profit-report">
|
||||
<Teleport to="body">
|
||||
<div v-if="exportFloatVisible" class="export-status-float">
|
||||
<el-tooltip :content="exportMessage || '点击查看详情'" placement="bottom">
|
||||
<el-button class="export-status-button" type="warning" plain size="small" @click="exportProgressVisible = true">
|
||||
<span class="export-progress-ring" :style="{ '--export-progress': exportDegree + 'deg' }" aria-hidden="true">
|
||||
<span class="export-progress-value">{{ exportPercent }}%</span>
|
||||
</span>
|
||||
<span class="export-status-text">
|
||||
<strong>{{ exportFloatTitle }}</strong>
|
||||
<small>{{ exportFloatSummary }}</small>
|
||||
</span>
|
||||
</el-button>
|
||||
</el-tooltip>
|
||||
</div>
|
||||
</Teleport>
|
||||
<el-card shadow="never" class="search-card">
|
||||
<el-form :model="query" label-width="88px" @submit.prevent>
|
||||
<el-form :model="query" label-width="120px" @submit.prevent>
|
||||
<el-row :gutter="16">
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="客户区域" class="filter-item">
|
||||
@@ -11,7 +26,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="计费日期" class="filter-item" required>
|
||||
<el-form-item label="计费日期" class="filter-item" :error="dateRangeError" required>
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
type="daterange"
|
||||
@@ -37,18 +52,13 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="业务员编码" class="filter-item">
|
||||
<el-input v-model="query.belongSalerCode" clearable placeholder="输入业务员编码" class="filter-control" @keyup.enter="handleSearch" />
|
||||
<el-form-item label="业务员编码/姓名" class="filter-item">
|
||||
<el-input v-model="query.belongSalerCode" clearable placeholder="输入业务员编码或姓名" class="filter-control" @keyup.enter="handleSearch" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="产品代码" class="filter-item">
|
||||
<el-input v-model="query.productCode" clearable placeholder="输入产品代码" class="filter-control" @keyup.enter="handleSearch" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
<el-form-item label="产品名称" class="filter-item">
|
||||
<el-input v-model="query.productName" clearable placeholder="输入产品名称" class="filter-control" @keyup.enter="handleSearch" />
|
||||
<el-form-item label="产品代码/名称" class="filter-item">
|
||||
<el-input v-model="query.productKeyword" clearable placeholder="输入产品代码或名称" class="filter-control" @keyup.enter="handleSearch" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :xs="24" :sm="12" :lg="8">
|
||||
@@ -141,7 +151,7 @@
|
||||
|
||||
<el-card shadow="never" class="table-card">
|
||||
<div class="table-heading">
|
||||
<span class="table-title">订单明细</span>
|
||||
<span class="table-title">订单列表</span>
|
||||
<div class="table-toolbar">
|
||||
<!-- 提成功能暂停使用。
|
||||
<el-button
|
||||
@@ -156,9 +166,9 @@
|
||||
icon="Download"
|
||||
v-hasPermi="['report:profit:export']"
|
||||
:loading="exporting"
|
||||
:disabled="!hasProfitRule() || !hasSearched"
|
||||
:disabled="!hasProfitRule() || !hasSearched || loading"
|
||||
@click="handleExport"
|
||||
>导出订单明细</el-button>
|
||||
>导出订单</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -202,6 +212,17 @@
|
||||
/>
|
||||
</el-card>
|
||||
|
||||
<el-dialog v-model="exportProgressVisible" :title="exportDialogTitle" width="480px" append-to-body :close-on-click-modal="false">
|
||||
<el-progress :percentage="exportPercent" :status="exportStatus" :stroke-width="14" striped :striped-flow="exporting" />
|
||||
<div class="export-progress__msg">{{ exportMessage }}</div>
|
||||
<div class="export-progress__text">导出行数 {{ exportRowCount }}</div>
|
||||
<p v-if="exporting" class="export-progress__hint">导出在后台进行,可收起弹窗继续操作;请勿关闭或刷新本页</p>
|
||||
<template #footer>
|
||||
<el-button v-if="exporting" @click="exportProgressVisible = false">收起</el-button>
|
||||
<el-button v-else type="primary" @click="exportProgressVisible = false">关闭</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- 提成设置与编辑弹窗暂停使用。
|
||||
<el-dialog v-model="commissionDialogVisible" title="业务员固定提成比例" width="760px" append-to-body>
|
||||
<div class="commission-toolbar">
|
||||
@@ -240,24 +261,29 @@
|
||||
</template>
|
||||
|
||||
<script setup name="ProfitReport">
|
||||
import { downloadProfitExport, exportProfitOrders, listProfitAreaRules, listProfitCustomerOptions, listProfitOrders, listProfitSummary } from '@/api/report/profit'
|
||||
import { listProfitAreaRules, listProfitCustomerOptions, listProfitOrders, listProfitSummary } from '@/api/report/profit'
|
||||
// 提成功能暂停使用:import { deleteProfitCommissionRate, listProfitCommissionRates, saveProfitCommissionRate } from '@/api/report/profit'
|
||||
import { parseTime } from '@/utils/bms'
|
||||
import { defaultDateRange, maxEndDate } from '@/utils/reportDateRange'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { saveAs } from 'file-saver'
|
||||
import { exportAsync } from '@/utils/excelExport'
|
||||
// 提成功能暂停使用:import { ElMessageBox } from 'element-plus'
|
||||
|
||||
const { customer_area, bms_currency } = useDict('customer_area', 'bms_currency')
|
||||
const multiValueFilterLimit = 2000
|
||||
const dateRange = ref([formatLocalDate(-30), formatLocalDate(0)])
|
||||
const dateRange = ref(defaultDateRange())
|
||||
const dateRangeError = computed(() => {
|
||||
if (!hasCompleteDateRange()) return ''
|
||||
const [start, end] = dateRange.value
|
||||
return end > maxEndDate(start) ? '计费日期最多查询一个月' : ''
|
||||
})
|
||||
const arBillStatus = ref('')
|
||||
const query = reactive({
|
||||
customerArea: '',
|
||||
orderNo: '',
|
||||
customerCode: '',
|
||||
belongSalerCode: '',
|
||||
productCode: '',
|
||||
productName: '',
|
||||
productKeyword: '',
|
||||
countryName: '',
|
||||
countryCode: '',
|
||||
currency: ''
|
||||
@@ -275,9 +301,27 @@ let rowsRequestVersion = 0
|
||||
const loading = ref(false)
|
||||
const hasSearched = ref(false)
|
||||
const exporting = ref(false)
|
||||
const exportFinished = ref(false)
|
||||
const exportProgressVisible = ref(false)
|
||||
const exportPercent = ref(0)
|
||||
const exportStatus = ref(undefined)
|
||||
const exportMessage = ref('')
|
||||
const exportRowCount = ref(0)
|
||||
let exportHideTimer = null
|
||||
const exportFloatVisible = computed(() => exporting.value || exportFinished.value)
|
||||
const exportDegree = computed(() => Math.round(exportPercent.value / 100 * 360))
|
||||
const exportFloatTitle = computed(() => exporting.value ? '导出中' : (exportStatus.value === 'exception' ? '导出失败' : '导出完成'))
|
||||
const exportFloatSummary = computed(() => exportRowCount.value > 0
|
||||
? `${exportPercent.value}% / ${exportRowCount.value} 行`
|
||||
: `${exportPercent.value}%`)
|
||||
const exportDialogTitle = computed(() => exporting.value ? '异步导出进行中' : (exportStatus.value === 'exception' ? '异步导出失败' : '异步导出完成'))
|
||||
onBeforeUnmount(() => {
|
||||
clearTimeout(exportHideTimer)
|
||||
})
|
||||
const pageNum = ref(1)
|
||||
const pageSize = ref(10)
|
||||
const total = ref(0)
|
||||
// 汇总按币种分组,分页总数复用各币种订单数之和。
|
||||
const total = computed(() => summaryList.value.reduce((count, summary) => count + Number(summary.orderCount || 0), 0))
|
||||
/* 提成表单状态与初始化暂停使用,保留代码便于恢复。
|
||||
const commissionDialogVisible = ref(false)
|
||||
const commissionLoading = ref(false)
|
||||
@@ -304,15 +348,6 @@ function createRateForm(row = {}) {
|
||||
}
|
||||
*/
|
||||
|
||||
function formatLocalDate(offset) {
|
||||
const date = new Date()
|
||||
date.setDate(date.getDate() + offset)
|
||||
const year = date.getFullYear()
|
||||
const month = String(date.getMonth() + 1).padStart(2, '0')
|
||||
const day = String(date.getDate()).padStart(2, '0')
|
||||
return `${year}-${month}-${day}`
|
||||
}
|
||||
|
||||
function buildQuery(paged = true) {
|
||||
const params = { ...query }
|
||||
if (arBillStatus.value) params.arBillStatus = arBillStatus.value
|
||||
@@ -356,6 +391,10 @@ function validateRequiredFilters(showMessage = true) {
|
||||
if (showMessage) ElMessage.warning('请选择完整的计费日期')
|
||||
return false
|
||||
}
|
||||
if (dateRangeError.value) {
|
||||
if (showMessage) ElMessage.warning(dateRangeError.value)
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -377,7 +416,6 @@ function loadRows() {
|
||||
return listProfitOrders(buildQuery()).then(res => {
|
||||
if (requestVersion !== rowsRequestVersion) return
|
||||
rows.value = res.rows || []
|
||||
total.value = res.total || 0
|
||||
}).finally(() => {
|
||||
if (requestVersion === rowsRequestVersion) loading.value = false
|
||||
})
|
||||
@@ -390,7 +428,6 @@ function clearReportResults() {
|
||||
summaryList.value = []
|
||||
summaryLoaded.value = false
|
||||
rows.value = []
|
||||
total.value = 0
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -407,7 +444,7 @@ function handleReset() {
|
||||
Object.keys(query).forEach(key => { query[key] = '' })
|
||||
query.customerArea = customer_area.value[0]?.value ?? ''
|
||||
arBillStatus.value = ''
|
||||
dateRange.value = [formatLocalDate(-30), formatLocalDate(0)]
|
||||
dateRange.value = defaultDateRange()
|
||||
hasSearched.value = false
|
||||
clearReportResults()
|
||||
}
|
||||
@@ -442,23 +479,47 @@ function arBillStatusLabel(value) {
|
||||
}
|
||||
|
||||
async function handleExport() {
|
||||
if (!hasSearched.value || !validateRequiredFilters()) return
|
||||
if (exporting.value || !hasSearched.value || !validateRequiredFilters()) return
|
||||
if (!hasProfitRule() || !validateMultiValueFilters()) return
|
||||
clearTimeout(exportHideTimer)
|
||||
exporting.value = true
|
||||
exportFinished.value = false
|
||||
exportProgressVisible.value = false
|
||||
exportPercent.value = 0
|
||||
exportStatus.value = undefined
|
||||
exportMessage.value = '正在提交导出任务'
|
||||
exportRowCount.value = 0
|
||||
try {
|
||||
const response = await exportProfitOrders(buildQuery(false))
|
||||
const exportResult = response.data
|
||||
const file = await downloadProfitExport(exportResult.exportId)
|
||||
if (file.type?.includes('json')) {
|
||||
const error = JSON.parse(await file.text())
|
||||
throw new Error(error.msg || '下载导出文件失败')
|
||||
const result = await exportAsync({
|
||||
baseUrl: '/report/profit/orders/export',
|
||||
query: buildQuery(false),
|
||||
filePrefix: '订单维度毛利分析',
|
||||
showLoading: false,
|
||||
onProgress: task => {
|
||||
exportPercent.value = Math.max(0, Math.min(100, Number(task.percent) || 0))
|
||||
exportRowCount.value = Number(task.rowCount) || 0
|
||||
exportMessage.value = task.error || task.message || '导出中'
|
||||
if (task.status === 'FAIL' || task.status === 'FAILED') exportStatus.value = 'exception'
|
||||
}
|
||||
})
|
||||
if (result) {
|
||||
exportPercent.value = 100
|
||||
exportStatus.value = 'success'
|
||||
exportMessage.value = '导出完成'
|
||||
} else {
|
||||
if (exportStatus.value !== 'exception') exportMessage.value = '导出失败,请查看提示后重试'
|
||||
exportStatus.value = 'exception'
|
||||
}
|
||||
saveAs(file, exportResult.fileName)
|
||||
ElMessage.success('报表已导出')
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '报表导出失败')
|
||||
exportStatus.value = 'exception'
|
||||
exportMessage.value = error?.message || '导出失败,请稍后重试'
|
||||
} finally {
|
||||
exporting.value = false
|
||||
exportFinished.value = true
|
||||
exportHideTimer = window.setTimeout(() => {
|
||||
exportFinished.value = false
|
||||
exportHideTimer = null
|
||||
}, 1000)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -533,8 +594,7 @@ watch(() => [
|
||||
query.orderNo,
|
||||
query.customerCode,
|
||||
query.belongSalerCode,
|
||||
query.productCode,
|
||||
query.productName,
|
||||
query.productKeyword,
|
||||
query.countryName,
|
||||
query.countryCode,
|
||||
query.currency,
|
||||
@@ -546,6 +606,18 @@ watch(() => [
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.export-status-float { position: fixed; top: 92px; right: 24px; z-index: 3001; }
|
||||
.export-status-button { display: inline-flex; align-items: center; gap: 10px; min-width: 200px; min-height: 68px; padding: 6px 16px 6px 7px; border-radius: 36px; }
|
||||
.export-progress-ring { position: relative; display: inline-flex; align-items: center; justify-content: center; flex: 0 0 54px; width: 54px; height: 54px; border-radius: 50%; background: conic-gradient(var(--el-color-warning) 0deg var(--export-progress, 0deg), var(--el-color-warning-light-8) var(--export-progress, 0deg) 360deg); }
|
||||
.export-progress-ring::after { position: absolute; inset: 5px; content: ''; border-radius: 50%; background: var(--el-bg-color); }
|
||||
.export-progress-value { position: relative; z-index: 1; color: var(--el-color-warning); font-size: 12px; font-weight: 600; line-height: 1; }
|
||||
.export-status-text { display: flex; flex-direction: column; align-items: flex-start; gap: 3px; line-height: 1.2; white-space: nowrap; }
|
||||
.export-status-text strong { font-size: 14px; font-weight: 600; }
|
||||
.export-status-text small { color: var(--el-text-color-secondary); font-size: 11px; }
|
||||
.export-progress__msg { margin-top: 12px; color: var(--el-text-color-regular); }
|
||||
.export-progress__text { margin-top: 8px; color: var(--el-text-color-secondary); font-size: 13px; }
|
||||
.export-progress__hint { margin-top: 12px; color: var(--el-color-warning); font-size: 12px; }
|
||||
|
||||
.search-card,
|
||||
.table-card {
|
||||
margin-bottom: 14px;
|
||||
|
||||
Reference in New Issue
Block a user