This commit is contained in:
2026-08-03 17:44:54 +08:00
parent ccced0a35e
commit 370a3926d7
3 changed files with 499 additions and 91 deletions
+176 -62
View File
@@ -1,8 +1,9 @@
<script setup lang="ts">
import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
import { computed, nextTick, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import type { FormInstance, FormRules } from 'element-plus'
import { Eye, FilePenLine, PackageCheck } from '@lucide/vue'
import { ArrowLeft, Eye, FilePenLine, PackageCheck } from '@lucide/vue'
import { useRoute, useRouter } from 'vue-router'
import {
acceptPlatformFirstLegOrder,
addPlatformFirstLegOrderNote,
@@ -17,7 +18,7 @@ import {
type PlatformFirstLegOrderResource,
type PlatformFirstLegOrderStatus,
} from '@/api/platformFirstLegOrders'
import { getApiErrorDetails, type ApiErrorDetails } from '@/api/http'
import { ApiResponseError, getApiErrorDetails, type ApiErrorDetails } from '@/api/http'
import ApiErrorMeta from '@/components/ApiErrorMeta.vue'
import StatusBadge from '@/components/StatusBadge.vue'
import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
@@ -25,6 +26,8 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/components/com
import { useAccessPreviewStore } from '@/stores/accessPreview'
const PHASE_ONE_TENANT_ID = '10001'
const route = useRoute()
const router = useRouter()
const access = useAccessPreviewStore()
const loadedTenantId = ref(PHASE_ONE_TENANT_ID)
const orders = ref<PlatformFirstLegOrderResource[]>([])
@@ -34,7 +37,6 @@ const pageSize = ref(20)
const loading = ref(false)
const actionLoadingId = ref('')
const loadError = ref<ApiErrorDetails | null>(null)
const detailOpen = ref(false)
const detailLoading = ref(false)
const detail = ref<PlatformFirstLegOrderDetailResource | null>(null)
const noteDialogOpen = ref(false)
@@ -90,7 +92,10 @@ const orderColumns: DataTableColumn[] = [
const expressRules: FormRules = {
expressCompany: [{ required: true, message: '请填写快递公司', trigger: 'blur' }],
expressTrackingNo: [{ required: true, message: '请填写快递单号', trigger: 'blur' }],
expressTrackingNo: [
{ required: true, message: '请填写快递单号', trigger: 'blur' },
{ pattern: /^[A-Za-z0-9-]{4,128}$/, message: '快递单号格式不正确', trigger: 'blur' },
],
}
const noteRules: FormRules = {
@@ -98,6 +103,11 @@ const noteRules: FormRules = {
}
const tenantReady = computed(() => loadedTenantId.value === PHASE_ONE_TENANT_ID)
const detailOrderId = computed(() => {
const orderId = route.query.orderId
return typeof orderId === 'string' && orderId ? orderId : ''
})
const isDetailPage = computed(() => Boolean(detailOrderId.value))
const statusOptions: Array<{ value: PlatformFirstLegOrderStatus; label: string }> = [
{ value: 'DRAFT', label: '草稿' },
@@ -181,11 +191,16 @@ watch([page, pageSize], () => {
async function openDetail(order: PlatformFirstLegOrderResource) {
if (!tenantReady.value) return
selectedOrder.value = order
await router.push({ path: route.path, query: { ...route.query, orderId: String(order.id) } })
}
async function loadDetail(orderId: string) {
if (!tenantReady.value) return
detail.value = null
detailOpen.value = true
detailLoading.value = true
try {
detail.value = await getPlatformFirstLegOrder(loadedTenantId.value, String(order.id))
detail.value = await getPlatformFirstLegOrder(loadedTenantId.value, orderId)
selectedOrder.value = detail.value.order
} catch (error) {
const details = getApiErrorDetails(error, '订单详情加载失败')
ElMessage.error(details.message)
@@ -196,11 +211,27 @@ async function openDetail(order: PlatformFirstLegOrderResource) {
async function refreshAfterAction(orderId: string) {
await loadOrders()
if (detailOpen.value && selectedOrder.value?.id === orderId) {
detail.value = await getPlatformFirstLegOrder(loadedTenantId.value, orderId)
if (detailOrderId.value === orderId) {
await loadDetail(orderId)
}
}
function closeDetailPage() {
const { orderId: _orderId, ...query } = route.query
void router.replace({ path: route.path, query })
}
function getFieldValidationMessage(error: unknown, field: string, fallback: string) {
const details = getApiErrorDetails(error, fallback)
if (error instanceof ApiResponseError && error.details && typeof error.details === 'object') {
const fieldMessage = (error.details as Record<string, unknown>)[field]
if (typeof fieldMessage === 'string' && fieldMessage) {
return `${details.message}:${fieldMessage}`
}
}
return details.message
}
async function runLifecycleAction(order: PlatformFirstLegOrderResource) {
if (!tenantReady.value) return
const label = actionLabel(order)
@@ -270,7 +301,7 @@ async function saveExpress() {
await refreshAfterAction(String(selectedOrder.value.id))
ElMessage.success('履约快递信息已保存')
} catch (error) {
ElMessage.error(getApiErrorDetails(error, '履约快递信息保存失败').message)
ElMessage.error(getFieldValidationMessage(error, 'expressTrackingNo', '履约快递信息保存失败'))
} finally {
expressSaving.value = false
}
@@ -300,66 +331,138 @@ async function saveNote() {
}
}
onMounted(() => {
watch(detailOrderId, (orderId) => {
if (orderId) {
void loadDetail(orderId)
return
}
detail.value = null
selectedOrder.value = null
void loadOrders()
})
}, { immediate: true })
</script>
<template>
<div class="business-page">
<QueryToolbar
v-model="filters"
ariaLabel="头程订单筛选"
:fields="queryFields"
search-text="查询订单"
:search-on-reset="true"
@search="searchOrders"
/>
<template v-if="isDetailPage">
<section class="surface-panel detail-page" v-loading="detailLoading">
<header class="detail-page-header">
<div>
<h1>订单详情</h1>
<p>查看订单信息、履约快递、内部备注和状态历史。</p>
</div>
<el-button @click="closeDetailPage"><ArrowLeft :size="16" />返回订单列表</el-button>
</header>
<el-alert v-if="loadError" type="error" :closable="false" show-icon role="alert">
<template #title><div class="api-error-alert-title"><span>{{ loadError.message }}</span><ApiErrorMeta :details="loadError" /></div></template>
<el-button link type="danger" @click="loadOrders">重新加载</el-button>
</el-alert>
<section class="surface-panel table-panel">
<DataTable
v-model:page="page"
v-model:page-size="pageSize"
:data="orders"
:columns="orderColumns"
:loading="loading"
:total="total"
:page-sizes="[20, 50, 100]"
empty-text="当前没有符合条件的头程订单"
row-key="id"
>
<template #actions="{ row }"><div class="table-actions"><el-button link type="primary" @click="openDetail(row as PlatformFirstLegOrderResource)"><Eye :size="15" />详情</el-button><el-button v-if="actionLabel(row as PlatformFirstLegOrderResource)" link type="success" :loading="actionLoadingId === String((row as PlatformFirstLegOrderResource).id)" @click="runLifecycleAction(row as PlatformFirstLegOrderResource)">{{ actionLabel(row as PlatformFirstLegOrderResource) }}</el-button><el-button v-if="canCancel(row as PlatformFirstLegOrderResource)" link type="danger" :loading="actionLoadingId === String((row as PlatformFirstLegOrderResource).id)" @click="cancelOrder(row as PlatformFirstLegOrderResource)">取消</el-button><el-button v-if="can('platform:order:fulfillment') && !['DRAFT', 'REJECTED', 'CANCELLED'].includes((row as PlatformFirstLegOrderResource).status)" link type="primary" @click="openExpress(row as PlatformFirstLegOrderResource)"><PackageCheck :size="15" />快递</el-button><el-button v-if="can('platform:order:note')" link type="primary" @click="openNote(row as PlatformFirstLegOrderResource)"><FilePenLine :size="15" />备注</el-button></div></template>
<template #orderInfo="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).orderNo || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).referenceId || '无客户参考号' }} · {{ formattedDate((row as PlatformFirstLegOrderResource).createdAt) }}</span></div></template>
<template #customer="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).customerName }}</strong><span>租户 {{ (row as PlatformFirstLegOrderResource).tenantId }}</span></div></template>
<template #transport="{ row }"><div class="primary-cell"><strong>{{ transportLabel(row as PlatformFirstLegOrderResource) }}</strong><span>{{ (row as PlatformFirstLegOrderResource).channelName || '未填写渠道' }}</span></div></template>
<template #destination="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).destinationWarehouseName || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).destinationCountryCode || '-' }}</span></div></template>
<template #receivingWarehouse="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).receivingWarehouseName || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).receivingWarehouseAddress || '-' }}</span></div></template>
<template #express="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).expressCompany || '未维护' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).expressTrackingNo || '—' }}</span></div></template>
<template #status="{ row }"><StatusBadge :status="statusLabel((row as PlatformFirstLegOrderResource).status)" /></template>
<template #empty><el-empty description="当前没有符合条件的头程订单" /></template>
</DataTable>
</section>
<el-drawer v-model="detailOpen" title="订单详情" size="760px" class="business-drawer">
<div v-loading="detailLoading">
<template v-if="detail">
<div class="order-detail-head"><div><span>{{ transportLabel(detail.order) }}</span><h2>{{ detail.order.orderNo || detail.order.id }}</h2><p>{{ detail.order.customerName }} · {{ detail.order.referenceId || '无客户参考号' }}</p></div><StatusBadge :status="statusLabel(detail.order.status)" /></div>
<div class="detail-section"><h3>订单概要</h3><el-descriptions :column="2" border><el-descriptions-item label="目标仓 / 国家">{{ detail.order.destinationWarehouseName || '-' }} · {{ detail.order.destinationCountryCode || '-' }}</el-descriptions-item><el-descriptions-item label="平台收货仓">{{ detail.order.receivingWarehouseName || '-' }}</el-descriptions-item><el-descriptions-item label="收货地址" :span="2">{{ detail.order.receivingWarehouseAddress || '-' }}</el-descriptions-item><el-descriptions-item label="渠道">{{ detail.order.channelName || '-' }}({{ detail.order.channelCode || '-' }})</el-descriptions-item><el-descriptions-item label="预计出运">{{ detail.order.expectedShipDate || '-' }}</el-descriptions-item><el-descriptions-item label="客户备注" :span="2">{{ detail.order.customerRemark || '-' }}</el-descriptions-item></el-descriptions></div>
<div class="detail-section"><h3>货物明细</h3><el-table :data="detail.cargoes" size="small" empty-text="暂无货物明细"><el-table-column prop="itemNo" label="#" width="52" /><el-table-column prop="cargoName" label="品名" min-width="150" /><el-table-column prop="packageType" label="包装" min-width="100" /><el-table-column prop="packageCount" label="件/箱" width="86" /><el-table-column label="毛重 / 体积" min-width="150"><template #default="{ row }">{{ row.grossWeightKg }} kg / {{ row.volumeCbm }} m³</template></el-table-column></el-table></div>
<div class="detail-section"><h3>收发货方</h3><div class="party-grid"><div v-for="party in detail.parties" :key="party.id"><span>{{ party.partyType === 'SENDER' ? '发货方' : '收货方' }}</span><strong>{{ party.companyName }}</strong><p>{{ party.contactName }} · {{ party.phone }}</p><p>{{ [party.province, party.city, party.district, party.addressLine].filter(Boolean).join(' ') }}</p></div></div></div>
<div class="detail-section"><h3>履约快递</h3><el-descriptions :column="2" border><el-descriptions-item label="快递公司">{{ detail.order.expressCompany || '-' }}</el-descriptions-item><el-descriptions-item label="快递单号">{{ detail.order.expressTrackingNo || '-' }}</el-descriptions-item></el-descriptions></div>
<div class="detail-section"><h3>内部备注</h3><el-empty v-if="!detail.internalNotes.length" description="暂无内部备注" :image-size="52" /><el-timeline v-else><el-timeline-item v-for="note in detail.internalNotes" :key="note.id" :timestamp="formattedDate(note.createdAt)" placement="top"><p>{{ note.content }}</p></el-timeline-item></el-timeline></div>
<div class="detail-section"><h3>状态历史</h3><el-timeline><el-timeline-item v-for="item in detail.statusHistory" :key="item.id" :timestamp="`${formattedDate(item.occurredAt)} · ${item.operatorName || '系统'}`" placement="top"><strong>{{ statusLabel(item.toStatus) }}</strong><p>{{ item.reason || item.action || '状态已更新。' }}</p></el-timeline-item></el-timeline></div>
<div class="order-detail-head">
<div>
<span>{{ transportLabel(detail.order) }}</span>
<h2>{{ detail.order.orderNo || detail.order.id }}</h2>
<p>{{ detail.order.customerName }} · {{ detail.order.referenceId || '无客户参考号' }}</p>
</div>
<StatusBadge :status="statusLabel(detail.order.status)" />
</div>
<div class="detail-section">
<h3>订单概要</h3>
<el-descriptions :column="2" border>
<el-descriptions-item label="目标仓 / 国家">{{ detail.order.destinationWarehouseName || '-' }} · {{ detail.order.destinationCountryCode || '-' }}</el-descriptions-item>
<el-descriptions-item label="平台收货仓">{{ detail.order.receivingWarehouseName || '-' }}</el-descriptions-item>
<el-descriptions-item label="收货地址" :span="2">{{ detail.order.receivingWarehouseAddress || '-' }}</el-descriptions-item>
<el-descriptions-item label="渠道">{{ detail.order.channelName || '-' }}({{ detail.order.channelCode || '-' }})</el-descriptions-item>
<el-descriptions-item label="预计出运">{{ detail.order.expectedShipDate || '-' }}</el-descriptions-item>
<el-descriptions-item label="客户备注" :span="2">{{ detail.order.customerRemark || '-' }}</el-descriptions-item>
</el-descriptions>
</div>
<div class="detail-section">
<h3>货物明细</h3>
<div class="detail-table-scroll">
<el-table :data="detail.cargoes" size="small" empty-text="暂无货物明细">
<el-table-column prop="itemNo" label="#" width="52" />
<el-table-column prop="cargoName" label="品名" min-width="150" />
<el-table-column prop="packageType" label="包装" min-width="100" />
<el-table-column prop="packageCount" label="件/箱" width="86" />
<el-table-column label="毛重 / 体积" min-width="150"><template #default="{ row }">{{ row.grossWeightKg }} kg / {{ row.volumeCbm }} m³</template></el-table-column>
</el-table>
</div>
</div>
<div class="detail-section">
<h3>收发货方</h3>
<div class="party-grid">
<div v-for="party in detail.parties" :key="party.id">
<span>{{ party.partyType === 'SENDER' ? '发货方' : '收货方' }}</span>
<strong>{{ party.companyName }}</strong>
<p>{{ party.contactName }} · {{ party.phone }}</p>
<p>{{ [party.province, party.city, party.district, party.addressLine].filter(Boolean).join(' ') }}</p>
</div>
</div>
</div>
<div class="detail-section">
<h3>履约快递</h3>
<el-descriptions :column="2" border>
<el-descriptions-item label="快递公司">{{ detail.order.expressCompany || '-' }}</el-descriptions-item>
<el-descriptions-item label="快递单号">{{ detail.order.expressTrackingNo || '-' }}</el-descriptions-item>
</el-descriptions>
</div>
<div class="detail-section">
<h3>内部备注</h3>
<el-empty v-if="!detail.internalNotes.length" description="暂无内部备注" :image-size="52" />
<el-timeline v-else><el-timeline-item v-for="note in detail.internalNotes" :key="note.id" :timestamp="formattedDate(note.createdAt)" placement="top"><p>{{ note.content }}</p></el-timeline-item></el-timeline>
</div>
<div class="detail-section">
<h3>状态历史</h3>
<el-timeline><el-timeline-item v-for="item in detail.statusHistory" :key="item.id" :timestamp="`${formattedDate(item.occurredAt)} · ${item.operatorName || '系统'}`" placement="top"><strong>{{ statusLabel(item.toStatus) }}</strong><p>{{ item.reason || item.action || '状态已更新。' }}</p></el-timeline-item></el-timeline>
</div>
</template>
<el-empty v-else-if="!detailLoading" description="订单详情暂不可用" />
</div>
<template #footer><div class="drawer-footer"><el-button @click="detailOpen = false">关闭</el-button></div></template>
</el-drawer>
<el-empty v-else-if="!detailLoading" description="订单详情暂不可用"><el-button type="primary" @click="closeDetailPage">返回订单列表</el-button></el-empty>
</section>
</template>
<template v-else>
<QueryToolbar
v-model="filters"
ariaLabel="头程订单筛选"
:fields="queryFields"
search-text="查询"
:search-on-reset="true"
@search="searchOrders"
/>
<el-alert v-if="loadError" type="error" :closable="false" show-icon role="alert">
<template #title><div class="api-error-alert-title"><span>{{ loadError.message }}</span><ApiErrorMeta :details="loadError" /></div></template>
<el-button link type="danger" @click="loadOrders">重新加载</el-button>
</el-alert>
<section class="surface-panel table-panel">
<DataTable
v-model:page="page"
v-model:page-size="pageSize"
:data="orders"
:columns="orderColumns"
:loading="loading"
:total="total"
:page-sizes="[20, 50, 100]"
empty-text="当前没有符合条件的头程订单"
row-key="id"
>
<template #actions="{ row }"><div class="table-actions"><el-button link type="primary" @click="openDetail(row as PlatformFirstLegOrderResource)"><Eye :size="15" />详情</el-button><el-button v-if="actionLabel(row as PlatformFirstLegOrderResource)" link type="success" :loading="actionLoadingId === String((row as PlatformFirstLegOrderResource).id)" @click="runLifecycleAction(row as PlatformFirstLegOrderResource)">{{ actionLabel(row as PlatformFirstLegOrderResource) }}</el-button><el-button v-if="canCancel(row as PlatformFirstLegOrderResource)" link type="danger" :loading="actionLoadingId === String((row as PlatformFirstLegOrderResource).id)" @click="cancelOrder(row as PlatformFirstLegOrderResource)">取消</el-button><el-button v-if="can('platform:order:fulfillment') && !['DRAFT', 'REJECTED', 'CANCELLED'].includes((row as PlatformFirstLegOrderResource).status)" link type="primary" @click="openExpress(row as PlatformFirstLegOrderResource)"><PackageCheck :size="15" />快递</el-button><el-button v-if="can('platform:order:note')" link type="primary" @click="openNote(row as PlatformFirstLegOrderResource)"><FilePenLine :size="15" />备注</el-button></div></template>
<template #orderInfo="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).orderNo || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).referenceId || '无客户参考号' }} · {{ formattedDate((row as PlatformFirstLegOrderResource).createdAt) }}</span></div></template>
<template #customer="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).customerName }}</strong><span>租户 {{ (row as PlatformFirstLegOrderResource).tenantId }}</span></div></template>
<template #transport="{ row }"><div class="primary-cell"><strong>{{ transportLabel(row as PlatformFirstLegOrderResource) }}</strong><span>{{ (row as PlatformFirstLegOrderResource).channelName || '未填写渠道' }}</span></div></template>
<template #destination="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).destinationWarehouseName || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).destinationCountryCode || '-' }}</span></div></template>
<template #receivingWarehouse="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).receivingWarehouseName || '-' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).receivingWarehouseAddress || '-' }}</span></div></template>
<template #express="{ row }"><div class="primary-cell"><strong>{{ (row as PlatformFirstLegOrderResource).expressCompany || '未维护' }}</strong><span>{{ (row as PlatformFirstLegOrderResource).expressTrackingNo || '—' }}</span></div></template>
<template #status="{ row }"><StatusBadge :status="statusLabel((row as PlatformFirstLegOrderResource).status)" /></template>
<template #empty><el-empty description="当前没有符合条件的头程订单" /></template>
</DataTable>
</section>
</template>
<el-dialog v-model="expressDialogOpen" title="维护履约快递" width="520px">
<el-alert title="当前后端契约只接收快递公司名称和快递单号;快递主数据关联待后端补充。" type="info" :closable="false" show-icon />
@@ -375,5 +478,16 @@ onMounted(() => {
</template>
<style scoped>
.detail-page { overflow: hidden; }
.detail-page-header { display: flex; min-height: 88px; align-items: center; justify-content: space-between; gap: 18px; padding: 20px 24px; border-bottom: 1px solid var(--cc-border); }
.detail-page-header h1 { margin: 0; font-size: 20px; line-height: 1.35; }
.detail-page-header p { margin: 5px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.5; }
.detail-table-scroll { overflow-x: auto; }
.party-grid p { margin: 4px 0 0; color: var(--cc-muted); font-size: 12px; line-height: 1.6; overflow-wrap: anywhere; }
@media (max-width: 720px) {
.detail-page-header { align-items: flex-start; flex-direction: column; padding: 16px; }
.detail-page-header .el-button { width: 100%; min-height: 40px; }
.detail-table-scroll :deep(.el-table) { min-width: 560px; }
}
</style>