-
-
+
+
-
{{ action.label }}
@@ -227,14 +227,17 @@ function setPage(value: number) {
diff --git a/src/modules/finance/api/account.ts b/src/modules/finance/api/account.ts
index 5d51a2d..859ef90 100644
--- a/src/modules/finance/api/account.ts
+++ b/src/modules/finance/api/account.ts
@@ -61,14 +61,12 @@ export interface AccountLedgerEntry {
createdAt: string
}
-export type RechargePaymentMethod = 'WECHAT' | 'ALIPAY'
export type RechargeStatus = 'PENDING' | 'APPROVED' | 'REJECTED'
export interface RechargeRequest {
requestId: string
requestNo: string
amount: string
- paymentMethod: RechargePaymentMethod
voucherFileId: string
voucherFileName: string
status: RechargeStatus
@@ -80,13 +78,6 @@ export interface RechargeRequest {
reviewedAt: string | null
}
-export interface RechargeChannel {
- paymentMethod: RechargePaymentMethod
- displayName: string
- enabled: boolean
- qrCodeUrl: string | null
-}
-
export function getFinanceAccount() {
return apiRequest({ method: 'GET', url: '/client/finance/v1/account' })
}
@@ -109,15 +100,9 @@ export async function getRechargeRequests(page: number, size: number) {
return normalizePageResult(result)
}
-export function getRechargeChannels() {
- return apiRequest({ method: 'GET', url: '/client/finance/v1/recharge-channels' })
-}
-
-export function createRechargeRequest(amount: string, paymentMethod: RechargePaymentMethod, file: File,
- idempotencyKey: string) {
+export function createRechargeRequest(amount: string, file: File, idempotencyKey: string) {
const formData = new FormData()
formData.append('amount', amount)
- formData.append('paymentMethod', paymentMethod)
formData.append('file', file, file.name)
return apiRequest({
method: 'POST',
diff --git a/src/modules/finance/routes.ts b/src/modules/finance/routes.ts
index f9cb794..eafe06e 100644
--- a/src/modules/finance/routes.ts
+++ b/src/modules/finance/routes.ts
@@ -21,5 +21,10 @@ export const financeModule = {
meta: { title: '客户账单', description: '查看本企业账单、收款记录和未收余额', permission: 'finance:bill:view' },
navigation: { key: 'finance-bills', title: '客户账单', icon: ReceiptText },
},
+ {
+ path: 'finance/bills/:billNo/detail', name: 'finance-bill-detail',
+ component: () => import('./views/FinanceBillDetailView.vue'), release: 'active',
+ meta: { title: '账单详情', workspaceTitle: '客户账单 · 详情', description: '查看费用明细、收款记录和客户确认信息', permission: 'finance:bill:view', keepAlive: false },
+ },
],
} satisfies ClientModuleManifest
diff --git a/src/modules/finance/views/FinanceAccountView.test.mjs b/src/modules/finance/views/FinanceAccountView.test.mjs
index db18376..c090ad5 100644
--- a/src/modules/finance/views/FinanceAccountView.test.mjs
+++ b/src/modules/finance/views/FinanceAccountView.test.mjs
@@ -8,13 +8,13 @@ const routesSource = readFileSync(new URL('../routes.ts', import.meta.url), 'utf
const permissionsSource = readFileSync(new URL('../../tenant-management/contracts.ts', import.meta.url), 'utf8')
test('uses only authenticated client finance account endpoints without customer scope', () => {
- for (const path of ['/client/finance/v1/account', '/client/finance/v1/account/ledger', '/client/finance/v1/recharge-requests', '/client/finance/v1/recharge-channels']) {
+ for (const path of ['/client/finance/v1/account', '/client/finance/v1/account/ledger', '/client/finance/v1/recharge-requests']) {
assert.match(apiSource, new RegExp(path.replaceAll('/', '\\/')))
}
assert.match(apiSource, /headers: \{ 'Idempotency-Key': idempotencyKey \}/)
assert.match(apiSource, /formData\.append\('amount', amount\)/)
- assert.match(apiSource, /formData\.append\('paymentMethod', paymentMethod\)/)
assert.match(apiSource, /formData\.append\('file', file, file\.name\)/)
+ assert.doesNotMatch(apiSource, /RechargePaymentMethod|paymentMethod|WECHAT|ALIPAY/)
assert.doesNotMatch(apiSource, /customerId|tenantId|mock|fallback/i)
})
@@ -23,12 +23,14 @@ test('activates the account route and maps read and recharge permissions indepen
assert.match(permissionsSource, /'merchant:finance:account:view': \['merchant:finance:account:view'\]/)
assert.match(permissionsSource, /'merchant:finance:recharge:create': \['merchant:finance:recharge:create'\]/)
assert.match(viewSource, /auth\.hasPermission\('merchant:finance:recharge:create'\)/)
- assert.match(viewSource, / {
for (const field of ['actualBalance', 'frozenBalance', 'availableBalance', 'creditLimit', 'creditUsed', 'availableCredit']) assert.match(viewSource, new RegExp(`account\\?\\.${field}`))
- for (const field of ['creditUsedAfter', 'availableCreditAfter']) assert.match(viewSource, new RegExp(`row\\.${field}`))
assert.match(viewSource, /实际可用资金与可用授信合计/)
assert.match(viewSource, /CREDIT_LIMIT: '授信调整'/)
assert.match(viewSource, /row-key="businessNo"/)
@@ -39,9 +41,12 @@ test('renders server balances, ledger and recharge states without internal ident
assert.match(viewSource, /v-loading="pageLoading"/)
assert.match(viewSource, /function formatAccountAmount[\s\S]*value == null \? '—' : formatAmount\(value\)/)
assert.match(viewSource, /formatAccountAmount\(account\?\.actualBalance\)/)
- assert.match(viewSource, /:default-current-page="ledgerPage"/)
- assert.match(viewSource, /:default-current-page="rechargePage"/)
- assert.doesNotMatch(viewSource, / {
assert.match(viewSource, /title="账户充值" width="760px"/)
- for (const amount of ['50.00', '100.00', '200.00', '500.00']) assert.match(viewSource, new RegExp(amount.replace('.', '\\.')))
- assert.match(viewSource, /\['WECHAT', 'ALIPAY'\]/)
- assert.match(viewSource, /selectedChannel\.value\?\.enabled && selectedChannel\.value\.qrCodeUrl/)
+ for (const amount of ['1000', '5000', '20000', '50000']) assert.match(viewSource, new RegExp(amount))
+ assert.match(viewSource, /自定义/)
+ assert.match(viewSource, /src="\/customer-recharge-qr\.png"/)
+ assert.match(viewSource, /alt="平台收款二维码"/)
+ assert.match(viewSource, /请扫描平台收款二维码，付款后上传截图。/)
assert.match(viewSource, /accept="\.jpg,\.jpeg,\.png,image\/jpeg,image\/png"/)
assert.match(viewSource, /if \(!pendingIdempotencyKey\)[\s\S]*globalThis\.crypto\?\.randomUUID\?\.\(\)/)
assert.match(viewSource, /pendingIdempotencyKey = ''[\s\S]*rechargeVisible\.value = false/)
assert.match(viewSource, /:disabled="!canSubmit"/)
assert.match(viewSource, /await loadAccountData\(\)/)
assert.doesNotMatch(viewSource, /payment SDK|支付成功|模拟成功/)
+ assert.doesNotMatch(viewSource, /微信支付|支付宝|payment-methods|paymentMethod/)
})
diff --git a/src/modules/finance/views/FinanceAccountView.vue b/src/modules/finance/views/FinanceAccountView.vue
index d1da129..d39871c 100644
--- a/src/modules/finance/views/FinanceAccountView.vue
+++ b/src/modules/finance/views/FinanceAccountView.vue
@@ -3,18 +3,16 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'
import { CircleDollarSign, RefreshCcw, Upload } from '@lucide/vue'
import { ElMessage, type UploadFile, type UploadFiles, type UploadInstance } from 'element-plus'
import { ApiError } from '@/api/http'
+import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
import { useAuthStore } from '@/modules/auth/public'
import {
createRechargeRequest,
getAccountLedger,
getFinanceAccount,
- getRechargeChannels,
getRechargeRequests,
type AccountChangeType,
type AccountLedgerEntry,
type FinanceAccount,
- type RechargeChannel,
- type RechargePaymentMethod,
type RechargeRequest,
type RechargeStatus,
} from '../api/account'
@@ -23,15 +21,15 @@ const auth = useAuthStore()
const account = ref(null)
const ledger = ref([])
const rechargeRequests = ref([])
-const channels = ref([])
const pageLoading = ref(false)
const pageError = ref('')
-const channelsError = ref('')
+const qrCodeLoadError = ref(false)
const ledgerPage = ref(1)
const ledgerTotal = ref(0)
+const ledgerPageSize = ref(10)
const rechargePage = ref(1)
const rechargeTotal = ref(0)
-const pageSize = 10
+const rechargePageSize = ref(10)
const rechargeVisible = ref(false)
const submitting = ref(false)
const submitError = ref('')
@@ -39,11 +37,11 @@ const voucherFile = ref(null)
const voucherUpload = ref()
let pendingIdempotencyKey = ''
-const form = reactive({ amount: '100.00', paymentMethod: 'WECHAT' as RechargePaymentMethod })
-const quickAmounts = ['50.00', '100.00', '200.00', '500.00']
+const form = reactive({ amount: '1000' })
+const quickAmounts = ['1000', '5000', '20000', '50000']
+const amountMode = ref<'preset' | 'custom'>('preset')
const canRecharge = computed(() => auth.hasPermission('merchant:finance:recharge:create'))
-const selectedChannel = computed(() => channels.value.find((item) => item.paymentMethod === form.paymentMethod))
-const channelReady = computed(() => Boolean(selectedChannel.value?.enabled && selectedChannel.value.qrCodeUrl))
+const channelReady = computed(() => !qrCodeLoadError.value)
const amountValid = computed(() => {
const value = Number(form.amount)
return Number.isFinite(value) && value > 0 && /^\d+(?:\.\d{1,2})?$/.test(form.amount.trim())
@@ -54,7 +52,27 @@ const changeLabels: Record = {
RECHARGE: '充值', DEDUCTION: '扣款', FREEZE: '冻结', UNFREEZE: '解冻', CONSUMPTION: '消费', CREDIT_LIMIT: '授信调整',
}
const statusLabels: Record = { PENDING: '待审核', APPROVED: '已通过', REJECTED: '已驳回' }
-const methodLabels: Record = { WECHAT: '微信支付', ALIPAY: '支付宝' }
+const ledgerColumns: DataTableColumn[] = [
+ { label: '业务单号', prop: 'businessNo', minWidth: 180 },
+ { label: '变动类型', slotName: 'changeType', width: 100 },
+ { label: '变动金额', slotName: 'amount', width: 120, align: 'right' },
+ { label: '实际余额', slotName: 'actualBalance', width: 120, align: 'right' },
+ { label: '冻结金额', slotName: 'frozenBalance', width: 120, align: 'right' },
+ { label: '可用余额', slotName: 'availableBalance', width: 120, align: 'right' },
+ { label: '操作人', slotName: 'operatorName', width: 120 },
+ { label: '备注', slotName: 'remark', minWidth: 180 },
+ { label: '发生时间', slotName: 'createdAt', width: 160 },
+]
+const rechargeColumns: DataTableColumn[] = [
+ { label: '充值申请单号', prop: 'requestNo', minWidth: 180 },
+ { label: '金额', slotName: 'amount', width: 120, align: 'right' },
+ { label: '付款截图', prop: 'voucherFileName', minWidth: 150 },
+ { label: '状态', slotName: 'status', width: 100 },
+ { label: '提交人', slotName: 'submittedByName', width: 120 },
+ { label: '审核备注', slotName: 'reviewRemark', minWidth: 180 },
+ { label: '提交时间', slotName: 'createdAt', width: 160 },
+ { label: '审核时间', slotName: 'reviewedAt', width: 160 },
+]
function messageOf(error: unknown, fallback: string) {
return error instanceof ApiError ? error.message : fallback
@@ -86,8 +104,8 @@ function amountClass(amount: string) {
async function loadAccountData() {
pageLoading.value = true
pageError.value = ''
- channelsError.value = ''
- const requests = [getFinanceAccount(), getAccountLedger(ledgerPage.value, pageSize), getRechargeRequests(rechargePage.value, pageSize)] as const
+ qrCodeLoadError.value = false
+ const requests = [getFinanceAccount(), getAccountLedger(ledgerPage.value, ledgerPageSize.value), getRechargeRequests(rechargePage.value, rechargePageSize.value)] as const
try {
const [accountResult, ledgerResult, rechargeResult] = await Promise.all(requests)
account.value = accountResult
@@ -105,20 +123,11 @@ async function loadAccountData() {
} finally {
pageLoading.value = false
}
- if (canRecharge.value) {
- try {
- channels.value = await getRechargeChannels()
- } catch (error) {
- channels.value = []
- channelsError.value = messageOf(error, '充值渠道加载失败，请稍后重试')
- }
- }
}
async function changeLedgerPage(nextPage: number) {
- ledgerPage.value = nextPage
try {
- const result = await getAccountLedger(nextPage, pageSize)
+ const result = await getAccountLedger(nextPage, ledgerPageSize.value)
ledger.value = result.records
ledgerTotal.value = result.total
} catch (error) {
@@ -127,9 +136,8 @@ async function changeLedgerPage(nextPage: number) {
}
async function changeRechargePage(nextPage: number) {
- rechargePage.value = nextPage
try {
- const result = await getRechargeRequests(nextPage, pageSize)
+ const result = await getRechargeRequests(nextPage, rechargePageSize.value)
rechargeRequests.value = result.records
rechargeTotal.value = result.total
} catch (error) {
@@ -139,13 +147,26 @@ async function changeRechargePage(nextPage: number) {
function openRecharge() {
submitError.value = ''
+ qrCodeLoadError.value = false
+ amountMode.value = 'preset'
+ form.amount = '1000'
rechargeVisible.value = true
}
+function handleQrCodeError() {
+ qrCodeLoadError.value = true
+}
+
function chooseAmount(amount: string) {
+ amountMode.value = 'preset'
form.amount = amount
}
+function chooseCustomAmount() {
+ amountMode.value = 'custom'
+ if (quickAmounts.includes(form.amount)) form.amount = ''
+}
+
function handleVoucherChange(uploadFile: UploadFile, _uploadFiles: UploadFiles) {
const file = uploadFile.raw
if (!file) return
@@ -175,7 +196,7 @@ async function submitRecharge() {
return
}
if (!channelReady.value) {
- submitError.value = `${methodLabels[form.paymentMethod]}收款二维码尚未配置，暂不能提交充值申请`
+ submitError.value = '收款二维码尚未配置，暂不能提交充值申请'
return
}
if (!voucherFile.value) {
@@ -187,7 +208,7 @@ async function submitRecharge() {
}
submitting.value = true
try {
- await createRechargeRequest(normalizedAmount(), form.paymentMethod, voucherFile.value, pendingIdempotencyKey)
+ await createRechargeRequest(normalizedAmount(), voucherFile.value, pendingIdempotencyKey)
pendingIdempotencyKey = ''
rechargeVisible.value = false
voucherFile.value = null
@@ -201,28 +222,26 @@ async function submitRecharge() {
}
}
-watch([() => form.amount, () => form.paymentMethod, voucherFile], () => {
+watch([() => form.amount, voucherFile], () => {
if (!submitting.value) pendingIdempotencyKey = ''
submitError.value = ''
})
+watch([ledgerPage, ledgerPageSize], () => { void changeLedgerPage(ledgerPage.value) })
+watch([rechargePage, rechargePageSize], () => { void changeRechargePage(rechargePage.value) })
+
onMounted(() => { void loadAccountData() })
-
- 实际余额¥ {{ formatAccountAmount(account?.actualBalance) }}当前账户实际资金
+
+ 冻结金额¥ {{ formatAccountAmount(account?.frozenBalance) }}暂不可使用的资金
总可用余额¥ {{ formatAccountAmount(account?.availableBalance) }}实际可用资金与可用授信合计
授信额度¥ {{ formatAccountAmount(account?.creditLimit) }}{{ account?.creditExpiresOn ? `${account.creditExpiresOn} ${account.creditActive ? '到期' : '已到期'}` : '未设置有效期' }}
@@ -232,57 +251,46 @@ onMounted(() => { void loadAccountData() })
-
- {{ changeLabels[row.changeType as AccountChangeType] }}
- {{ Number(row.amount) >= 0 ? '+' : '' }}¥ {{ formatAmount(row.amount) }}
- ¥ {{ formatAmount(row.actualBalanceAfter) }}
- ¥ {{ formatAmount(row.frozenBalanceAfter) }}
- ¥ {{ formatAmount(row.availableBalanceAfter) }}
- ¥ {{ formatAmount(row.creditUsedAfter) }}
- ¥ {{ formatAmount(row.availableCreditAfter) }}
- {{ row.operatorName || '—' }}
- {{ row.remark || '—' }}
- {{ formatDateTime(row.createdAt) }}
-
-
+ {{ changeLabels[row.changeType as AccountChangeType] }}
+ {{ Number(row.amount) >= 0 ? '+' : '' }}¥ {{ formatAmount(row.amount) }}
+ ¥ {{ formatAmount(row.actualBalanceAfter) }}
+ ¥ {{ formatAmount(row.frozenBalanceAfter) }}
+ ¥ {{ formatAmount(row.availableBalanceAfter) }}
+ {{ row.operatorName || '—' }}
+ {{ row.remark || '—' }}
+ {{ formatDateTime(row.createdAt) }}
+
-
- ¥ {{ formatAmount(row.amount) }}
- {{ methodLabels[row.paymentMethod as RechargePaymentMethod] }}
- {{ statusLabels[row.status as RechargeStatus] }} {{ row.submittedByName || '—' }}
- {{ row.reviewRemark || '—' }}
- {{ formatDateTime(row.createdAt) }}
- {{ formatDateTime(row.reviewedAt) }}
-
-
+ ¥ {{ formatAmount(row.amount) }}
+ {{ statusLabels[row.status as RechargeStatus] }}
+ {{ row.submittedByName || '—' }}
+ {{ row.reviewRemark || '—' }}
+ {{ formatDateTime(row.createdAt) }}
+ {{ formatDateTime(row.reviewedAt) }}
+
-
-
-
资金账户
查看本企业 CNY 资金、授信额度、账户流水和充值申请状态。
{{ pageError }}
实际余额
¥ {{ formatAccountAmount(account?.actualBalance) }}当前账户实际资金账户流水
每次资金变动均生成唯一业务单号。
共 {{ ledgerTotal }} 条
+ 充值申请
付款后上传截图，平台审核通过后资金入账。
共 {{ rechargeTotal }} 条
+
- ¥
+ ¥
返回 保存草稿 返回 保存草稿
@@ -2241,7 +2326,7 @@ async function searchOrders(model: QueryModel) {
查看订单草稿 关闭 开始导入并创建草稿
-
+
@@ -2289,28 +2377,28 @@ async function searchOrders(model: QueryModel) {
{{ item.label }} {{ item.value }}
-
-
+
+
+
- 关闭
+
+
+
diff --git a/src/modules/order-management/deliveryOrders.test.mjs b/src/modules/order-management/deliveryOrders.test.mjs
index 3a50edf..20b3d6d 100644
--- a/src/modules/order-management/deliveryOrders.test.mjs
+++ b/src/modules/order-management/deliveryOrders.test.mjs
@@ -7,6 +7,7 @@ const apiSource = readFileSync(new URL('./api/deliveryOrders.ts', import.meta.ur
const routesSource = readFileSync(new URL('./routes.ts', import.meta.url), 'utf8')
const listSource = readFileSync(new URL('./views/DeliveryOrdersView.vue', import.meta.url), 'utf8')
const detailSource = readFileSync(new URL('./views/DeliveryOrderDetailView.vue', import.meta.url), 'utf8')
+const deliveryStyles = readFileSync(new URL('./views/deliveryOrders.css', import.meta.url), 'utf8')
const createSource = readFileSync(new URL('./views/DeliveryOrderCreateView.vue', import.meta.url), 'utf8')
const permissionSource = readFileSync(new URL('../tenant-management/contracts.ts', import.meta.url), 'utf8')
@@ -30,7 +31,9 @@ test('uses only authenticated merchant delivery endpoints without customer scope
})
test('keeps list, read-only detail and create permissions independent in active routes', () => {
- assert.match(routesSource, /path: 'orders\/delivery'[\s\S]*permission: 'merchant:warehouse:delivery:list'[\s\S]*navigation:/)
+ const listRoute = routesSource.match(/path: 'orders\/delivery',[\s\S]*?\n\s*},/)?.[0] ?? ''
+ assert.match(listRoute, /permission: 'merchant:warehouse:delivery:list'/)
+ assert.doesNotMatch(listRoute, /navigation:/)
assert.match(routesSource, /path: 'orders\/delivery\/create'[\s\S]*DeliveryOrderCreateView\.vue[\s\S]*permission: 'merchant:warehouse:delivery:create'/)
assert.match(routesSource, /path: 'orders\/delivery\/:deliveryNo'[\s\S]*DeliveryOrderDetailView\.vue[\s\S]*props: true[\s\S]*permission: 'merchant:warehouse:delivery:list'/)
assert.match(routesSource, /orders-delivery-create[\s\S]*keepAlive: false/)
@@ -38,19 +41,18 @@ test('keeps list, read-only detail and create permissions independent in active
})
test('renders the operation column first and covers loading, empty, error and pagination states', () => {
- const operationIndex = listSource.indexOf('label="操作"')
- const deliveryNumberIndex = listSource.indexOf('label="派送单号"')
+ const operationIndex = listSource.indexOf("label: '操作'")
+ const deliveryNumberIndex = listSource.indexOf("label: '派送单号'")
assert.ok(operationIndex >= 0 && operationIndex < deliveryNumberIndex)
- assert.match(listSource, /v-loading="loading"/)
+ assert.match(listSource, /:loading="loading"/)
assert.match(listSource, /empty-text="暂无派送单"/)
assert.match(listSource, /delivery-state--error/)
assert.match(listSource, /@click="loadOrders">重试/)
assert.match(listSource, /listDeliveryOrders\(buildQuery\(\)\)/)
- assert.match(listSource, //)
assert.match(detailSource, /getDeliveryOrder\(props\.deliveryNo\)/)
assert.match(detailSource, /派送单详情加载失败/)
- for (const heading of ['订单信息', '运输与预约', '货物明细', '费用明细']) assert.match(detailSource, new RegExp(heading))
+ for (const heading of ['订单概览', '运输与预约', '货物明细', '费用明细']) assert.match(detailSource, new RegExp(heading))
assert.doesNotMatch(detailSource, /detail\?\.id|deliveryNo \|\| detail\?\.id|customerId|tenantId/)
})
+test('renders a compact customer-readable delivery detail surface', () => {
+ assert.match(detailSource, //)
+ assert.match(detailSource, /]*\/>返回列表<\/el-button>/)
+ assert.match(detailSource, /class="client-status" :data-tone="statusTone\(detail\.status\)"/)
+ assert.match(detailSource, /TRUCK_PALLET: '卡派打托'/)
+ assert.match(detailSource, /WAREHOUSE_PICKUP: '仓库自提'/)
+ assert.match(detailSource, /PALLET: '托盘'/)
+ assert.match(detailSource, /TRUCK: '卡车'/)
+ assert.match(detailSource, /SELF: '自有账号'/)
+ assert.match(detailSource, /formatter: tableValueFormatter/)
+ assert.match(detailSource, /]*>派送单详情<\/h2>|display\(detail\.status\)/)
+ assert.match(deliveryStyles, /delivery-detail-surface \.delivery-detail-grid div\{display:grid;min-height:42px;/)
+})
+
test('submits the complete create contract with stable retry idempotency and recoverable failures', () => {
for (const model of ['dispatchNo', 'plannedDeliveryAt', 'deliveryMethod', 'pickupMethod', 'loadingType', 'waybillNo', 'carrierName', 'vehicleType', 'vehicleSize', 'driverName', 'driverPhone', 'vehiclePlate', 'appointmentAccount', 'sellerName', 'remark']) {
assert.match(createSource, new RegExp(`v-model="form\\.${model}"`))
diff --git a/src/modules/order-management/inboundOrders.test.mjs b/src/modules/order-management/inboundOrders.test.mjs
index a626746..e5ff2ff 100644
--- a/src/modules/order-management/inboundOrders.test.mjs
+++ b/src/modules/order-management/inboundOrders.test.mjs
@@ -10,6 +10,7 @@ const overseasHttp = readFileSync(new URL('../../api/overseasHttp.ts', import.me
test('activates the customer-scoped overseas inbound list and detail', () => {
assert.match(routes, /path: 'orders\/inbound'[\s\S]*?release: 'active'[\s\S]*?permission: 'merchant:warehouse:inbound:list'/)
+ assert.match(routes, /path: 'orders\/inbound\/:planNo\/detail'[\s\S]*?name: 'orders-inbound-detail'/)
assert.match(api, /\/merchant\/v1\/last-leg\/inbound-plans/)
assert.match(api, /encodeURIComponent\(planNo\)/)
assert.doesNotMatch(api, /\/platform\/|\/internal\/|customerId|tenantId/)
@@ -17,12 +18,12 @@ test('activates the customer-scoped overseas inbound list and detail', () => {
})
test('keeps actions first and exposes filters loading errors empty state pagination and business identifiers', () => {
- assert.match(view, /]*fixed="left"/)
+ assert.match(view, /label: '操作', slotName: 'actions'[^\n]*fixed: 'left'/)
for (const token of ['planNo', 'inboundCode', 'destinationWarehouseCode', 'appointmentStatus', 'dispatchStatus', 'createdDates']) assert.match(view, new RegExp(token))
assert.match(view, /v-loading="loading"/)
assert.match(view, /type="error"/)
assert.match(view, /empty-text="暂无入库订单"/)
- assert.match(view, /]*v-model:page="query\.page"/)
assert.match(view, /detail\.planNo/)
assert.doesNotMatch(view, /planId|orderId|warehouseId|customerId/)
})
@@ -31,8 +32,8 @@ test('shows only the server-provided overseas receiving warehouse code and name'
assert.equal((api.match(/overseasWarehouseCode\?: string \| null/g) || []).length, 2)
assert.equal((api.match(/overseasWarehouseName\?: string \| null/g) || []).length, 2)
assert.doesNotMatch(api, /overseasWarehouseId/)
- assert.match(view, /label="海外接柜仓"/)
- assert.match(view, /overseasWarehouseLabel\(scope\.row\.overseasWarehouseCode, scope\.row\.overseasWarehouseName\)/)
+ assert.match(view, /label: '海外接柜仓'/)
+ assert.match(view, /overseasWarehouseLabel\(row\.overseasWarehouseCode, row\.overseasWarehouseName\)/)
assert.match(view, /overseasWarehouseLabel\(detail\.overseasWarehouseCode, detail\.overseasWarehouseName\)/)
assert.doesNotMatch(view, /warehouseName \|\| warehouseCode|destinationWarehouse(?:Id|Code|Name).*overseasWarehouse/i)
})
@@ -59,17 +60,29 @@ test('renders inbound workflow statuses in Chinese and keeps desktop values on o
['SIGNED', '已签收'], ['PICKING', '拣货中'], ['PARTIAL_INBOUND', '部分入库'],
]) assert.match(view, new RegExp(`${status}: '${label}'`))
assert.match(view, /COMPLETED: '全部入库'/)
- assert.match(view, /label="状态" width="120" show-overflow-tooltip/)
- assert.match(view, /\.detail-grid div \{ min-width: 0;/)
+ assert.match(view, /label: '状态', slotName: 'status', width: 120/)
+ assert.match(view, /\.detail-grid div \{ display: grid; min-width: 0; min-height: 42px;/)
assert.match(view, /\.detail-grid dd \{[^}]*overflow: hidden;[^}]*text-overflow: ellipsis;[^}]*white-space: nowrap;/)
})
+test('uses the shared compact detail surface instead of stacked cards', () => {
+ assert.match(view, //)
+ assert.match(view, /name: 'orders-inbound-detail', params: \{ planNo: row\.planNo \}/)
+ assert.match(view, /]*\/>返回列表<\/el-button>/)
+ assert.match(view, /class="client-status" :data-tone="statusTone\(detail\.status\)"/)
+ assert.match(view, / {
assert.match(view, /const inboundStatusOptions = \[/)
- assert.match(view, /label="作业状态"> import('./views/InboundOrdersView.vue'),
release: 'active',
meta: { title: '入库订单列表', description: '查询海外仓入库订单', permission: 'merchant:warehouse:inbound:list' },
- navigation: { key: 'orders-inbound', icon: Package },
+ },
+ {
+ path: 'orders/inbound/:planNo/detail',
+ name: 'orders-inbound-detail',
+ component: () => import('./views/InboundOrdersView.vue'),
+ props: { detailPage: true },
+ release: 'active',
+ meta: { title: '入库订单详情', workspaceTitle: '入库订单 · 详情', description: '查看海外仓入库订单与作业明细', permission: 'merchant:warehouse:inbound:list', keepAlive: false },
},
{
path: 'orders/delivery',
@@ -27,14 +34,13 @@ export const orderManagementModule = {
component: () => import('./views/DeliveryOrdersView.vue'),
release: 'active',
meta: { title: '派送订单列表', description: '查询海外仓派送订单', permission: 'merchant:warehouse:delivery:list' },
- navigation: { key: 'orders-delivery', icon: Truck },
},
{
path: 'orders/delivery/create',
name: 'orders-delivery-create',
component: () => import('./views/DeliveryOrderCreateView.vue'),
release: 'active',
- meta: { title: '创建派送单', description: '从排车单创建海外仓派送单', permission: 'merchant:warehouse:delivery:create', keepAlive: false },
+ meta: { title: '创建派送单', workspaceTitle: '派送订单 · 新建', description: '从排车单创建海外仓派送单', permission: 'merchant:warehouse:delivery:create', keepAlive: false },
},
{
path: 'orders/delivery/:deliveryNo',
@@ -42,7 +48,7 @@ export const orderManagementModule = {
component: () => import('./views/DeliveryOrderDetailView.vue'),
props: true,
release: 'active',
- meta: { title: '派送单详情', description: '查看本企业海外仓派送单', permission: 'merchant:warehouse:delivery:list', keepAlive: false },
+ meta: { title: '派送单详情', workspaceTitle: '派送订单 · 详情', description: '查看本企业海外仓派送单', permission: 'merchant:warehouse:delivery:list', keepAlive: false },
},
],
} satisfies ClientModuleManifest
diff --git a/src/modules/order-management/views/DeliveryOrderDetailView.vue b/src/modules/order-management/views/DeliveryOrderDetailView.vue
index 4fc2c60..44c3dcb 100644
--- a/src/modules/order-management/views/DeliveryOrderDetailView.vue
+++ b/src/modules/order-management/views/DeliveryOrderDetailView.vue
@@ -4,12 +4,31 @@ import { useRouter } from 'vue-router'
import { ArrowLeft } from '@lucide/vue'
import dayjs from 'dayjs'
import { getDeliveryOrder, type DeliveryOrderDetail, type DeliveryOrderItem } from '../api/deliveryOrders'
+import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
const props = defineProps<{ deliveryNo: string }>()
const router = useRouter()
const loading = ref(false)
const errorMessage = ref('')
const detail = ref(null)
+const statusLabels: Record = { PENDING: '待派送', IN_TRANSIT: '派送中', DELIVERED: '已送达', SIGNED: '已签收', CANCELLED: '已取消' }
+const deliveryMethodLabels: Record = { FBA_PICKUP: 'FBA 自提', CUSTOMER_PICKUP: '客户自提', TRUCK_PALLET: '卡派打托', TRUCK_FLOOR: '卡派地板', EXPRESS: '快递', OUTSOURCED: '外配', DEDICATED_TRUCK: '专车直送', LTL: '零担派送' }
+const pickupMethodLabels: Record = { ONE_PICKUP_ONE_DROP: '一提一卸', ONE_PICKUP_MULTI_DROP: '一提多卸', MULTI_PICKUP_ONE_DROP: '多提一卸', MULTI_PICKUP_MULTI_DROP: '多提多卸', WAREHOUSE_PICKUP: '仓库自提' }
+const loadingTypeLabels: Record = { PALLET: '托盘', FLOOR: '地板', MIXED: '混装' }
+const vehicleTypeLabels: Record = { TRUCK: '卡车', VAN: '厢式货车', BOX_TRUCK: '箱式货车', TRAILER: '拖挂车' }
+const appointmentAccountLabels: Record = { SELF: '自有账号', PLATFORM: '平台账号', CARRIER: '承运商账号' }
+const tableValueFormatter = (_row: object, _column: unknown, value: string | number | null | undefined) => display(value)
+const itemColumns: DataTableColumn[] = [
+ { prop: 'palletNo', label: '托盘码', minWidth: 170, formatter: tableValueFormatter }, { prop: 'inboundCode', label: '入仓码', minWidth: 190, formatter: tableValueFormatter },
+ { prop: 'skuCode', label: 'SKU', minWidth: 160, formatter: tableValueFormatter }, { prop: 'productName', label: '品名', minWidth: 180, formatter: tableValueFormatter },
+ { prop: 'packageCount', label: '箱数', width: 90, align: 'right', headerAlign: 'right', formatter: tableValueFormatter },
+ { prop: 'weightKg', label: '重量（kg）', width: 120, align: 'right', headerAlign: 'right', formatter: tableValueFormatter },
+ { prop: 'volumeCbm', label: '体积（m³）', width: 120, align: 'right', headerAlign: 'right', formatter: tableValueFormatter },
+]
+const feeColumns: DataTableColumn[] = [
+ { prop: 'feeType', label: '费用类型', minWidth: 180, formatter: tableValueFormatter }, { prop: 'currency', label: '币种', width: 100, formatter: tableValueFormatter },
+ { prop: 'amount', label: '金额', width: 140, align: 'right', headerAlign: 'right', formatter: tableValueFormatter }, { prop: 'remark', label: '备注', minWidth: 240, formatter: tableValueFormatter },
+]
const items = computed(() => {
const value = detail.value?.items
@@ -29,6 +48,17 @@ function formatQuantity(value: number | null | undefined, unit: string) {
return value === null || value === undefined ? '—' : `${value} ${unit}`
}
+function statusLabel(value: string) { return statusLabels[value] ?? display(value) }
+function statusTone(value: string) {
+ if (value === 'DELIVERED' || value === 'SIGNED') return 'success'
+ if (value === 'IN_TRANSIT') return 'primary'
+ if (value === 'CANCELLED') return 'danger'
+ return 'warning'
+}
+function mappedLabel(value: string | null | undefined, labels: Record) {
+ return value ? labels[value] ?? value : '—'
+}
+
async function loadDetail() {
loading.value = true
errorMessage.value = ''
@@ -50,24 +80,28 @@ onMounted(loadDetail)
-
-
-
-
+
重试
diff --git a/src/modules/order-management/views/DeliveryOrdersView.vue b/src/modules/order-management/views/DeliveryOrdersView.vue
index 16f6b92..94fe2ab 100644
--- a/src/modules/order-management/views/DeliveryOrdersView.vue
+++ b/src/modules/order-management/views/DeliveryOrdersView.vue
@@ -1,10 +1,13 @@
-
-
+
diff --git a/src/modules/order-management/views/InboundOrdersView.vue b/src/modules/order-management/views/InboundOrdersView.vue
index 2acd022..b884527 100644
--- a/src/modules/order-management/views/InboundOrdersView.vue
+++ b/src/modules/order-management/views/InboundOrdersView.vue
@@ -1,11 +1,21 @@
-
-
- 返回列表
-
-
-
+
重新加载
-
- 查询 重置
-
-
-
- 查看 {{ overseasWarehouseLabel(scope.row.overseasWarehouseCode, scope.row.overseasWarehouseName) }}
- {{ text(scope.row.fbaWarehouseCode) }}
- {{ statusLabel(scope.row.status) }}
- {{ statusLabel(scope.row.appointmentStatus) }}
- {{ statusLabel(scope.row.dispatchStatus) }}
- {{ dateTime(scope.row.createdAt) }}
-
-
+
+
+
+
+
+
+
-
-
- {{ destinationWarehouseLabel(scope.row.fbaWarehouseCode, scope.row.destinationWarehouseCode, scope.row.destinationWarehouseName) }}
-
-
-
-
- {{ destinationWarehouseLabel(scope.row.destinationWarehouseCode, scope.row.destinationWarehouseName) }}
-
-
+
+
+
+
+ {{ destinationWarehouseLabel(row.fbaWarehouseCode, row.destinationWarehouseCode, row.destinationWarehouseName) }}
+
+
+
+
+
+ {{ destinationWarehouseLabel(row.destinationWarehouseCode, row.destinationWarehouseName) }}
+
+
+
+ ({ method: 'POST', url: '/merchant/v1/last-leg/return-orders', data: payload })
}
+export function updateReturnOrder(returnNo: string, payload: ReturnOrderCreate) {
+ return overseasApiRequest({ method: 'PUT', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}`, data: payload })
+}
+export interface ReturnRelabelCreate {
+ fileScope: 'CARTON_TOTAL' | 'SKU_TOTAL'; destinationFbaWarehouseId: string; destinationFbaWarehouseCode: string; cartonRemark?: string; idempotencyKey: string
+ items: Array<{ skuCode: string; quantity: number }>
+}
+export interface ReturnRelabelCreated { relabelNo: string; relabelApplicationId: string; returnNo: string; skuCodes: string[]; status: string }
+export function createReturnRelabel(returnNo: string, payload: ReturnRelabelCreate) {
+ return overseasApiRequest({ method: 'POST', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/relabel`, data: payload })
+}
+export function uploadReturnRelabelFile(relabelNo: string, scope: 'CARTON_TOTAL' | 'SKU_TOTAL', file: File) {
+ const data = new FormData(); data.append('file', file)
+ return overseasApiRequest({ method: 'POST', url: `/merchant/v1/last-leg/relabel-applications/${encodeURIComponent(relabelNo)}/files`, params: { scope }, data, headers: { 'Content-Type': 'multipart/form-data' } })
+}
+export function downloadReturnPhoto(returnNo: string, fileId: string | number) {
+ return overseasBlobRequest({ method: 'GET', url: `/merchant/v1/last-leg/return-orders/${encodeURIComponent(returnNo)}/photos/files/${encodeURIComponent(String(fileId))}/download` })
+}
diff --git a/src/modules/overseas-warehouse/api/warehouseServices.ts b/src/modules/overseas-warehouse/api/warehouseServices.ts
index 1f7b2ca..c9e4656 100644
--- a/src/modules/overseas-warehouse/api/warehouseServices.ts
+++ b/src/modules/overseas-warehouse/api/warehouseServices.ts
@@ -29,7 +29,7 @@ export interface RelabelInventoryCandidate {
inventoryBalanceId: string; inboundOrderId: string; inboundOrderNo?: string; inboundCode?: string
overseasWarehouseId: string; overseasWarehouseCode?: string; overseasWarehouseName?: string
destinationFbaWarehouseCode?: string; destinationFbaWarehouseName?: string; skuCode?: string; productNameZh?: string
- availablePackages: number; version: number
+ availablePackages: number | string; version: number
positions: Array<{ positionId: string; palletNo?: string; batchNo?: string; warehouseLocationCode?: string; availablePackages: number }>
sourceType?: 'INBOUND' | 'RETURN_CARTON'; returnCartonId?: string; cartonMark?: string
skuItems?: Array<{ skuCode: string; newSkuCode?: string; quantity: number; remark?: string }>
diff --git a/src/modules/overseas-warehouse/permissions.test.mjs b/src/modules/overseas-warehouse/permissions.test.mjs
index 3514fff..b5c9791 100644
--- a/src/modules/overseas-warehouse/permissions.test.mjs
+++ b/src/modules/overseas-warehouse/permissions.test.mjs
@@ -18,6 +18,28 @@ test('protects every overseas warehouse page with its independent list permissio
assert.doesNotMatch(routes, /permission: 'dashboard:view'/)
})
+test('opens labeling and return relabeling on dedicated protected create pages', () => {
+ assert.match(routes, /path: 'overseas-warehouse\/labeling\/create'[\s\S]*?props: \{ service: 'labeling', createPage: true \}[\s\S]*?permission: 'merchant:overseas-warehouse:relabel:create'/)
+ assert.match(routes, /path: 'overseas-warehouse\/return-relabel\/create'[\s\S]*?ReturnOrdersView\.vue'[\s\S]*?props: \{ createPage: true \}[\s\S]*?title: '新建退货预报'[\s\S]*?permission: 'merchant:overseas-warehouse:return-order:create'/)
+ assert.match(services, /props\.createPage \? 'create' : 'list'/)
+ assert.match(services, /function returnToList\(\)/)
+ assert.match(returns, /props\.createPage/)
+ assert.match(returns, /class="return-create-surface"/)
+})
+
+test('opens warehouse service and return receipt details as dedicated protected workspace pages', () => {
+ assert.match(routes, /path: 'overseas-warehouse\/labeling\/:detailNo\/detail'[\s\S]*?name: 'overseas-labeling-detail'[\s\S]*?props: \{ service: 'labeling', detailPage: true \}[\s\S]*?permission: 'merchant:overseas-warehouse:relabel:list'/)
+ assert.match(routes, /path: 'overseas-warehouse\/return-relabel\/:returnNo\/detail'[\s\S]*?name: 'overseas-return-relabel-detail'[\s\S]*?props: \{ detailPage: true \}[\s\S]*?permission: 'merchant:overseas-warehouse:return-order:list'/)
+ assert.match(routes, /path: 'overseas-warehouse\/storage-transfer\/:detailNo\/detail'[\s\S]*?name: 'overseas-storage-transfer-detail'[\s\S]*?props: \{ service: 'transfer', detailPage: true \}/)
+ assert.match(routes, /path: 'overseas-warehouse\/cargo-disposal\/:detailNo\/detail'[\s\S]*?name: 'overseas-cargo-disposal-detail'[\s\S]*?props: \{ service: 'disposal', detailPage: true \}/)
+ assert.match(services, /name: 'overseas-labeling-detail'/)
+ assert.match(services, /transfer: 'overseas-storage-transfer-detail'/)
+ assert.match(services, /disposal: 'overseas-cargo-disposal-detail'/)
+ assert.match(services, /class="warehouse-detail-error"/)
+ assert.match(returns, /name: 'overseas-return-relabel-detail'/)
+ assert.doesNotMatch(returns, /title="退货签收详情"/)
+})
+
test('keeps overseas warehouse writes behind operation-specific button permissions', () => {
for (const permission of [
'merchant:overseas-warehouse:relabel:create',
@@ -37,6 +59,14 @@ test('keeps overseas warehouse writes behind operation-specific button permissio
assert.match(returns, /v-if="canCreate" type="primary" @click="openCreate"/)
})
+test('keeps all four overseas warehouse create buttons in the shared left-aligned table toolbar', () => {
+ for (const service of ['labeling', 'transfer', 'disposal']) {
+ assert.match(routes, new RegExp(`props: \\{ service: '${service}' \\}`))
+ }
+ assert.match(services, / {
for (const permission of [
'merchant:overseas-warehouse:last-mile-order:list',
diff --git a/src/modules/overseas-warehouse/routes.ts b/src/modules/overseas-warehouse/routes.ts
index e07a20f..f9a225c 100644
--- a/src/modules/overseas-warehouse/routes.ts
+++ b/src/modules/overseas-warehouse/routes.ts
@@ -1,22 +1,54 @@
-import { Boxes, PackageX, RefreshCcw, Tags, Truck, Warehouse } from '@lucide/vue'
+import { PackageX, RefreshCcw, Tags, Truck, Warehouse } from '@lucide/vue'
import type { ClientModuleManifest } from '../types.ts'
export const overseasWarehouseModule = {
key: 'overseas-warehouse',
navigationGroup: { title: '海外仓', icon: Warehouse },
routes: [
+ {
+ path: 'overseas-warehouse/labeling/create', name: 'overseas-labeling-create',
+ component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'labeling', createPage: true }, release: 'active',
+ meta: { title: '新增贴标申请', workspaceTitle: '贴标申请 · 新建', description: '填写并提交海外仓贴标申请', permission: 'merchant:overseas-warehouse:relabel:create' },
+ },
+ {
+ path: 'overseas-warehouse/labeling/:detailNo/detail', name: 'overseas-labeling-detail',
+ component: () => import('./views/WarehouseServiceView.vue'),
+ props: { service: 'labeling', detailPage: true }, release: 'active',
+ meta: { title: '贴标申请详情', workspaceTitle: '贴标申请 · 详情', description: '查看贴标申请与仓库履约信息', permission: 'merchant:overseas-warehouse:relabel:list', keepAlive: false },
+ },
{
path: 'overseas-warehouse/labeling', name: 'overseas-labeling',
component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'labeling' }, release: 'active',
meta: { title: '贴标申请', description: '查询并管理海外仓贴标申请', permission: 'merchant:overseas-warehouse:relabel:list' },
navigation: { key: 'overseas-labeling', icon: Tags },
},
+ {
+ path: 'overseas-warehouse/return-relabel/create', name: 'overseas-return-relabel-create',
+ component: () => import('./views/ReturnOrdersView.vue'), props: { createPage: true }, release: 'active',
+ meta: { title: '新建退货预报', workspaceTitle: '退货预报 · 新建', description: '填写并提交海外仓退货预报', permission: 'merchant:overseas-warehouse:return-order:create', keepAlive: false },
+ },
+ {
+ path: 'overseas-warehouse/return-relabel/:returnNo/detail', name: 'overseas-return-relabel-detail',
+ component: () => import('./views/ReturnOrdersView.vue'),
+ props: { detailPage: true }, release: 'active',
+ meta: { title: '退货签收详情', workspaceTitle: '退货签收 · 详情', description: '查看退货预报与仓库签收结果', permission: 'merchant:overseas-warehouse:return-order:list', keepAlive: false },
+ },
+ {
+ path: 'overseas-warehouse/storage-transfer/:detailNo/detail', name: 'overseas-storage-transfer-detail',
+ component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'transfer', detailPage: true }, release: 'active',
+ meta: { title: '仓储转运详情', workspaceTitle: '仓储转运 · 详情', description: '查看仓储转运与入库测量详情', permission: 'merchant:overseas-warehouse:transfer:list', keepAlive: false },
+ },
{
path: 'overseas-warehouse/storage-transfer', name: 'overseas-storage-transfer',
component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'transfer' }, release: 'active',
meta: { title: '仓储转运', description: '查询并管理海外仓转运订单', permission: 'merchant:overseas-warehouse:transfer:list' },
navigation: { key: 'overseas-storage-transfer', icon: Truck },
},
+ {
+ path: 'overseas-warehouse/cargo-disposal/:detailNo/detail', name: 'overseas-cargo-disposal-detail',
+ component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'disposal', detailPage: true }, release: 'active',
+ meta: { title: '货物废弃详情', workspaceTitle: '货物废弃 · 详情', description: '查看货物废弃申请详情', permission: 'merchant:overseas-warehouse:discard:list', keepAlive: false },
+ },
{
path: 'overseas-warehouse/cargo-disposal', name: 'overseas-cargo-disposal',
component: () => import('./views/WarehouseServiceView.vue'), props: { service: 'disposal' }, release: 'active',
@@ -33,13 +65,16 @@ export const overseasWarehouseModule = {
path: 'overseas-warehouse/return-inventory', name: 'overseas-return-inventory',
component: () => import('./views/ReturnInventoryView.vue'), release: 'active',
meta: { title: '退货库存', description: '按箱号和 SKU 查询海外仓退货实收库存', permission: 'merchant:overseas-warehouse:return-inventory:list' },
- navigation: { key: 'overseas-return-inventory', icon: Boxes },
},
{
path: 'overseas-warehouse/return-cartons', name: 'overseas-return-cartons',
component: () => import('./views/ReturnInventoryView.vue'), props: { cartonOnly: true }, release: 'active',
meta: { title: '退货箱号管理', description: '查询签收及合箱生成的退货箱号和箱内库存', permission: 'merchant:overseas-warehouse:return-inventory:list' },
- navigation: { key: 'overseas-return-cartons', icon: Boxes },
+ },
+ {
+ path: 'overseas-warehouse/return-cartons/:cartonMark/detail', name: 'overseas-return-carton-detail',
+ component: () => import('./views/ReturnInventoryView.vue'), props: { cartonOnly: true, detailPage: true }, release: 'active',
+ meta: { title: '退货箱明细', workspaceTitle: '退货箱号 · 详情', description: '查看退货箱号与箱内 SKU 明细', permission: 'merchant:overseas-warehouse:return-inventory:list', keepAlive: false },
},
],
} satisfies ClientModuleManifest
diff --git a/src/modules/overseas-warehouse/views/ReturnInventoryView.test.mjs b/src/modules/overseas-warehouse/views/ReturnInventoryView.test.mjs
index 695a27d..9eddaad 100644
--- a/src/modules/overseas-warehouse/views/ReturnInventoryView.test.mjs
+++ b/src/modules/overseas-warehouse/views/ReturnInventoryView.test.mjs
@@ -4,19 +4,20 @@ import test from 'node:test'
const inventory = readFileSync(new URL('./ReturnInventoryView.vue', import.meta.url), 'utf8')
const orders = readFileSync(new URL('./ReturnOrdersView.vue', import.meta.url), 'utf8')
+const routes = readFileSync(new URL('../routes.ts', import.meta.url), 'utf8')
-test('desktop filters reserve six slots and inventory time and statuses have readable presentation', () => {
- assert.match(inventory, /grid-template-columns: repeat\(4, minmax\(150px, 1fr\)\) 130px auto/)
+test('desktop filters use the shared query grid and inventory time and statuses have readable presentation', () => {
+ assert.match(inventory, /]*layout="grid"/)
+ assert.match(inventory, /label: '箱号 \/ 箱唛'/)
assert.match(inventory, /white-space: nowrap/)
assert.match(inventory, /cartonStatusLabel\(cartonDetail.status\)/)
- assert.match(inventory, /formatInventoryTime\(row.createdAt\)/)
- assert.match(inventory, /formatInventoryTime\(row.updatedAt\)/)
+ assert.match(inventory, /formatInventoryTime\(row.updatedAt \|\| row.createdAt \|\| row.receivedAt\)/)
})
test('inventory failures are visible and are not presented as empty inventory', () => {
assert.match(inventory, /catch \(error\)/)
assert.match(inventory, / {
})
test('inventory actions lead both tables and timestamps describe inventory changes', () => {
- const tables = inventory.match(/]*>[\s\S]*?<\/el-table>/g).slice(0, 3)
- for (const table of tables) {
- assert.match(table, /]*>\s*]*fixed="left"/)
- }
- assert.match(inventory, /prop="updatedAt" label="库存更新时间"/)
+ assert.equal((inventory.match(/label: '操作', slotName: 'actions'[^\n]*fixed: 'left'/g) || []).length, 3)
+ assert.match(inventory, /label: '库存更新时间'/)
assert.doesNotMatch(inventory, /实收并上架|最近入库时间/)
})
test('carton management uses server carton pagination rather than deduplicating SKU pages', () => {
assert.match(inventory, /if \(props.cartonOnly\) \{\s*const page = await listReturnInventoryCartons/)
- assert.match(inventory, /:data="cartonSummaryRows" row-key="cartonMark"/)
+ assert.match(inventory, /props.cartonOnly \? cartonSummaryRows.value/)
assert.match(inventory, /cartonSummaryRows.value = \[\]/)
})
@@ -59,3 +57,11 @@ test('warehouse selectors and displays use the catalog instead of internal IDs',
assert.match(inventory, /warehouse\.warehouseCode/)
assert.doesNotMatch(inventory, /海外仓 ID|\{\{ cartonDetail.overseasWarehouseId \}\}|prop="overseasWarehouseId"/)
})
+
+test('opens carton details on a dedicated compact page with a visible retry state', () => {
+ assert.match(routes, /path: 'overseas-warehouse\/return-cartons\/:cartonMark\/detail'/)
+ assert.match(inventory, /name: 'overseas-return-carton-detail'/)
+ assert.match(inventory, /class="carton-detail-surface"/)
+ assert.match(inventory, /detailError \|\| '箱号详情加载失败'/)
+ assert.doesNotMatch(inventory, /
-import { onMounted, reactive, ref } from 'vue'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
-import { Printer, Search } from '@lucide/vue'
+import { ArrowLeft, Printer } from '@lucide/vue'
+import { useRoute, useRouter } from 'vue-router'
+import QueryToolbar, { type QueryField, type QueryModel } from '@/components/common/QueryToolbar.vue'
+import DataTable, { type DataTableColumn } from '@/components/common/DataTable.vue'
+import type { TableAction } from '@/components/common/tableActions'
import { ApiError } from '@/api/types'
import { getMerchantWarehouses, type MerchantWarehouse } from '@/modules/first-leg/public'
import {
@@ -17,10 +21,14 @@ import {
} from '../api/returnInventory'
const activeTab = ref<'summary' | 'cartons'>('summary')
-const props = defineProps<{ cartonOnly?: boolean }>()
+const props = defineProps<{ cartonOnly?: boolean; detailPage?: boolean }>()
+const route = useRoute()
+const router = useRouter()
+const detailCartonMark = computed(() => String(route.params.cartonMark || ''))
if (props.cartonOnly) activeTab.value = 'cartons'
const loading = ref(false)
const loadError = ref('')
+const detailError = ref('')
const warehouses = ref([])
const warehouseError = ref('')
const warehousesLoading = ref(false)
@@ -50,9 +58,53 @@ const summaryRows = ref([])
const cartonRows = ref([])
const cartonSummaryRows = ref([])
const total = ref(0)
-const showCartonDetail = ref(false)
const cartonDetail = ref()
const query = reactive({ page: 1, size: 20, overseasWarehouseId: '', skuCode: '', cartonMark: '', status: 'AVAILABLE', returnNo: '' })
+const queryModel = computed({
+ get: () => ({ ...query }),
+ set: (value) => Object.assign(query, value),
+})
+const queryFields = computed(() => {
+ const fields: QueryField[] = [
+ { key: 'overseasWarehouseId', label: '海外仓', type: 'select', options: warehouses.value.map((warehouse) => ({ label: warehouseLabel(String(warehouse.id)), value: String(warehouse.id) })) },
+ { key: 'skuCode', label: 'SKU', type: 'input', placeholder: '请输入 SKU' },
+ ]
+ if (activeTab.value === 'cartons') fields.push(
+ { key: 'cartonMark', label: '箱号 / 箱唛', type: 'input', placeholder: '请输入箱号或箱唛' },
+ { key: 'returnNo', label: '退货单号', type: 'input', placeholder: '请输入退货单号' },
+ { key: 'status', label: '箱状态', type: 'select', options: [{ label: '可用', value: 'AVAILABLE' }, { label: '已合箱', value: 'MERGED' }] },
+ )
+ return fields
+})
+const summaryColumns: DataTableColumn[] = [
+ { key: 'actions', label: '操作', slotName: 'actions', width: 110, fixed: 'left' },
+ { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 },
+ { prop: 'skuCode', label: 'SKU', minWidth: 190 }, { prop: 'productNameZh', label: '中文品名', minWidth: 190 },
+ { prop: 'availableQuantity', label: '可用库存', width: 110, align: 'right' }, { prop: 'cartonQuantity', label: '所在箱数', width: 110, align: 'right' },
+ { key: 'time', label: '库存更新时间', slotName: 'time', width: 180 },
+]
+const cartonItemColumns: DataTableColumn[] = [
+ { prop: 'skuCode', label: 'SKU', minWidth: 200 },
+ { prop: 'productNameZh', label: '中文品名', minWidth: 240 },
+ { prop: 'quantity', label: '数量', width: 110, align: 'right', headerAlign: 'right' },
+]
+const cartonSummaryColumns: DataTableColumn[] = [
+ { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' }, { prop: 'cartonMark', label: '箱号', minWidth: 220 },
+ { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 }, { prop: 'skuTypes', label: 'SKU 种类', width: 110, align: 'right' },
+ { prop: 'totalQuantity', label: '总件数', width: 100, align: 'right' }, { prop: 'sourceReturnNo', label: '来源退货单', minWidth: 210 },
+ { prop: 'sourceBatchNo', label: '签收批次', minWidth: 180 }, { key: 'dimensions', label: '箱规', slotName: 'dimensions', width: 170 },
+ { key: 'weight', label: '重量', slotName: 'weight', width: 100 }, { key: 'time', label: '生成时间', slotName: 'time', width: 180 },
+]
+const cartonColumns: DataTableColumn[] = [
+ { key: 'actions', label: '操作', slotName: 'actions', width: 150, fixed: 'left' }, { prop: 'cartonMark', label: '箱号', minWidth: 220 },
+ { key: 'warehouse', label: '海外仓', slotName: 'warehouse', minWidth: 190 }, { prop: 'skuCode', label: 'SKU', minWidth: 180 },
+ { prop: 'productNameZh', label: '中文品名', minWidth: 180 }, { prop: 'quantity', label: '本箱数量', width: 110, align: 'right' },
+ { prop: 'cartonSkuTypes', label: 'SKU 种类', width: 110, align: 'right' }, { prop: 'cartonTotalQuantity', label: '总件数', width: 100, align: 'right' },
+ { key: 'status', label: '箱状态', slotName: 'status', width: 100 }, { prop: 'sourceBatchNo', label: '签收批次', minWidth: 180 },
+ { key: 'time', label: '生成时间', slotName: 'time', width: 180 },
+]
+const currentRows = computed(() => activeTab.value === 'summary' ? summaryRows.value : props.cartonOnly ? cartonSummaryRows.value : cartonRows.value)
+const currentColumns = computed(() => activeTab.value === 'summary' ? summaryColumns : props.cartonOnly ? cartonSummaryColumns : cartonColumns)
function params(includeCartonMark: boolean) {
return {
@@ -100,7 +152,8 @@ async function load() {
} finally { loading.value = false }
}
-function search() { query.page = 1; void load() }
+function search() { if (query.page === 1) void load(); else query.page = 1 }
+function resetSearch() { query.status = 'AVAILABLE'; search() }
function changeTab() { query.page = 1; void load() }
function openSkuCartons(skuCode: string) {
query.skuCode = skuCode
@@ -110,11 +163,18 @@ function openSkuCartons(skuCode: string) {
}
async function openCarton(cartonMark: string) {
- try {
- cartonDetail.value = await getReturnInventoryCarton(cartonMark)
- showCartonDetail.value = true
- } catch (error) { ElMessage.error(error instanceof Error ? error.message : '箱内明细加载失败') }
+ void router.push({ name: 'overseas-return-carton-detail', params: { cartonMark } })
}
+async function loadCartonDetail() {
+ if (!detailCartonMark.value) return
+ loading.value = true
+ detailError.value = ''
+ try {
+ cartonDetail.value = await getReturnInventoryCarton(detailCartonMark.value)
+ } catch (error) { cartonDetail.value = undefined; detailError.value = error instanceof Error ? error.message : '箱内明细加载失败'; ElMessage.error(detailError.value) }
+ finally { loading.value = false }
+}
+function returnToCartons() { void router.push({ name: 'overseas-return-cartons' }) }
async function printLabel(cartonMark: string) {
const printWindow = window.open('', '_blank')
@@ -136,59 +196,54 @@ async function printLabel(cartonMark: string) {
}
}
-onMounted(() => { void load(); void loadWarehouses() })
+function rowActions(candidate: object): TableAction[] {
+ const row = candidate as ReturnInventorySummaryItem | ReturnInventoryItem | ReturnInventoryCartonSummary
+ if (activeTab.value === 'summary') return [{ key: 'cartons', label: '查看箱号', run: () => openSkuCartons((row as ReturnInventorySummaryItem).skuCode) }]
+ const cartonMark = (row as ReturnInventoryItem | ReturnInventoryCartonSummary).cartonMark
+ return [
+ { key: 'detail', label: '详情', run: () => openCarton(cartonMark) },
+ { key: 'label', label: '箱唛', run: () => printLabel(cartonMark) },
+ ]
+}
+
+watch(() => [query.page, query.size] as const, ([nextPage, nextSize], [previousPage, previousSize]) => {
+ if (nextSize !== previousSize && nextPage !== 1) { query.page = 1; return }
+ void load()
+})
+
+onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), loadWarehouses()]); else { void load(); void loadWarehouses() } })
-
+
重试加载海外仓
- 查看箱号 {{ warehouseLabel(row.overseasWarehouseId) }} {{ formatInventoryTime(row.updatedAt) }}
-
-
- 详情 {{ warehouseLabel(row.overseasWarehouseId) }}
- {{ row.length && row.width && row.height ? `${row.length} × ${row.width} × ${row.height} cm` : '—' }}
- {{ row.weight ? `${row.weight} kg` : '—' }}
- {{ formatInventoryTime(row.createdAt) }}
-
-
- 详情 {{ row.cartonMark }} {{ warehouseLabel(row.overseasWarehouseId) }} {{ cartonStatusLabel(row.status) }} {{ formatInventoryTime(row.receivedAt) }}
-
-
- {{ cartonDetail.cartonMark }} {{ warehouseLabel(cartonDetail.overseasWarehouseId) }} {{ cartonDetail.sourceReturnNo || '—' }} {{ cartonDetail.sourceBatchNo || '—' }} {{ cartonStatusLabel(cartonDetail.status) }} {{ cartonDetail.skuTypes }} {{ cartonDetail.totalQuantity }} {{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }} {{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}
+
+
+ {{ cartonStatusLabel(cartonDetail.status) }}
diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs
index 81c0fb2..77975ae 100644
--- a/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs
+++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.test.mjs
@@ -3,8 +3,18 @@ import { readFileSync } from 'node:fs'
import test from 'node:test'
const view = readFileSync(new URL('./ReturnOrdersView.vue', import.meta.url), 'utf8')
+const api = readFileSync(new URL('../api/returnOrders.ts', import.meta.url), 'utf8')
+
+test('退货签收照片通过客户鉴权下载接口加载并释放对象 URL', () => {
+ assert.match(api, /\/return-orders\/\$\{encodeURIComponent\(returnNo\)\}\/photos\/files\/\$\{encodeURIComponent\(String\(fileId\)\)\}\/download/)
+ assert.match(api, /overseasBlobRequest/)
+ assert.match(view, /URL\.createObjectURL\(await downloadReturnPhoto\(detailReturnNo\.value, photo\.fileId\)\)/)
+ assert.match(view, /URL\.revokeObjectURL\(url\)/)
+ assert.match(view, /onBeforeUnmount\(clearPhotoUrls\)/)
+})
test('新建退货预报选择海外仓后带出联系人和电话', () => {
+ assert.match(view, /getMerchantWarehouses\(\{ page: 1, size: 200, warehouseType: 'OVERSEAS' \}\)/)
assert.match(view, /@change="selectOperationWarehouse"/)
assert.match(view, /warehouseContactName = warehouse\?\.contactName \|\| ''/)
assert.match(view, /warehouseContactPhone = warehouse\?\.contactPhone \|\| ''/)
@@ -17,9 +27,13 @@ test('新建退货预报选择海外仓后带出联系人和电话', () => {
assert.match(view, /warehouseContactPhone: form\.warehouseContactPhone\.trim\(\)/)
})
-test('新建退货预报使用加宽的双列表单弹窗', () => {
- assert.match(view, /title="新建退货预报" width="1120px"/)
- assert.match(view, //)
+test('新建退货预报使用独立路由页面，编辑仍保留加宽弹框', () => {
+ assert.match(view, /defineProps<\{ createPage\?: boolean; detailPage\?: boolean/)
+ assert.match(view, /name: 'overseas-return-relabel-create'/)
+ assert.match(view, /v-if="props\.createPage"/)
+ assert.match(view, /class="return-create-surface"/)
+ assert.match(view, /新建退货预报<\/h2>/)
+ assert.match(view, /:title="editingReturnNo \? '编辑退货预报' : '新建退货预报'" width="1120px"/)
assert.match(view, /return-create-form \{ display:grid; grid-template-columns:repeat\(2,minmax\(0,1fr\)\)/)
})
@@ -28,25 +42,43 @@ test('退货列表和详情使用客户可读仓库、状态与时间', () => {
assert.match(view, /return warehouse \? warehouseLabel\(warehouse\) : '未关联'/)
assert.match(view, /PENDING_RECEIPT: '待签收'/)
assert.match(view, /PARTIALLY_RECEIVED: '部分签收'/)
- assert.match(view, /COMPLETED: '已完成'/)
+ assert.match(view, /return needRelabel \? '已完成入库\/待换标' : '已完成入库'/)
assert.match(view, /function formatDateTime\(value\?: string \| null\)/)
assert.match(view, /\{\{ operationWarehouseLabel\(row\.overseasWarehouseId\) \}\}/)
- assert.match(view, /\{\{ statusLabel\(row\.status\) \}\}/)
+ assert.match(view, /\{\{ statusLabel\(row\.status, row\.needRelabel\) \}\}/)
assert.match(view, /\{\{ formatDateTime\(row\.createdAt\) \}\}/)
assert.doesNotMatch(view, /
diff --git a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
index 313c351..6c84011 100644
--- a/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
+++ b/src/modules/overseas-warehouse/views/WarehouseServiceView.vue
@@ -1,8 +1,11 @@
-
+
-
-
-
+
+
-
-
+ ]*:page="isCreatePage"/)
assert.match(editorShellSource, //)
@@ -38,13 +41,31 @@ test('exposes real list, draft, submit, and detail workflow entries without canc
assert.match(source, /function submitOrder\(\)/)
assert.match(source, /async function openDetail\(order: FirstLegOrder\)/)
assert.match(source, /Promise\.allSettled\(\[/)
- assert.match(source, /const orderPageRequest = isCreatePage\.value\s*\? store\.loadWarehouseType\('DOMESTIC', true\)\s*:\s*store\.load\(\{ includeDrafts: true \}\)/)
+ assert.match(source, /const orderPageRequest = isCreatePage\.value \|\| isDetailPage\.value\s*\? store\.loadWarehouseType\('DOMESTIC', true\)\s*:\s*store\.load\(\{ includeDrafts: true \}\)/)
assert.match(source, /Promise\.allSettled\(\[\s*orderPageRequest,\s*companyRequest/)
assert.match(source, /tenantStore\.loadCompanyContext\(\)/)
- assert.match(source, /await store\.loadDetail\(order\.id\)/)
+ assert.match(source, /await store\.loadDetail\(orderId\)/)
assert.doesNotMatch(source, /cancelOrder|取消订单/)
})
+test('returns edited submissions to the refreshed order list instead of opening detail', () => {
+ const submitSource = source.slice(source.indexOf('async function submitOrder()'), source.indexOf('async function searchOrders'))
+ assert.match(submitSource, /if \(isCreatePage\.value\)[\s\S]*router\.push\(\{ name: 'first-leg-orders' \}\)[\s\S]*return/)
+ assert.match(submitSource, /await loadPageData\(\)/)
+ assert.doesNotMatch(submitSource, /first-leg-order-detail/)
+})
+
+test('copies an order into the dedicated create page without reusing order identity', () => {
+ assert.match(source, /key: 'copy', label: '复制下单'/)
+ assert.match(source, /name: 'first-leg-order-create'[\s\S]*copyFrom: order\.id/)
+ assert.match(source, /order\.status === 'DRAFT' \? \{ copyDraft: '1' \}/)
+ assert.match(source, /sourceIsDraft \? await store\.loadDraftDetail\(id\) : await store\.loadDetail\(id\)/)
+ assert.match(source, /const draft = draftFromOrder\(order\)[\s\S]*inboundCode: ''/)
+ assert.match(source, /id: `copied-cargo-\$\{\+\+cargoSequence\}`/)
+ assert.match(source, /editingId\.value = undefined/)
+ assert.match(source, /订单数据已复制，请核对后提交/)
+})
+
test('keeps create-page support errors scoped to create-page requests', () => {
assert.match(source, /if \(!isCreatePage\.value && store\.draftLoadError\)/)
})
@@ -71,8 +92,8 @@ test('renders dynamic cargo lines and a responsive editor dialog', () => {
assert.match(source, /function removeCargoItem\(index: number\)/)
assert.match(editorShellSource, /first-leg-editor-dialog\.el-dialog\) \{[^}]*height: 94vh;/)
assert.match(editorShellSource, /width: 100vw !important; height: 100vh;/)
- assert.match(source, /class="mobile-order-list"/)
- assert.match(source, /\.prototype-order-table :deep\(> \.el-table\), \.prototype-order-table :deep\(> \.data-table__pagination\) \{ display: none; \}/)
+ assert.doesNotMatch(source, /class="mobile-order-(?:list|card|surface)"/)
+ assert.doesNotMatch(source, /\.prototype-order-table :deep\(> \.el-table\).*display: none/)
})
test('uses the full editor dialog width for cargo details and cost estimates', () => {
@@ -143,7 +164,7 @@ test('downloads selected carton labels with one array request', () => {
test('exports every visible order field with normalized dates', () => {
assert.match(source, /function formatExportDateTime\(value: string \| null \| undefined\)/)
assert.match(source, /return `\$\{date\.getFullYear\(\)\}-\$\{pad\(date\.getMonth\(\) \+ 1\)\}-\$\{pad\(date\.getDate\(\)\)\} \$\{pad\(date\.getHours\(\)\)\}:\$\{pad\(date\.getMinutes\(\)\)\}:\$\{pad\(date\.getSeconds\(\)\)\}`/)
- for (const label of ['订单号', '入仓码', '渠道', '运输方式', '交货方式', '预约提货时间', '目的仓', '目的仓类型', '当前订单状态', '箱数', '快递公司', '快递单号', 'SKUS', '总毛重', '总净重', '总体积', '总数量', '计费单价', '计费体积', '计费重量', '备注', '货件编号', '跟踪编号', '国内仓入库时间', '创建时间']) {
+ for (const label of ['入仓码', '渠道', '运输方式', '交货方式', '预约提货时间', '目的仓', '目的仓类型', '当前订单状态', '箱数', '快递公司', '快递单号', 'SKUS', '总毛重', '总净重', '总体积', '总数量', '计费单价', '计费体积', '计费重量', '备注', '货件编号', '跟踪编号', '国内仓入库时间', '创建时间']) {
assert.match(source, new RegExp(`'${label}'`))
}
assert.match(source, /formatExportDateTime\(order\.inboundedAt\)/)
@@ -155,6 +176,9 @@ test('exports every visible order field with normalized dates', () => {
test('matches the prototype with selectable dense order-list columns', () => {
assert.match(source, /aria-label="设置订单列表显示列"/)
+ assert.match(source, /显示字段筛选/)
+ assert.match(source, /const defaultVisibleColumnKeys = \['status', 'channel', 'transportMode', 'pickupMethod', 'receivingWarehouse', 'createdAt'\]/)
+ assert.match(source, /key: 'inboundCode', label: '入仓码', width: 230, fixed: 'left'/)
assert.match(source, / {
})
test('keeps dense order identifiers on one line and aligns columns by content type', () => {
- assert.match(source, /key: 'order'[\s\S]{0,160}showOverflowTooltip: true/)
+ assert.match(source, /key: 'inboundCode'[\s\S]{0,180}showOverflowTooltip: true/)
assert.match(source, /key: 'status'[\s\S]{0,100}align: 'center'[\s\S]{0,100}headerAlign: 'center'/)
assert.match(source, /key: 'grossWeight'[\s\S]{0,100}align: 'right'[\s\S]{0,100}headerAlign: 'right'/)
- assert.match(source, /class="order-number-link table-code"/)
- assert.doesNotMatch(source, /[\s\S]{0,400}class="order-reference"/)
+ assert.match(source, /class="inbound-code-primary table-ellipsis table-code"/)
+ assert.doesNotMatch(source, //)
assert.match(source, /\.table-ellipsis, \.table-multivalue \{[^}]*text-overflow: ellipsis;[^}]*white-space: nowrap;/)
- assert.match(source, /\.order-number-link \{[^}]*text-overflow: ellipsis;[^}]*white-space: nowrap;/)
+ assert.match(source, /\.inbound-code-primary \{[^}]*text-overflow: ellipsis;[^}]*white-space: nowrap;/)
assert.match(tableSource, /height: var\(--client-table-row-height\)/)
})
test('shows one unified progress line and C02 business summaries without detail history', () => {
assert.match(source, /import OrderProgressPanel/)
- assert.match(source, /[\s\S]*?/)
assert.match(source, /关键业务摘要<\/h3>/)
assert.match(source, /progressSummaryItems/)
assert.match(source, /summary\.preloadStatus/)
assert.match(source, /summary\.expectedPickCount/)
assert.match(source, /summary\.deliveryTrackingNo/)
assert.match(progressSource, /FIRST_LEG_PROGRESS_STAGES/)
- assert.match(progressSource, /国内入仓、组托、装柜及后续履约同步/)
+ assert.match(progressSource, /订单主节点与关联柜次统一展示/)
+ assert.match(progressSource, /履约进度/)
assert.doesNotMatch(progressSource, /进度记录|el-timeline|timeline/)
assert.doesNotMatch(source, /
-
+ 
+
-
-
+ 扫码付款
请扫描平台收款二维码，付款后上传截图。
{{ channelsError }}
-
- ![]()
-
- 请使用{{ methodLabels[form.paymentMethod] }}扫码完成付款
-{{ methodLabels[form.paymentMethod] }}收款二维码尚未配置，暂不能提交充值申请。
+ 平台收款二维码资源不可用，请联系管理员更新二维码
+ 收款二维码尚未配置，暂不能提交充值申请。
付款截图
@@ -300,18 +308,21 @@ onMounted(() => { void loadAccountData() })
diff --git a/src/modules/finance/views/FinanceBillDetailView.vue b/src/modules/finance/views/FinanceBillDetailView.vue
new file mode 100644
index 0000000..5586a63
--- /dev/null
+++ b/src/modules/finance/views/FinanceBillDetailView.vue
@@ -0,0 +1,85 @@
+
+
+
+
+
+ {{ statusLabel(detail.status) }} {{ confirmationLabel(detail.customerConfirmationStatus) }} 确认账单 {{ row.inboundCode }} —¥ {{ formatAmount(row.amount) }}{{ formatDate(row.receivedAt) }}¥ {{ formatAmount(row.allocatedAmount) }}{{ paymentMethodLabel(row.method) }}
+ {
+ assert.match(viewSource, /]*layout="grid"/)
+ assert.match(viewSource, /]*:row-actions="rowActions"/)
+ assert.match(viewSource, /v-model:page="page" v-model:page-size="pageSize"/)
+ assert.match(viewSource, /:page-sizes="\[20, 50, 100\]"/)
+ assert.doesNotMatch(viewSource, /class="filter-bar"|class="pagination-row"|class="table-empty"/)
})
test('keeps the existing customer finance view permission mapping', () => {
diff --git a/src/modules/finance/views/FinanceBillsView.vue b/src/modules/finance/views/FinanceBillsView.vue
index d4f46df..911368a 100644
--- a/src/modules/finance/views/FinanceBillsView.vue
+++ b/src/modules/finance/views/FinanceBillsView.vue
@@ -1,24 +1,21 @@
@@ -181,65 +176,29 @@ onMounted(() => { void loadBills(1) })
未收 ¥ {{ formatAmount(totals.outstanding) }}
+
-
-
-
-
- 确认账单
-
- {{ formatDate(row.issueDate) }}
- {{ formatDate(row.dueDate) }}
- ¥ {{ formatAmount(row.totalAmount) }}
- ¥ {{ formatAmount(row.receivedAmount) }}
- ¥ {{ formatAmount(row.outstandingAmount) }}
- {{ statusLabel(row.status) }} {{ confirmationLabel(row.customerConfirmationStatus) }}
-
-
+ {{ statusLabel(row.status) }}
+ {{ confirmationLabel(row.customerConfirmationStatus) }}
+
-
-
-
diff --git a/src/modules/first-leg/components/FirstLegOrderEditorShell.vue b/src/modules/first-leg/components/FirstLegOrderEditorShell.vue
index d790f7b..cd8fb68 100644
--- a/src/modules/first-leg/components/FirstLegOrderEditorShell.vue
+++ b/src/modules/first-leg/components/FirstLegOrderEditorShell.vue
@@ -42,14 +42,24 @@ const emit = defineEmits<{
diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
index 46e4b2d..56962c2 100644
--- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
+++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
@@ -5,22 +5,25 @@ import test from 'node:test'
const source = readFileSync(new URL('./FirstLegOrdersView.vue', import.meta.url), 'utf8')
const tableSource = readFileSync(new URL('../../../components/common/DataTable.vue', import.meta.url), 'utf8')
const querySource = readFileSync(new URL('../../../components/common/QueryToolbar.vue', import.meta.url), 'utf8')
+const clientUiSource = readFileSync(new URL('../../../styles/client-ui.css', import.meta.url), 'utf8')
const routerSource = readFileSync(new URL('../routes.ts', import.meta.url), 'utf8')
const editorShellSource = readFileSync(new URL('../components/FirstLegOrderEditorShell.vue', import.meta.url), 'utf8')
const progressSource = readFileSync(new URL('../components/OrderProgressPanel.vue', import.meta.url), 'utf8')
const customsDialogSource = readFileSync(new URL('../components/CustomsDocumentsDialog.vue', import.meta.url), 'utf8')
const customsApiSource = readFileSync(new URL('../api/customs.ts', import.meta.url), 'utf8')
const orderStoreSource = readFileSync(new URL('../store/firstLegOrders.ts', import.meta.url), 'utf8')
+const createHubSource = readFileSync(new URL('./FirstLegOrderCreateHubView.vue', import.meta.url), 'utf8')
test('routes the confirmed first-leg path to the implemented order view', () => {
assert.match(routerSource, /path: 'orders\/first-leg'[\s\S]*?component: \(\) => import\('\.\/views\/FirstLegOrdersView\.vue'\)[\s\S]*?release: 'active'/)
})
test('opens order creation as a dedicated protected page while keeping draft editing in a large dialog', () => {
- assert.match(routerSource, /path: 'orders\/first-leg\/create'[\s\S]*?name: 'first-leg-order-create'[\s\S]*?release: 'active'[\s\S]*?permission: 'order:first-leg:create'/)
- assert.match(routerSource, /name: 'first-leg-order-create'[\s\S]*?props: \{ createPage: true \}/)
+ assert.match(routerSource, /path: 'orders\/first-leg\/create'[\s\S]*?name: 'first-leg-order-create'[\s\S]*?release: 'active'[\s\S]*?permission: 'order:first-leg:create'[\s\S]*?keepAlive: false/)
+ assert.match(routerSource, /name: 'first-leg-order-create'[\s\S]*?FirstLegOrderCreateHubView\.vue/)
+ assert.match(createHubSource, /{{ detail.billNo }}出账 {{ formatDate(detail.issueDate) }} · 到期 {{ formatDate(detail.dueDate) }}
账单概览
- 账单金额
- ¥ {{ formatAmount(detail.totalAmount) }}
- 已收金额
- ¥ {{ formatAmount(detail.receivedAmount) }}
- 未收余额
- ¥ {{ formatAmount(detail.outstandingAmount) }}
- 客户确认
- {{ confirmationLabel(detail.customerConfirmationStatus) }}
- 确认成员
- {{ detail.customerConfirmedByName || '—' }}
- 确认时间
- {{ formatDateTime(detail.customerConfirmedAt) }}
费用明细
收款记录
如对账单内容有疑问，请先联系平台财务，核对无误后再确认。
+ +{{ errorMessage }}重新加载
+
-
- {{ errorMessage }}
-共 {{ total }} 条
+ {{ errorMessage }}
- 重试
-
- {{ statusLabel(detail.status) }} {{ confirmationLabel(detail.customerConfirmationStatus) }}
- 确认账单 {{ row.inboundCode }} —¥ {{ formatAmount(row.amount) }} {{ formatDate(row.receivedAt) }} ¥ {{ formatAmount(row.allocatedAmount) }} {{ paymentMethodLabel(row.method) }}
- {{ detailError }}
{{ detail.billNo }}
出账 {{ formatDate(detail.issueDate) }} · 到期 {{ formatDate(detail.dueDate) }} · 未收 ¥ {{ formatAmount(detail.outstandingAmount) }}
{{ confirmationLabel(detail.customerConfirmationStatus) }}
{{ detail.customerConfirmedByName || '当前企业成员' }} · {{ formatDateTime(detail.customerConfirmedAt) }}
请核对本期金额和费用明细，确认后将记录当前登录成员与确认时间。
费用明细
收款记录
暂无收款记录
如对账单内容有疑问，请先线下联系平台财务，核对无误后再确认。
- -关键业务摘要<\/h3>/)
assert.match(source, /progressSummaryItems/)
assert.match(source, /summary\.preloadStatus/)
assert.match(source, /summary\.expectedPickCount/)
assert.match(source, /summary\.deliveryTrackingNo/)
assert.match(progressSource, /FIRST_LEG_PROGRESS_STAGES/)
- assert.match(progressSource, /国内入仓、组托、装柜及后续履约同步/)
+ assert.match(progressSource, /订单主节点与关联柜次统一展示/)
+ assert.match(progressSource, /履约进度/)
assert.doesNotMatch(progressSource, /进度记录|el-timeline|timeline/)
assert.doesNotMatch(source, /报关回执<\/h3>/)
assert.match(source, /船期摘要/)
- assert.match(source, /柜次进度/)
+ assert.match(source, /柜次明细/)
+ assert.match(source, /尚未分配柜次，后续柜次节点将在这里同步。/)
+ assert.doesNotMatch(source, /暂无柜次分配信息/)
assert.doesNotMatch(source, /summary\.sealNo \|\|/)
assert.doesNotMatch(progressSource, /客户确认|差异处理中|派送中/)
})
test('uses only fields present on C02 rows before loading full detail', () => {
- assert.match(source, /getOrderCargoSummary/)
+ assert.match(source, /orderPackageCount/)
assert.match(source, /label: '渠道'/)
assert.match(source, /label: '目的仓'/)
assert.match(source, /displayListValue/)
@@ -227,10 +254,11 @@ test('uses only fields present on C02 rows before loading full detail', () => {
test('shows and searches the inbound code after a draft is submitted', () => {
assert.match(source, /label: '入仓码 \/ SKU'/)
assert.match(source, /order\.businessSummary\.inboundCode/)
- assert.match(source, /[\s\S]*?class="inbound-code-link table-ellipsis table-code"/)
- assert.match(source, /v-if="order\.businessSummary\.inboundCode" class="order-reference inbound-code-link"/)
+ assert.match(source, /[\s\S]*?class="inbound-code-primary table-ellipsis table-code"/)
+ assert.match(source, /@click="openDetail\(row as FirstLegOrder\)"/)
assert.match(source, /入仓码<\/dt>
- {{ getFirstLegStatusLabel(detailOrder.status) }}
+ {{ getFirstLegStatusLabel(detailOrder.status) }}
{{ getFirstLegTransportModeLabel(detailOrder.transportMode) }}
- {{ detailOrder.orderNo || '—' }}
{{ detailOrder.origin || '起运地待更新' }} → {{ detailOrder.destination || '目的地待更新' }}
+ ← 返回列表
+
+
+ {{ detailOrder.businessSummary.inboundCode || (detailOrder.status === 'DRAFT' ? '入仓码提交后生成' : '入仓码待生成') }}
{{ getFirstLegTransportModeLabel(detailOrder.transportMode) }} · {{ detailOrder.origin || '起运地待更新' }} → {{ detailOrder.destination || '目的地待更新' }}
订单与运输
-
-
- 入仓码
- —
- 入仓码
- {{ detailOrder.status === 'DRAFT' ? '提交后生成' : '待生成' }}
- 创建时间
- {{ formatDateTime(detailOrder.createdAt) }}
- 运输方式
- {{ getFirstLegTransportModeLabel(detailOrder.transportMode) }}
- 贸易条款
- {{ displayValue(detailOrder.tradeTerm) }}
收发货信息
-
- 发货方{{ detailOrder.shipperPartySnapshot?.name || detailOrder.shipper || '未提供' }}
- 收货方{{ detailOrder.consigneePartySnapshot?.name || detailOrder.consignee || detailOrder.destinationWarehouseName || '未提供' }}
-
+ {{ detailOrder.shipperPartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.shipperPartySnapshot.phone || '未填写电话' }}
{{ detailOrder.shipperPartySnapshot.email || '' }}
{{ detailOrder.shipperPartySnapshot.countryRegion }} {{ detailOrder.shipperPartySnapshot.province }} {{ detailOrder.shipperPartySnapshot.city }} {{ detailOrder.shipperPartySnapshot.address }} {{ detailOrder.shipperPartySnapshot.postalCode }}
{{ detailOrder.consigneePartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.consigneePartySnapshot.phone || '未填写电话' }}
{{ detailOrder.consigneePartySnapshot.email || '' }}
{{ detailOrder.consigneePartySnapshot.countryRegion }} {{ detailOrder.consigneePartySnapshot.province }} {{ detailOrder.consigneePartySnapshot.city }} {{ detailOrder.consigneePartySnapshot.address }} {{ detailOrder.consigneePartySnapshot.postalCode }}
平台目的仓地址以最终履约安排为准
-
+
- 发货方
- {{ detailOrder.shipperPartySnapshot?.name || detailOrder.shipper || '未提供' }}{{ detailOrder.shipperPartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.shipperPartySnapshot.phone || '未填写电话' }} · {{ detailOrder.shipperPartySnapshot.email || '未填写邮箱' }}
{{ detailOrder.shipperPartySnapshot.countryRegion }} {{ detailOrder.shipperPartySnapshot.province }} {{ detailOrder.shipperPartySnapshot.city }} {{ detailOrder.shipperPartySnapshot.address }} {{ detailOrder.shipperPartySnapshot.postalCode }} - 收货方
- {{ detailOrder.consigneePartySnapshot?.name || detailOrder.consignee || detailOrder.destinationWarehouseName || '未提供' }}{{ detailOrder.consigneePartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.consigneePartySnapshot.phone || '未填写电话' }} · {{ detailOrder.consigneePartySnapshot.email || '未填写邮箱' }}
{{ detailOrder.consigneePartySnapshot.countryRegion }} {{ detailOrder.consigneePartySnapshot.province }} {{ detailOrder.consigneePartySnapshot.city }} {{ detailOrder.consigneePartySnapshot.address }} {{ detailOrder.consigneePartySnapshot.postalCode }}平台目的仓地址以最终履约安排为准
客户备注
{{ detailOrder.customerRemark }}
柜次进度
-
-
- {{ cabinet.cabinetNo || '—' }}{{ cabinet.status || '待更新' }}
-
-
- -
-
- 柜号
- {{ cabinet.cabinetNo || '—' }}
- 船名 / 航次
- {{ [cabinet.vesselName, cabinet.voyageNo].filter(Boolean).join(' · ') || '待更新' }}
- 预计船期
- {{ cabinet.sailingAt ? formatDateTime(cabinet.sailingAt) : '待更新' }}
+ 柜次明细
+
+ {{ row.cabinetNo || '—' }}
+ {{ [row.vesselName, row.voyageNo].filter(Boolean).join(' · ') || '待更新' }}
+ {{ row.sailingAt ? formatDateTime(row.sailingAt) : '待更新' }}
+ {{ row.status || '待更新' }}
+
+
+ 尚未分配柜次，后续柜次节点将在这里同步。
+履约快递信息
-快递公司{{ detailOrder.expressCompanyName || '待平台补充' }}
快递单号{{ detailOrder.trackingNumber || '待平台补充' }}
- 快递公司
- {{ detailOrder.expressCompanyName || '待平台补充' }}
- 快递单号
- {{ detailOrder.trackingNumber || '待平台补充' }}
平台尚未维护快递信息快递公司和快递单号由平台后台维护，客户端仅只读展示。
货物明细
-件数{{ detailSummary.pieces }}
毛重{{ detailSummary.grossWeightKg.toLocaleString() }} kg
体积{{ detailSummary.volumeCbm }} m³
- 明细
- {{ detailOrder.items.length }} 项
- 件数
- {{ detailSummary.pieces }}
- 毛重
- {{ detailSummary.grossWeightKg.toLocaleString() }} kg
- 体积
- {{ detailSummary.volumeCbm }} m³
{{ detail?.title || '消息详情' }}{{ notificationSentAt(detail?.sentAt) }} · {{ notificationCategoryLabel(detail?.type) }}
{{ errorMessage }}
{{ detail?.content || '暂无消息内容' }}
-
-
- 查看 标为已读 {{ notificationCategoryLabel(row.type) }} {{ notificationSentAt(row.sentAt) }} {{ row.status === 'UNREAD' ? '未读' : '已读' }}
-
+ 消息中心
我的消息
仅显示当前登录企业和成员可见的站内消息。
{{ errorMessage }}
共 {{ page.total }} 条
-
+
+
+ {{ row.status === 'UNREAD' ? '未读' : '已读' }}
+
+
+ {{ errorMessage }}
派送单详情
{{ display(detail?.deliveryNo || deliveryNo) }}
{{ errorMessage }}
-
-
+
+
+
+
+
-
+
-
-
- {{ display(row.palletNo) }}
- {{ display(row.inboundCode) }}
- {{ display(row.skuCode) }}
- {{ display(row.productName) }}
- {{ display(row.packageCount) }}
- {{ display(row.weightKg) }}
- {{ display(row.volumeCbm) }}
-
+
+
+
-
-
- {{ display(row.feeType) }}
- {{ display(row.currency) }}
- {{ display(row.amount) }}
- {{ display(row.remark) }}
-
+
+
+
+
订单信息
+
+
+ {{ statusLabel(detail.status) }}
+ {{ display(detail.deliveryNo) }}
{{ display(detail.overseasWarehouseName) }} · {{ mappedLabel(detail.deliveryMethod, deliveryMethodLabels) }}
订单概览
-
派送单号{{ display(detail.deliveryNo) }}
排车单号{{ display(detail.dispatchNo) }}
出库单号{{ display(detail.outboundNo) }}
- 状态{{ display(detail.status) }}
海外仓{{ display(detail.overseasWarehouseName) }}
- 派送方式{{ display(detail.deliveryMethod) }}
- 提货方式{{ display(detail.pickupMethod) }}
- 装载类型{{ display(detail.loadingType) }}
+ 派送方式{{ mappedLabel(detail.deliveryMethod, deliveryMethodLabels) }}
+ 提货方式{{ mappedLabel(detail.pickupMethod, pickupMethodLabels) }}
+ 装载类型{{ mappedLabel(detail.loadingType, loadingTypeLabels) }}
托盘数{{ formatQuantity(detail.palletCount, '托') }}
箱数{{ formatQuantity(detail.packageCount, '箱') }}
总重量{{ formatQuantity(detail.totalWeightKg, 'kg') }}
@@ -75,17 +109,17 @@ onMounted(loadDetail)
运输与预约
运单号{{ display(detail.waybillNo) }}
承运商{{ display(detail.carrierName) }}
- 车型{{ display(detail.vehicleType) }}
+ 车型{{ mappedLabel(detail.vehicleType, vehicleTypeLabels) }}
车辆尺寸{{ display(detail.vehicleSize) }}
车牌号{{ display(detail.vehiclePlate) }}
司机姓名{{ display(detail.driverName) }}
司机电话{{ display(detail.driverPhone) }}
- 预约账号{{ display(detail.appointmentAccount) }}
+ 预约账号{{ mappedLabel(detail.appointmentAccount, appointmentAccountLabels) }}
卖家名称{{ display(detail.sellerName) }}
计划派送{{ formatDateTime(detail.plannedDeliveryAt) }}
预计到达{{ formatDateTime(detail.expectedArrivalAt) }}
@@ -96,28 +130,16 @@ onMounted(loadDetail)
货物明细
-货物明细
共 {{ items.length }} 条费用明细
-费用明细
共 {{ detail.fees.length }} 条
-
-
-
-
+ 派送订单
查看本企业海外仓派送进度与签收结果。
- 重试
-
- 详情 {{ display(row.deliveryNo) }}
- {{ display(row.dispatchNo) }}
- {{ display(row.outboundNo) }}
- {{ statusLabel(row.status) }} {{ display(row.overseasWarehouseName) }}
- {{ display(row.deliveryMethod) }}
- {{ display(row.waybillNo) }}
- {{ display(row.carrierName) }}
- {{ formatDateTime(row.plannedDeliveryAt) }}
- {{ formatDateTime(row.expectedArrivalAt) }}
- {{ formatDateTime(row.createdAt) }}
-
-
+ 重试
+ {{ statusLabel(row.status) }}
+ {{ formatDateTime(row.plannedDeliveryAt) }}
+ {{ formatDateTime(row.expectedArrivalAt) }}
+ {{ formatDateTime(row.createdAt) }}
+
{{ errorMessage }}
共 {{ total }} 条
+ {{ errorMessage }}
{{ detail ? '入库订单详情' : '入库订单列表' }}
{{ detail ? `计划号：${detail.planNo}` : '查询当前企业在海外仓的入库计划与作业进度' }}
+
+ {{ overseasWarehouseLabel(row.overseasWarehouseCode, row.overseasWarehouseName) }}
+ {{ text(row.fbaWarehouseCode) }}
+ {{ statusLabel(row.status) }}
+ {{ statusLabel(row.appointmentStatus) }}
+ {{ statusLabel(row.dispatchStatus) }}
+ {{ dateTime(row.createdAt) }}
+
+
-
-
+
+ {{ statusLabel(detail.status) }}
+ {{ detail.planNo }}
{{ text(detail.containerNo) }} · {{ overseasWarehouseLabel(detail.overseasWarehouseCode, detail.overseasWarehouseName) }}
入库概览
-
-
- 计划号
- {{ detail.planNo }}
- 集装箱号
- {{ text(detail.containerNo) }}
- 集装箱号
- {{ text(detail.containerNo) }}
- 海外接柜仓
- {{ overseasWarehouseLabel(detail.overseasWarehouseCode, detail.overseasWarehouseName) }}
- 状态
- {{ statusLabel(detail.status) }}
- 入仓码数
- {{ detail.lineCount }}
- 托盘数
- {{ detail.palletCount }}
- 总体积(m³)
- {{ detail.totalVolumeCbm }}
- 计划箱数
- {{ detail.expectedPackageCount }}
- 已拣箱数
- {{ detail.pickedPackageCount }}
- 入仓码数
- {{ detail.lineCount }}
- 托盘数
- {{ detail.palletCount }}
- 计划箱数
- {{ detail.expectedPackageCount }}
- 已拣箱数
- {{ detail.pickedPackageCount }}
- 总体积
- {{ detail.totalVolumeCbm }} m³
入仓明细
共 {{ detail.lines.length }} 条托盘明细
共 {{ detail.pallets.length }} 条{{ detailError || '入库订单详情加载失败' }}重新加载
diff --git a/src/modules/order-management/views/deliveryOrders.css b/src/modules/order-management/views/deliveryOrders.css
index 81183d7..3d1efaf 100644
--- a/src/modules/order-management/views/deliveryOrders.css
+++ b/src/modules/order-management/views/deliveryOrders.css
@@ -1 +1,5 @@
.delivery-page{color:#25324a}.delivery-heading{display:flex;align-items:flex-start;justify-content:space-between;gap:20px;margin-bottom:16px}.delivery-heading h2{margin:0;color:#17233a;font-size:22px}.delivery-heading p{margin:6px 0 0;color:#7a8596;font-size:13px}.delivery-card{margin-bottom:14px;border:1px solid #e5eaf1;border-radius:6px;background:#fff;box-shadow:0 1px 3px rgba(25,42,70,.04)}.delivery-filter{padding:18px 20px}.delivery-filter-grid{display:grid;grid-template-columns:repeat(3,minmax(210px,1fr));gap:14px}.delivery-filter-actions{display:flex;justify-content:flex-end;gap:8px;margin-top:16px}.delivery-table-card{overflow:hidden}.delivery-pagination{display:flex;align-items:center;justify-content:flex-end;gap:16px;padding:14px 18px;color:#778398;font-size:12px}.delivery-state{display:flex;min-height:220px;align-items:center;justify-content:center;gap:12px;flex-direction:column;color:#7a8596}.delivery-state p{margin:0}.delivery-state--error{margin:20px;border:1px solid #f5c2bd;border-radius:6px;background:#fff8f7;color:#b42318}.delivery-section{padding:20px}.delivery-section h3{margin:0 0 18px;padding-bottom:12px;border-bottom:1px solid #edf0f4;color:#26364f;font-size:15px}.delivery-detail-grid{display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:20px 28px}.delivery-detail-grid div{display:flex;min-width:0;flex-direction:column;gap:7px}.delivery-detail-grid span{color:#8792a2;font-size:12px}.delivery-detail-grid strong{overflow-wrap:anywhere;color:#334157;font-size:13px;font-weight:550}.delivery-span-all{grid-column:1/-1}.delivery-back{display:inline-flex;align-items:center;gap:6px;margin-bottom:14px;padding:0;border:0;background:none;color:#2176d2;cursor:pointer}.delivery-form{padding:22px}.delivery-form-grid{display:grid;grid-template-columns:repeat(3,minmax(210px,1fr));gap:4px 24px}.delivery-form-grid .delivery-span-2{grid-column:span 2}.delivery-form-grid .delivery-span-3{grid-column:1/-1}.delivery-form-actions{display:flex;justify-content:center;gap:10px;padding-top:8px}.delivery-fee-heading{display:flex;align-items:center;justify-content:space-between;margin:10px 0 12px}.delivery-fee-heading h3{margin:0;font-size:15px}.delivery-fee-empty{padding:20px;color:#8792a2;text-align:center}:deep(.el-button span){display:inline-flex;align-items:center;gap:6px}:deep(.el-date-editor){width:100%}@media(max-width:1200px){.delivery-filter-grid,.delivery-form-grid{grid-template-columns:repeat(2,minmax(210px,1fr))}.delivery-detail-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.delivery-form-grid .delivery-span-3{grid-column:1/-1}}
+.delivery-page{display:grid;gap:12px}.delivery-card{margin-bottom:0;border-color:var(--client-border);border-radius:var(--client-radius);box-shadow:none}
+.delivery-detail-content{min-height:160px}.delivery-detail-surface{overflow:hidden;border:1px solid var(--client-border);border-radius:var(--client-radius);background:#fff}.delivery-detail-header{display:flex;min-height:64px;align-items:center;justify-content:space-between;gap:16px;padding:8px 16px;border-bottom:1px solid var(--client-border)}.delivery-detail-title{display:flex;min-width:0;align-items:center;gap:12px}.delivery-detail-title>div{min-width:0}.delivery-detail-title h2{margin:0;overflow:hidden;color:#17233a;font-size:18px;line-height:24px;text-overflow:ellipsis;white-space:nowrap}.delivery-detail-title p{margin:2px 0 0;overflow:hidden;color:var(--client-muted);font-size:12px;line-height:18px;text-overflow:ellipsis;white-space:nowrap}.delivery-detail-section+.delivery-detail-section{border-top:1px solid var(--client-border)}.delivery-detail-section>h3,.delivery-detail-section-heading{min-height:40px;margin:0;padding:0 16px;border-bottom:1px solid var(--client-border);background:var(--client-header-bg)}.delivery-detail-section>h3{display:flex;align-items:center;color:var(--client-text);font-size:14px}.delivery-detail-section-heading{display:flex;align-items:center;justify-content:space-between;gap:12px}.delivery-detail-section-heading h3{margin:0;color:var(--client-text);font-size:14px}.delivery-detail-section-heading span{color:var(--client-muted);font-size:12px}.delivery-detail-surface .delivery-detail-grid{grid-template-columns:repeat(4,minmax(0,1fr));gap:0}.delivery-detail-surface .delivery-detail-grid div{display:grid;min-height:42px;grid-template-columns:88px minmax(0,1fr);align-items:center;gap:8px;padding:5px 12px;border-right:1px solid var(--client-border);border-bottom:1px solid var(--client-border)}.delivery-detail-surface .delivery-detail-grid div:nth-child(4n){border-right:0}.delivery-detail-surface .delivery-detail-grid span{color:var(--client-muted);font-size:12px}.delivery-detail-surface .delivery-detail-grid strong{overflow:hidden;color:var(--client-text);font-size:13px;font-weight:600;text-overflow:ellipsis;white-space:nowrap}.delivery-detail-surface .delivery-detail-grid .delivery-span-all{grid-column:1/-1;border-right:0}.delivery-detail-surface .delivery-detail-grid .delivery-span-all strong{white-space:normal}
+@media(max-width:1200px){.delivery-detail-surface .delivery-detail-grid{grid-template-columns:repeat(2,minmax(0,1fr))}.delivery-detail-surface .delivery-detail-grid div:nth-child(4n){border-right:1px solid var(--client-border)}.delivery-detail-surface .delivery-detail-grid div:nth-child(2n){border-right:0}}
+@media(max-width:720px){.delivery-detail-header{align-items:flex-start;flex-direction:column}.delivery-detail-title{width:100%;align-items:flex-start;flex-direction:column;gap:4px}.delivery-detail-surface .delivery-detail-grid{grid-template-columns:1fr}.delivery-detail-surface .delivery-detail-grid div{border-right:0}}
diff --git a/src/modules/overseas-warehouse/api/returnOrders.ts b/src/modules/overseas-warehouse/api/returnOrders.ts
index a28af3e..c6fd930 100644
--- a/src/modules/overseas-warehouse/api/returnOrders.ts
+++ b/src/modules/overseas-warehouse/api/returnOrders.ts
@@ -1,18 +1,20 @@
-import { overseasApiRequest } from '@/api/overseasHttp'
+import { overseasApiRequest, overseasBlobRequest } from '@/api/overseasHttp'
import type { PageResult } from './warehouseServices'
export interface ReturnOrderSummary {
returnNo: string; overseasWarehouseId: string; warehouseContactName?: string; warehouseContactPhone?: string; customerReferenceNo?: string; status: string
- skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; createdAt: string
+ skuTypes: number; expectedQuantity: number; receivedQuantity: number; needRelabel: boolean; relabelNo?: string; relabelStatus?: string; createdAt: string
}
export interface ReturnOrderItem {
skuCode: string; productNameZh?: string; expectedQuantity: number; receivedQuantity: number
}
export interface ReturnReceipt {
- receiptNo: string; receiptBatchNo: string; cartonMark?: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
+ receiptNo: string; receiptBatchNo: string; palletCode: string; trackingNo?: string; startedBy: 'RETURN_NO' | 'SKU'
receivedQuantity: number; operatorName?: string; signedAt: string
}
-export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[] }
+export interface ReturnPallet { palletCode: string; skuTypes: number; totalQuantity: number; items: Array<{ skuCode: string; productNameZh?: string; quantity: number }> }
+export interface ReturnPhoto { fileId: number; fileName: string; contentType: string; sizeBytes: number }
+export interface ReturnOrderDetail { order: ReturnOrderSummary; remark?: string; items: ReturnOrderItem[]; receipts: ReturnReceipt[]; pallets: ReturnPallet[]; photos: ReturnPhoto[] }
export interface ReturnOrderCreate {
overseasWarehouseId: string; warehouseContactName: string; warehouseContactPhone: string; customerReferenceNo?: string; remark?: string; needRelabel: boolean; idempotencyKey: string
items: Array<{ skuCode: string; productNameZh?: string; expectedQuantity: number }>
@@ -27,3 +29,21 @@ export function getReturnOrder(returnNo: string) {
export function createReturnOrder(payload: ReturnOrderCreate) {
return overseasApiRequest{{ props.cartonOnly ? '退货箱号管理' : '退货库存管理' }}
{{ props.cartonOnly ? '查询签收及合箱生成的退货箱号、箱规和箱内 SKU 明细。' : '库存数量以仓库 PDA 确认实收后的入账数量为准。' }}
箱内 SKU
+
+ {{ warehouseLabel(row.overseasWarehouseId) }}
+ {{ cartonStatusLabel(row.status) }}
+ {{ row.length && row.width && row.height ? `${row.length} × ${row.width} × ${row.height} cm` : '—' }}
+ {{ row.weight ? `${row.weight} kg` : '—' }}
+ {{ formatInventoryTime(row.updatedAt || row.createdAt || row.receivedAt) }}
+
+
+
+ {{ cartonDetail.cartonMark }}{{ warehouseLabel(cartonDetail.overseasWarehouseId) }} · 退货箱明细
箱号概览
- 来源退货单
- {{ cartonDetail.sourceReturnNo || '—' }}
- 签收批次
- {{ cartonDetail.sourceBatchNo || '—' }}
- SKU 种类
- {{ cartonDetail.skuTypes }}
- 箱内总件数
- {{ cartonDetail.totalQuantity }}
- 箱规
- {{ cartonDetail.length && cartonDetail.width && cartonDetail.height ? `${cartonDetail.length} × ${cartonDetail.width} × ${cartonDetail.height} cm` : '—' }}
- 重量
- {{ cartonDetail.weight ? `${cartonDetail.weight} kg` : '—' }}
- 签收时间
- {{ formatInventoryTime(cartonDetail.receivedAt) }}
箱内 SKU
{{ detailError || '箱号详情加载失败' }}重新加载
+ 新建退货预报<\/h2>/)
+ assert.match(view, /:title="editingReturnNo \? '编辑退货预报' : '新建退货预报'" width="1120px"/)
assert.match(view, /return-create-form \{ display:grid; grid-template-columns:repeat\(2,minmax\(0,1fr\)\)/)
})
@@ -28,25 +42,43 @@ test('退货列表和详情使用客户可读仓库、状态与时间', () => {
assert.match(view, /return warehouse \? warehouseLabel\(warehouse\) : '未关联'/)
assert.match(view, /PENDING_RECEIPT: '待签收'/)
assert.match(view, /PARTIALLY_RECEIVED: '部分签收'/)
- assert.match(view, /COMPLETED: '已完成'/)
+ assert.match(view, /return needRelabel \? '已完成入库\/待换标' : '已完成入库'/)
assert.match(view, /function formatDateTime\(value\?: string \| null\)/)
assert.match(view, /\{\{ operationWarehouseLabel\(row\.overseasWarehouseId\) \}\}/)
- assert.match(view, /\{\{ statusLabel\(row\.status\) \}\}/)
+ assert.match(view, /\{\{ statusLabel\(row\.status, row\.needRelabel\) \}\}/)
assert.match(view, /\{\{ formatDateTime\(row\.createdAt\) \}\}/)
assert.doesNotMatch(view, / {
- const mainTable = view.slice(view.indexOf('', view.indexOf('/)
+ assert.match(view, /label: '操作', slotName: 'actions', width: 220, fixed: 'left'/)
+ assert.match(view, /]*:row-actions="rowActions"/)
assert.match(createTable, /^/)
})
test('分页初始化不会重复请求退货列表', () => {
- assert.match(view, /function changePage\(page: number\) \{\s*if \(page === query\.page\) return/)
- assert.match(view, /:current-page="query\.page" :page-size="query\.size"/)
- assert.match(view, /@current-change="changePage"/)
+ assert.match(view, /watch\(\(\) => \[query\.page, query\.size\] as const/)
+ assert.match(view, /v-model:page="query\.page" v-model:page-size="query\.size"/)
assert.doesNotMatch(view, /@current-change="load"/)
})
+
+test('退货签收详情使用独立路由和紧凑连续页面', () => {
+ assert.match(view, /name: 'overseas-return-relabel-detail'/)
+ assert.match(view, /class="return-detail-surface"/)
+ assert.match(view, /class="return-detail-grid"/)
+ assert.match(view, /function returnToList\(\)/)
+ assert.doesNotMatch(view, /showDetail/)
+ assert.doesNotMatch(view, /class="return-detail-dialog"/)
+})
+
+test('待审核退货可编辑，完成入库后从独立新增页发起贴标', () => {
+ assert.match(view, /row\.status === 'PENDING_REVIEW'.*key: 'edit'/)
+ assert.match(view, /await updateReturnOrder\(editingReturnNo\.value, payload\)/)
+ assert.match(view, /order\.status === 'COMPLETED' && order\.needRelabel === true && !order\.relabelNo/)
+ assert.match(view, /name: 'overseas-labeling-create'/)
+ assert.match(view, /query: \{ returnNo: order\.returnNo, warehouseId: String\(order\.overseasWarehouseId\) \}/)
+ assert.match(view, /prop: 'relabelNo', label: '换标单号'/)
+ assert.match(view, /label: '换标单状态'/)
+})
diff --git a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
index 360b2c2..e8737cd 100644
--- a/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
+++ b/src/modules/overseas-warehouse/views/ReturnOrdersView.vue
@@ -1,24 +1,72 @@
- 退货签收
预报退货 SKU 和数量，仓库 PDA 实收后自动更新签收状态。
- 详情 {{ operationWarehouseLabel(row.overseasWarehouseId) }}
- 需要换标 否{{ statusLabel(row.status) }} {{ formatDateTime(row.createdAt) }}
-
- 共 {{ total }} 条
+
+ 新建退货预报
填写预计退回的 SKU 和数量，仓库签收后将自动更新实收结果。
+
+
+
+
+ SKU 预报明细需要换标
+ 客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。
+
+ 删除
+
+
+
+
-
+
+
+ 需要换标 否
+ {{ statusLabel(row.status, row.needRelabel) }}
+ {{ relabelStatusLabel(row.relabelStatus) }} —
+ {{ formatDateTime(row.createdAt) }}
+
+
+
+
- 取消 提交预报
+ 取消 {{ editingReturnNo ? '保存修改' : '提交预报' }}
-
+
+
+
- 退货单号{{ selected.order.returnNo }}状态{{ statusLabel(selected.order.status) }} 海外仓{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }}实收 / 预报{{ selected.order.receivedQuantity }} / {{ selected.order.expectedQuantity }}海外仓联系人{{ selected.order.warehouseContactName || '—' }}联系电话{{ selected.order.warehouseContactPhone || '—' }}
- 备注：{{ selected.remark }}
- 预报与实收
签收批次
{{ row.trackingNo || '无快递单号' }} {{ startedByLabel(row.startedBy) }} {{ formatDateTime(row.signedAt) }}
+
+ {{ selected.order.returnNo }}{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }} · 退货签收
+ 贴标申请 {{ statusLabel(selected.order.status, selected.order.needRelabel) }}
+
+
+ 签收概览
+
+ 实收 / 预报{{ selected.order.receivedQuantity }} / {{ selected.order.expectedQuantity }}
+ SKU 种类{{ selected.order.skuTypes }}
+ 是否换标{{ selected.order.needRelabel ? '需要换标' : '否' }}
+ 换标单号{{ selected.order.relabelNo || '—' }}
+ 换标单状态{{ relabelStatusLabel(selected.order.relabelStatus) }}
+ 客户参考号{{ selected.order.customerReferenceNo || '—' }}
+ 海外仓联系人{{ selected.order.warehouseContactName || '—' }}
+ 联系电话{{ selected.order.warehouseContactPhone || '—' }}
+ 创建时间{{ formatDateTime(selected.order.createdAt) }}
+
+ 备注{{ selected.remark }}
+
+
+ 预报与实收
+
+
+ 打托明细（{{ selected.pallets?.length || 0 }} 托）
+
+
+ {{ pallet.palletCode }}{{ pallet.skuTypes }} 种 SKU · {{ pallet.totalQuantity }} 件
+
+ {{ row.productNameZh || '—' }}
+
+
+
+
+
+ 退货打托照片（{{ selected.photos?.length || 0 }} 张）
+
+
+
+
+
+ 签收批次
+
+ {{ row.trackingNo || '无快递单号' }}
+ {{ startedByLabel(row.startedBy) }}
+ {{ formatDateTime(row.signedAt) }}
+
+
- 关闭
-
+
退货签收
预报退货 SKU 和数量，仓库 PDA 实收后自动更新签收状态。
共 {{ total }} 条
+
+ 新建退货预报
填写预计退回的 SKU 和数量，仓库签收后将自动更新实收结果。
+
+
+
+ 删除
+
+
+ {{ operationWarehousesError }}
SKU 预报明细
+ 换标需要换标
+ 客户只需填写预计退回的 SKU 和数量；快递单号由仓库签收时按实际包裹扫描绑定。
+ 该 SKU 已在明细中填写
+
+ 需要换标 否
+ {{ statusLabel(row.status, row.needRelabel) }}
+ {{ relabelStatusLabel(row.relabelStatus) }} —
+ {{ formatDateTime(row.createdAt) }}
+
+
+
+ {{ operationWarehousesError }}
退货单号{{ selected.order.returnNo }}
状态{{ statusLabel(selected.order.status) }}
海外仓{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }}
实收 / 预报{{ selected.order.receivedQuantity }} / {{ selected.order.expectedQuantity }}
海外仓联系人{{ selected.order.warehouseContactName || '—' }}
联系电话{{ selected.order.warehouseContactPhone || '—' }}
备注：{{ selected.remark }}
-预报与实收
签收批次
{{ selected.order.returnNo }}{{ operationWarehouseLabel(selected.order.overseasWarehouseId) }} · 退货签收
+ 签收概览
+
+
+ 实收 / 预报{{ selected.order.receivedQuantity }} / {{ selected.order.expectedQuantity }}
+ SKU 种类{{ selected.order.skuTypes }}
+ 是否换标{{ selected.order.needRelabel ? '需要换标' : '否' }}
+ 换标单号{{ selected.order.relabelNo || '—' }}
+ 换标单状态{{ relabelStatusLabel(selected.order.relabelStatus) }}
+ 客户参考号{{ selected.order.customerReferenceNo || '—' }}
+ 海外仓联系人{{ selected.order.warehouseContactName || '—' }}
+ 联系电话{{ selected.order.warehouseContactPhone || '—' }}
+ 创建时间{{ formatDateTime(selected.order.createdAt) }}
+ 备注{{ selected.remark }}
+ 预报与实收
+打托明细（{{ selected.pallets?.length || 0 }} 托）
+退货打托照片（{{ selected.photos?.length || 0 }} 张）
+
+
+
+ 签收批次
+{{ config.title }}
- 重置
-
-
-
-
-
-
-
-
-
-
-
-
-
部分入库完成订单已有 PDA 实测数据，请在对应行确认测量数据。
- | {{ column }} | |
|---|---|
{{ config.emptyText }} |
- 共 {{ total }} 条
-
+
+
+
-
- 部分入库完成订单已有 PDA 实测数据，请在对应行确认测量数据。
+