html/admin-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
ouyangxq
2026-08-06 14:55:17 +08:00
parent a813426588
commit 4ac0adac62
18 changed files with 379 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.test.ts
+7
View File
@@ -64,6 +64,13 @@ describe('CarrierRatesView source contract', () => {
expect(source).toContain('customerLabel(detail.tenantId)')
})
it('loads shared carrier master data under the platform public scope', () => {
expect(source).toContain('listPlatformPartners({ page: 1, size: 200, type: \'CARRIER\', status: \'ACTIVE\' })')
expect(source).toContain('平台仓库或船司资料加载失败')
expect(source).not.toContain('listPlatformPartners(customerId,')
expect(source).not.toContain('所属企业的仓库或船司资料加载失败')
})
it('inherits QueryToolbar wrapping and full-width mobile controls', () => {
expect(queryToolbarSource).toContain('flex-wrap: wrap')
expect(queryToolbarSource).toContain('@media (max-width: 720px)')
src/modules/fba-pricing/carrier-rates/pages/CarrierRatesView.vue
+2 -2
View File
@@ -276,7 +276,7 @@ async function loadCustomerMasterData(customerId: string) {
try {
const [warehouseResult, partnerResult] = await Promise.all([
listPlatformWarehouses(1, 200),
listPlatformPartners(customerId, { page: 1, size: 200, type: 'CARRIER', status: 'ACTIVE' }),
listPlatformPartners({ page: 1, size: 200, type: 'CARRIER', status: 'ACTIVE' }),
])
if (sequence !== masterDataSequence) return false
warehouses.value = warehouseResult.records.map((item) => ({ ...item, id: String(item.id), tenantId: String(item.tenantId) }))
@@ -288,7 +288,7 @@ async function loadCustomerMasterData(customerId: string) {
warehouses.value = []
carriers.value = []
loadedCustomerId.value = null
ElMessage.error(getApiErrorDetails(error, '所属企业的仓库或船司资料加载失败').message)
ElMessage.error(getApiErrorDetails(error, '平台仓库或船司资料加载失败').message)
}
return false
} finally {
src/modules/master-data/counterparties/api/platformPartners.test.ts
+13 -13
View File
@@ -37,13 +37,13 @@ const payload: SavePlatformPartnerRequest = {
describe('platform partner API', () => {
beforeEach(() => vi.clearAllMocks())
it('queries the platform partner page with tenant and filters', async () => {
it('queries the platform partner page with filters only', async () => {
vi.mocked(http.get).mockResolvedValue({ code: '200', message: 'success', data: { records: [], page: '1', size: '20', total: '1', pages: '1' } })
const result = await listPlatformPartners(10001, { page: 1, size: 20, keyword: '测试', type: 'CUSTOMER', status: 'ACTIVE' })
const result = await listPlatformPartners({ page: 1, size: 20, keyword: '测试', type: 'CUSTOMER', status: 'ACTIVE' })
expect(http.get).toHaveBeenCalledWith('/platform/v1/partners', {
params: { tenantId: 10001, page: 1, size: 20, keyword: '测试', type: 'CUSTOMER', status: 'ACTIVE' },
params: { page: 1, size: 20, keyword: '测试', type: 'CUSTOMER', status: 'ACTIVE' },
})
expect(result).toMatchObject({ page: 1, size: 20, total: 1, pages: 1 })
})
@@ -53,13 +53,13 @@ describe('platform partner API', () => {
vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: null })
vi.mocked(http.patch).mockResolvedValue({ code: '200', message: 'success', data: null })
await createPlatformPartner(10001, payload)
await updatePlatformPartner(10001, '19001', payload)
await changePlatformPartnerStatus(10001, '19001', 'INACTIVE')
await createPlatformPartner(payload)
await updatePlatformPartner('19001', payload)
await changePlatformPartnerStatus('19001', 'INACTIVE')
expect(http.post).toHaveBeenCalledWith('/platform/v1/partners', payload, { params: { tenantId: 10001 } })
expect(http.put).toHaveBeenCalledWith('/platform/v1/partners/19001', payload, { params: { tenantId: 10001 } })
expect(http.patch).toHaveBeenCalledWith('/platform/v1/partners/19001/status', { status: 'INACTIVE' }, { params: { tenantId: 10001 } })
expect(http.post).toHaveBeenCalledWith('/platform/v1/partners', payload, { params: { tenantId: 0 } })
expect(http.put).toHaveBeenCalledWith('/platform/v1/partners/19001', payload, { params: { tenantId: 0 } })
expect(http.patch).toHaveBeenCalledWith('/platform/v1/partners/19001/status', { status: 'INACTIVE' }, { params: { tenantId: 0 } })
})
it('normalizes legacy detail types and uses import contracts', async () => {
@@ -75,17 +75,17 @@ describe('platform partner API', () => {
fileName: 'partners.xlsx', totalRows: 1, importedRows: 1, success: true, errors: [],
} })
const detail = await getPlatformPartner(10001, '19001')
const detail = await getPlatformPartner('19001')
const template = await downloadPlatformPartnerImportTemplate()
const file = new File(['xlsx'], 'partners.xlsx')
const result = await importPlatformPartners(10001, file)
const result = await importPlatformPartners(file)
expect(detail.types).toEqual(['CUSTOMER', 'SUPPLIER'])
expect(detail.dataScopeId).toBe(10001)
expect(template).toBeInstanceOf(Blob)
expect(result.success).toBe(true)
expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/partners/19001', { params: { tenantId: 10001 } })
expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/partners/19001', { params: { tenantId: 0 } })
expect(http.get).toHaveBeenNthCalledWith(2, '/platform/v1/partners/import-template', { responseType: 'blob' })
expect(http.post).toHaveBeenCalledWith('/platform/v1/partners/import', expect.any(FormData), { params: { tenantId: 10001 } })
expect(http.post).toHaveBeenCalledWith('/platform/v1/partners/import', expect.any(FormData), { params: { tenantId: 0 } })
})
})
src/modules/master-data/counterparties/api/platformPartners.ts
+11 -12
View File
@@ -83,6 +83,7 @@ export interface PlatformPartnerImportResult {
}
const basePath = '/platform/v1/partners'
const platformResourceScope = 0
function normalizePartner(resource: PlatformPartnerResource): PlatformPartnerResource {
const legacyTypes: PlatformPartnerType[] = resource.partnerType === 'BOTH'
@@ -96,9 +97,9 @@ function normalizePartner(resource: PlatformPartnerResource): PlatformPartnerRes
}
}
export async function listPlatformPartners(tenantId: number | string | undefined, query: PlatformPartnerQuery) {
export async function listPlatformPartners(query: PlatformPartnerQuery) {
const response = await http.get<ApiEnvelope<PlatformPartnerPagePayload>, ApiEnvelope<PlatformPartnerPagePayload>>(basePath, {
params: { tenantId, ...query },
params: query,
})
const page = unwrapApiResponse(response)
return {
@@ -111,10 +112,10 @@ export async function listPlatformPartners(tenantId: number | string | undefined
}
}
export async function getPlatformPartner(tenantId: number | string, partnerId: number | string) {
export async function getPlatformPartner(partnerId: number | string) {
const response = await http.get<ApiEnvelope<PlatformPartnerResource>, ApiEnvelope<PlatformPartnerResource>>(
`${basePath}/${partnerId}`,
{ params: { tenantId } },
{ params: { tenantId: platformResourceScope } },
)
return normalizePartner(unwrapApiResponse(response))
}
@@ -123,42 +124,40 @@ export async function downloadPlatformPartnerImportTemplate() {
return http.get<Blob, Blob>(`${basePath}/import-template`, { responseType: 'blob' })
}
export async function importPlatformPartners(tenantId: number | string, file: File) {
export async function importPlatformPartners(file: File) {
const form = new FormData()
form.append('file', file)
const response = await http.post<ApiEnvelope<PlatformPartnerImportResult>, ApiEnvelope<PlatformPartnerImportResult>>(
`${basePath}/import`,
form,
{ params: { tenantId } },
{ params: { tenantId: platformResourceScope } },
)
return unwrapApiResponse(response)
}
export async function createPlatformPartner(tenantId: number | string, payload: SavePlatformPartnerRequest) {
export async function createPlatformPartner(payload: SavePlatformPartnerRequest) {
const response = await http.post<ApiEnvelope<number | string>, ApiEnvelope<number | string>>(basePath, payload, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
export async function updatePlatformPartner(
tenantId: number | string,
partnerId: number | string,
payload: SavePlatformPartnerRequest,
) {
const response = await http.put<ApiEnvelope<null>, ApiEnvelope<null>>(`${basePath}/${partnerId}`, payload, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
export async function changePlatformPartnerStatus(
tenantId: number | string,
partnerId: number | string,
status: PlatformPartnerStatus,
) {
const response = await http.patch<ApiEnvelope<null>, ApiEnvelope<null>>(`${basePath}/${partnerId}/status`, { status }, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
src/modules/master-data/counterparties/pages/PartnersView.test.ts
+31 -33
View File
@@ -3,13 +3,13 @@ import { createPinia, setActivePinia } from 'pinia'
import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import {
getPlatformPartner,
listPlatformPartners,
type PlatformPartnerResource,
} from '@/modules/master-data/counterparties/api/platformPartners'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useAuthStore } from '@/core/auth/auth'
import QueryToolbar from '@/shared/components/QueryToolbar.vue'
import { listPlatformTenants, type PlatformTenantResource } from '../../../iam/api/platformIam'
import PartnersView from './PartnersView.vue'
vi.mock('@/modules/master-data/counterparties/api/platformPartners', () => ({
@@ -22,8 +22,6 @@ vi.mock('@/modules/master-data/counterparties/api/platformPartners', () => ({
changePlatformPartnerStatus: vi.fn(),
}))
vi.mock('../../../iam/api/platformIam', () => ({ listPlatformTenants: vi.fn() }))
class ResizeObserverStub implements ResizeObserver {
observe() {}
unobserve() {}
@@ -44,8 +42,8 @@ function createMemoryStorage(): Storage {
const partner: PlatformPartnerResource = {
id: '19001',
tenantId: 10001,
dataScopeId: 10001,
tenantId: 0,
dataScopeId: 0,
partnerCode: 'CUS-001',
partnerName: '深圳示例贸易有限公司',
partnerType: 'CUSTOMER',
@@ -64,16 +62,6 @@ const partner: PlatformPartnerResource = {
updatedAt: '2026-07-30T22:45:00',
}
const tenant = (id: number | string, tenantName: string): PlatformTenantResource => ({
id, tenantCode: String(id), tenantName, status: 'ACTIVE', legalName: tenantName,
legalRepresentative: null, unifiedSocialCreditCode: null, contactName: null,
contactPhone: null, contactEmail: null, servicePackage: null, contactWechat: null,
salesOwnerName: null, paymentTermDays: null, enterpriseType: null, establishedDate: null,
registeredCapital: null, registeredCapitalCurrency: null, registeredAddress: null,
internalRemark: null, createdAt: null, approvedAt: null,
})
const snowflakeTenantId = '9223372036854775806'
async function mountView() {
vi.stubGlobal('localStorage', createMemoryStorage())
vi.stubGlobal('sessionStorage', createMemoryStorage())
@@ -103,22 +91,20 @@ describe('PartnersView real API integration', () => {
beforeEach(() => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
document.body.innerHTML = ''
vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({
records: [tenant(10001, '默认企业'), tenant(snowflakeTenantId, '雪花企业')], page: 1, size: 200, total: 2, pages: 1,
})
vi.mocked(listPlatformPartners).mockReset().mockResolvedValue({
records: [partner], page: 1, size: 20, total: 1, pages: 1,
})
vi.mocked(getPlatformPartner).mockReset().mockResolvedValue(partner)
})
it('loads all enterprises by default and renders the real partner fields', async () => {
it('loads platform partner data and renders the real partner fields', async () => {
const wrapper = await mountView()
expect(listPlatformPartners).toHaveBeenCalledWith(undefined, {
expect(listPlatformPartners).toHaveBeenCalledWith({
page: 1, size: 20, keyword: undefined, type: undefined, status: undefined,
})
expect(wrapper.find('input[aria-label="所属企业"]').exists()).toBe(true)
expect(wrapper.text()).toContain('全部企业 · 共 1 个往来单位')
expect(wrapper.find('input[aria-label="所属企业"]').exists()).toBe(false)
expect(wrapper.text()).toContain('平台公共数据 · 共 1 个往来单位')
expect(wrapper.text()).toContain('深圳示例贸易有限公司')
expect(wrapper.text()).toContain('CUS-001')
expect(wrapper.text()).toContain('contact@example.com')
@@ -130,18 +116,30 @@ describe('PartnersView real API integration', () => {
expect(wrapper.find('.table-panel').exists()).toBe(true)
})
it('preserves a snowflake tenant id as a string when switching enterprises', async () => {
it('opens the create form without selecting an enterprise', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
const model = { tenantId: snowflakeTenantId, keyword: '', type: '', status: '' }
toolbar.vm.$emit('update:modelValue', model)
toolbar.vm.$emit('search', model)
const createButton = wrapper.findAll('button').find((button) => button.text().trim() === '新增往来单位')
await createButton?.trigger('click')
await flushPromises()
expect(listPlatformPartners).toHaveBeenLastCalledWith(snowflakeTenantId, {
page: 1, size: 20, keyword: undefined, type: undefined, status: undefined,
})
expect(document.body.textContent).toContain('新增往来单位')
expect(document.body.textContent).not.toContain('请先在筛选条件中选择所属企业')
})
it('renders a padded detail layout without an empty data-scope cell', async () => {
const wrapper = await mountView()
const detailButton = wrapper.findAll('button').find((button) => button.text().trim() === '详情')
await detailButton?.trigger('click')
await flushPromises()
const detailContent = document.querySelector<HTMLElement>('.detail-drawer .partner-detail')
const sections = detailContent?.querySelectorAll('section')
const otherInfo = sections?.item(sections.length - 1)
expect(detailContent).not.toBeNull()
expect(otherInfo?.querySelectorAll('.detail-grid > .detail-span')).toHaveLength(2)
expect(otherInfo?.textContent).toContain('更新时间')
expect(otherInfo?.textContent).toContain('长期合作单位')
expect(document.body.textContent).not.toContain('数据范围')
})
it('updates filters locally and only requests after search', async () => {
@@ -158,7 +156,7 @@ describe('PartnersView real API integration', () => {
await flushPromises()
expect(listPlatformPartners).toHaveBeenCalledTimes(2)
expect(listPlatformPartners).toHaveBeenLastCalledWith(undefined, {
expect(listPlatformPartners).toHaveBeenLastCalledWith({
page: 1, size: 20, keyword: '深圳', type: undefined, status: undefined,
})
})
@@ -166,7 +164,7 @@ describe('PartnersView real API integration', () => {
it('shows useful placeholders and visible required markers in the create form', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
const model = { tenantId: '10001', keyword: '', type: '', status: '' }
const model = { keyword: '', type: '', status: '' }
toolbar.vm.$emit('update:modelValue', model)
toolbar.vm.$emit('search', model)
await flushPromises()
src/modules/master-data/counterparties/pages/PartnersView.vue
+11 -89
View File
@@ -23,7 +23,6 @@ import {
type SavePlatformPartnerRequest,
} from '@/modules/master-data/counterparties/api/platformPartners'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
const pageSize = ref(20)
const access = useAccessPreviewStore()
@@ -42,36 +41,23 @@ const formRef = ref<FormInstance>()
const rows = ref<PlatformPartnerResource[]>([])
const page = ref(1)
const total = ref(0)
const tenants = ref<PlatformTenantResource[]>([])
const tenantLoadError = ref<ApiErrorDetails | null>(null)
const editorTenantId = ref('')
const loadError = ref<ApiErrorDetails | null>(null)
const statusLoadingIds = ref(new Set<string>())
let loadSequence = 0
type PartnerFilters = QueryModel & {
tenantId: string
keyword: string
type: PlatformPartnerType | ''
status: PlatformPartnerStatus | ''
}
const filters = ref<PartnerFilters>({
tenantId: '',
keyword: '',
type: '',
status: '',
})
const appliedFilters = ref<PartnerFilters>({ ...filters.value })
const queryFields = computed<QueryField[]>(() => [
{
key: 'tenantId',
type: 'select',
width: 180,
placeholder: tenantLoadError.value ? '企业列表加载失败' : '全部企业',
props: { 'aria-label': '所属企业', filterable: true, disabled: Boolean(tenantLoadError.value) },
options: tenants.value.map((tenant) => ({ value: String(tenant.id), label: `${tenant.tenantName}（${tenant.tenantCode || tenant.id}）` })),
},
{ key: 'keyword', type: 'input', placeholder: '单位名称、编码、联系人或电话' },
{
key: 'type',
@@ -130,13 +116,6 @@ const { captureBaseline } = useUnsavedWorkRegistration({
requiredPermission: editorPermission,
})
const selectedEnterpriseId = computed(() => appliedFilters.value.tenantId)
const targetEnterpriseId = computed(() => filters.value.tenantId)
const selectedEnterpriseName = computed(() => {
if (!selectedEnterpriseId.value) return '全部企业'
return tenants.value.find((tenant) => String(tenant.id) === selectedEnterpriseId.value)?.tenantName || `企业 ${selectedEnterpriseId.value}`
})
const rules: FormRules<PartnerForm> = {
partnerCode: [{ required: true, whitespace: true, message: '请输入往来单位编码', trigger: 'blur' }],
partnerName: [{ required: true, whitespace: true, message: '请输入往来单位名称', trigger: 'blur' }],
@@ -168,7 +147,6 @@ function partnerTypeLabel(type: PlatformPartnerLegacyType) {
const partnerColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 210, fixed: 'left', slotName: 'actions' },
{ key: 'partner', label: '往来单位', minWidth: 210, slotName: 'partner' },
{ key: 'tenant', label: '所属企业', minWidth: 190, showOverflowTooltip: true, slotName: 'tenant' },
{ key: 'type', label: '类型', minWidth: 115, slotName: 'type' },
{ key: 'contact', label: '联系人', minWidth: 165, slotName: 'contact' },
{ key: 'address', label: '地址', minWidth: 240, slotName: 'address' },
@@ -196,49 +174,12 @@ function queryParams() {
}
}
function apiTenantId(value: string | undefined) {
if (!value) return undefined
const numeric = Number(value)
return Number.isSafeInteger(numeric) ? numeric : value
}
function requireSelectedEnterprise(action: string) {
if (!targetEnterpriseId.value) {
ElMessage.warning(`请先在筛选条件中选择所属企业，再${action}`)
return null
}
return apiTenantId(targetEnterpriseId.value)!
}
function tenantName(tenantId: number | string) {
return tenants.value.find((tenant) => String(tenant.id) === String(tenantId))?.tenantName || `企业 ${tenantId}`
}
async function loadTenants() {
tenantLoadError.value = null
try {
const records: PlatformTenantResource[] = []
let currentPage = 1
let pages = 1
do {
const result = await listPlatformTenants({ page: currentPage, size: 200 })
records.push(...result.records)
pages = Math.max(1, result.pages)
currentPage += 1
} while (currentPage <= pages)
tenants.value = records
} catch (error) {
tenants.value = []
tenantLoadError.value = getApiErrorDetails(error, '企业列表加载失败，暂时无法按所属企业筛选')
}
}
async function loadPartners() {
const sequence = ++loadSequence
loading.value = true
loadError.value = null
try {
const result = await listPlatformPartners(apiTenantId(appliedFilters.value.tenantId), queryParams())
const result = await listPlatformPartners(queryParams())
if (sequence !== loadSequence) return
rows.value = result.records
total.value = result.total
@@ -254,7 +195,6 @@ async function loadPartners() {
function searchPartners(model: QueryModel) {
appliedFilters.value = {
tenantId: String(model.tenantId || ''),
keyword: String(model.keyword || ''),
type: (model.type || '') as PlatformPartnerType | '',
status: (model.status || '') as PlatformPartnerStatus | '',
@@ -267,9 +207,6 @@ function searchPartners(model: QueryModel) {
}
function openCreate() {
const tenantId = requireSelectedEnterprise('新增往来单位')
if (!tenantId) return
editorTenantId.value = String(tenantId)
Object.assign(form, emptyForm())
captureBaseline()
editorOpen.value = true
@@ -281,7 +218,6 @@ function nullable(value: string | null) {
}
function openEdit(row: PlatformPartnerResource) {
editorTenantId.value = String(row.tenantId)
Object.assign(form, {
id: String(row.id),
partnerCode: row.partnerCode,
@@ -327,12 +263,11 @@ function savePayload(): SavePlatformPartnerRequest {
}
async function openDetail(row: PlatformPartnerResource) {
const tenantId = apiTenantId(String(row.tenantId))!
detailOpen.value = true
detailLoading.value = true
detail.value = null
try {
detail.value = await getPlatformPartner(tenantId, row.id)
detail.value = await getPlatformPartner(row.id)
} catch (error) {
const meta = getApiErrorDetails(error, '往来单位详情加载失败')
ElMessage.error(meta.requestId ? `${meta.message}（requestId: ${meta.requestId}）` : meta.message)
@@ -343,7 +278,6 @@ async function openDetail(row: PlatformPartnerResource) {
}
function openImport() {
if (!requireSelectedEnterprise('批量导入')) return
importFile.value = null
importResult.value = null
importOpen.value = true
@@ -376,8 +310,6 @@ async function downloadTemplate() {
}
async function submitImport() {
const tenantId = requireSelectedEnterprise('批量导入')
if (!tenantId) return
if (!importFile.value) {
ElMessage.warning('请先选择 XLSX 文件')
return
@@ -385,7 +317,7 @@ async function submitImport() {
importing.value = true
importResult.value = null
try {
importResult.value = await importPlatformPartners(tenantId, importFile.value)
importResult.value = await importPlatformPartners(importFile.value)
if (importResult.value.success) {
ElMessage.success(`成功导入 ${importResult.value.importedRows} 条往来单位`)
await loadPartners()
@@ -415,18 +347,16 @@ function downloadImportErrors() {
}
async function savePartner() {
const tenantId = form.id ? apiTenantId(editorTenantId.value) : requireSelectedEnterprise('新增往来单位')
if (!tenantId) return
const valid = await formRef.value?.validate().catch(() => false)
if (!valid) return
saving.value = true
try {
const payload = savePayload()
if (form.id) {
await updatePlatformPartner(tenantId, form.id, payload)
await updatePlatformPartner(form.id, payload)
ElMessage.success('往来单位已更新')
} else {
await createPlatformPartner(tenantId, payload)
await createPlatformPartner(payload)
ElMessage.success('往来单位已新增')
}
editorOpen.value = false
@@ -440,7 +370,6 @@ async function savePartner() {
}
async function toggleStatus(row: PlatformPartnerResource) {
const tenantId = apiTenantId(String(row.tenantId))!
const nextStatus: PlatformPartnerStatus = row.status === 'ACTIVE' ? 'INACTIVE' : 'ACTIVE'
const action = nextStatus === 'ACTIVE' ? '启用' : '停用'
try {
@@ -455,7 +384,7 @@ async function toggleStatus(row: PlatformPartnerResource) {
const id = String(row.id)
statusLoadingIds.value = new Set(statusLoadingIds.value).add(id)
try {
await changePlatformPartnerStatus(tenantId, row.id, nextStatus)
await changePlatformPartnerStatus(row.id, nextStatus)
ElMessage.success(`往来单位已${action}`)
await loadPartners()
} catch (error) {
@@ -474,7 +403,6 @@ function formatUpdatedAt(value?: string | null) {
watch([page, pageSize], () => { void loadPartners() })
onMounted(() => {
void loadTenants()
void loadPartners()
})
</script>
@@ -483,12 +411,6 @@ onMounted(() => {
<div class="business-page partners-page">
<QueryToolbar v-model="filters" class="surface-panel" ariaLabel="往来单位筛选" :fields="queryFields" @search="searchPartners" />
<el-alert v-if="tenantLoadError" type="warning" :closable="false" show-icon>
<template #title>所属企业列表加载失败</template>
<p>{{ tenantLoadError.message }}；往来单位仍按全部企业展示。</p>
<ApiErrorMeta :details="tenantLoadError" />
<el-button link type="warning" @click="loadTenants">重新加载企业列表</el-button>
</el-alert>
<section v-if="loadError" class="surface-panel partners-error" role="alert">
<div>
@@ -503,7 +425,7 @@ onMounted(() => {
<div class="partners-table-header">
<div class="partners-table-heading">
<h2>往来单位列表</h2>
<span>{{ selectedEnterpriseName }} · 共 {{ total }} 个往来单位</span>
<span>平台公共数据 · 共 {{ total }} 个往来单位</span>
</div>
<div class="partners-primary-actions">
<el-button v-if="access.can('platform:counterparty:import')" :disabled="loading" @click="openImport"><Upload :size="16" />批量导入</el-button>
@@ -530,7 +452,6 @@ onMounted(() => {
</div>
</template>
<template #partner="{ row }"><div class="partner-cell"><span><Building2 :size="18" /></span><div><strong>{{ (row as PlatformPartnerResource).partnerName }}</strong><small>{{ (row as PlatformPartnerResource).partnerCode }}</small></div></div></template>
<template #tenant="{ row }"><span>{{ tenantName((row as PlatformPartnerResource).tenantId) }}</span></template>
<template #type="{ row }"><div class="partner-types"><el-tag v-for="type in (row as PlatformPartnerResource).types" :key="type" effect="plain">{{ partnerTypeLabel(type) }}</el-tag></div></template>
<template #contact="{ row }"><strong>{{ (row as PlatformPartnerResource).contactName }}</strong><span class="partner-subline">{{ (row as PlatformPartnerResource).contactPhone }}</span><span v-if="(row as PlatformPartnerResource).contactEmail" class="partner-subline">{{ (row as PlatformPartnerResource).contactEmail }}</span></template>
<template #address="{ row }"><div class="partner-address"><MapPin :size="15" /><span>{{ [(row as PlatformPartnerResource).province, (row as PlatformPartnerResource).city, (row as PlatformPartnerResource).district, (row as PlatformPartnerResource).addressLine].filter(Boolean).join(' ') }}</span></div></template>
@@ -579,7 +500,7 @@ onMounted(() => {
<div class="detail-span"><dt>详细地址</dt><dd>{{ [detail.countryCode, detail.province, detail.city, detail.district, detail.addressLine].filter(Boolean).join(' ') }}</dd></div>
</dl></section>
<section><h3>其他信息</h3><dl class="detail-grid">
<div><dt>数据范围</dt><dd>{{ detail.dataScopeId }}</dd></div><div><dt>更新时间</dt><dd>{{ formatUpdatedAt(detail.updatedAt) }}</dd></div>
<div class="detail-span"><dt>更新时间</dt><dd>{{ formatUpdatedAt(detail.updatedAt) }}</dd></div>
<div class="detail-span"><dt>备注</dt><dd>{{ detail.remark || '-' }}</dd></div>
</dl></section>
</template>
@@ -622,8 +543,8 @@ onMounted(() => {
.partner-cell small, .partner-subline { display: block; color: var(--cc-muted); font-size: 11px; line-height: 1.45; overflow-wrap: anywhere; }
.partner-address { display: flex; align-items: flex-start; gap: 7px; line-height: 1.55; overflow-wrap: anywhere; }
.partner-address svg { flex: 0 0 15px; margin-top: 3px; color: var(--cc-muted); }
.partner-detail { min-height: 180px; }
.partner-detail section + section { margin-top: 24px; }
.partner-detail { min-height: 180px; padding: 20px 24px 28px; box-sizing: border-box; }
.partner-detail section + section { margin-top: 28px; }
.partner-detail h3 { margin: 0 0 12px; color: var(--cc-text); font-size: 15px; }
.detail-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 1px; margin: 0; overflow: hidden; border: 1px solid var(--cc-border); border-radius: 8px; background: var(--cc-border); }
.detail-grid > div { min-width: 0; padding: 12px 14px; background: #fff; }
@@ -644,6 +565,7 @@ onMounted(() => {
.partners-table-header { align-items: stretch; flex-direction: column; }
.partners-table-header .el-button { width: 100%; min-height: 40px; }
.partners-primary-actions { flex-direction: column; }
.partner-detail { padding: 16px; }
.detail-grid { grid-template-columns: minmax(0, 1fr); }
.detail-grid .detail-span { grid-column: auto; }
.import-result-heading { align-items: stretch; flex-direction: column; }
src/modules/master-data/express-companies/api/platformExpressCompanies.test.ts
+12 -12
View File
@@ -40,19 +40,19 @@ describe('platform express company API', () => {
.mockResolvedValueOnce({ code: '200', message: 'success', data: page })
.mockResolvedValueOnce({ code: '200', message: 'success', data: { id: '19001' } })
await expect(listPlatformExpressCompanies(10001, 2, 20, ' 顺丰 ', 'ACTIVE')).resolves.toEqual({
await expect(listPlatformExpressCompanies(2, 20, ' 顺丰 ', 'ACTIVE')).resolves.toEqual({
records: [],
page: 1,
size: 20,
total: 0,
pages: 0,
})
await expect(getPlatformExpressCompany(10001, '19001')).resolves.toEqual({ id: '19001' })
await expect(getPlatformExpressCompany('19001')).resolves.toEqual({ id: '19001' })
expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/express-companies', {
params: { tenantId: 10001, page: 2, size: 20, keyword: '顺丰', status: 'ACTIVE' },
params: { page: 2, size: 20, keyword: '顺丰', status: 'ACTIVE' },
})
expect(http.get).toHaveBeenNthCalledWith(2, '/platform/v1/express-companies/19001', {
params: { tenantId: 10001 },
params: { tenantId: 0 },
})
})
@@ -61,16 +61,16 @@ describe('platform express company API', () => {
vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: null })
vi.mocked(http.patch).mockResolvedValue({ code: '200', message: 'success', data: null })
await expect(createPlatformExpressCompany(10001, payload)).resolves.toBe('19001')
await expect(updatePlatformExpressCompany(10001, '19001', payload)).resolves.toBeNull()
await expect(changePlatformExpressCompanyStatus(10001, '19001', 'INACTIVE')).resolves.toBeNull()
await expect(createPlatformExpressCompany(payload)).resolves.toBe('19001')
await expect(updatePlatformExpressCompany('19001', payload)).resolves.toBeNull()
await expect(changePlatformExpressCompanyStatus('19001', 'INACTIVE')).resolves.toBeNull()
expect(http.post).toHaveBeenCalledWith('/platform/v1/express-companies', payload, { params: { tenantId: 10001 } })
expect(http.put).toHaveBeenCalledWith('/platform/v1/express-companies/19001', payload, { params: { tenantId: 10001 } })
expect(http.post).toHaveBeenCalledWith('/platform/v1/express-companies', payload, { params: { tenantId: 0 } })
expect(http.put).toHaveBeenCalledWith('/platform/v1/express-companies/19001', payload, { params: { tenantId: 0 } })
expect(http.patch).toHaveBeenCalledWith(
'/platform/v1/express-companies/19001/status',
{ status: 'INACTIVE' },
{ params: { tenantId: 10001 } },
{ params: { tenantId: 0 } },
)
})
@@ -89,12 +89,12 @@ describe('platform express company API', () => {
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
})
await expect(importPlatformExpressCompanies(10001, file)).resolves.toEqual(result)
await expect(importPlatformExpressCompanies(file)).resolves.toEqual(result)
expect(http.post).toHaveBeenCalledOnce()
const [path, body, config] = vi.mocked(http.post).mock.calls[0]!
expect(path).toBe('/platform/v1/express-companies/import')
expect(body).toBeInstanceOf(FormData)
expect((body as FormData).get('file')).toBe(file)
expect(config).toEqual({ params: { tenantId: 10001 } })
expect(config).toEqual({ params: { tenantId: 0 } })
})
})
src/modules/master-data/express-companies/api/platformExpressCompanies.ts
+9 -12
View File
@@ -49,9 +49,9 @@ export interface PlatformExpressCompanyImportResult {
}
const basePath = '/platform/v1/express-companies'
const platformResourceScope = 0
export async function listPlatformExpressCompanies(
tenantId: number | string | undefined,
page = 1,
size = 20,
keyword = '',
@@ -59,7 +59,6 @@ export async function listPlatformExpressCompanies(
) {
const response = await http.get<ApiEnvelope<PlatformExpressCompanyPage>, ApiEnvelope<PlatformExpressCompanyPage>>(basePath, {
params: {
tenantId,
page,
size,
keyword: keyword.trim() || undefined,
@@ -76,39 +75,37 @@ export async function listPlatformExpressCompanies(
}
}
export async function getPlatformExpressCompany(tenantId: number | string, id: number | string) {
export async function getPlatformExpressCompany(id: number | string) {
const response = await http.get<ApiEnvelope<PlatformExpressCompanyResource>, ApiEnvelope<PlatformExpressCompanyResource>>(
`${basePath}/${id}`,
{ params: { tenantId } },
{ params: { tenantId: platformResourceScope } },
)
return unwrapApiResponse(response)
}
export async function createPlatformExpressCompany(tenantId: number | string, payload: SavePlatformExpressCompanyRequest) {
export async function createPlatformExpressCompany(payload: SavePlatformExpressCompanyRequest) {
const response = await http.post<ApiEnvelope<number | string>, ApiEnvelope<number | string>>(basePath, payload, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
export async function updatePlatformExpressCompany(
tenantId: number | string,
id: number | string,
payload: SavePlatformExpressCompanyRequest,
) {
const response = await http.put<ApiEnvelope<null>, ApiEnvelope<null>>(`${basePath}/${id}`, payload, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
export async function changePlatformExpressCompanyStatus(
tenantId: number | string,
id: number | string,
status: PlatformExpressCompanyStatus,
) {
const response = await http.patch<ApiEnvelope<null>, ApiEnvelope<null>>(`${basePath}/${id}/status`, { status }, {
params: { tenantId },
params: { tenantId: platformResourceScope },
})
return unwrapApiResponse(response)
}
@@ -117,13 +114,13 @@ export async function downloadPlatformExpressCompanyImportTemplate() {
return http.get<Blob, Blob>(`${basePath}/import-template`, { responseType: 'blob' })
}
export async function importPlatformExpressCompanies(tenantId: number | string, file: File) {
export async function importPlatformExpressCompanies(file: File) {
const formData = new FormData()
formData.append('file', file)
const response = await http.post<ApiEnvelope<PlatformExpressCompanyImportResult>, ApiEnvelope<PlatformExpressCompanyImportResult>>(
`${basePath}/import`,
formData,
{ params: { tenantId } },
{ params: { tenantId: platformResourceScope } },
)
return unwrapApiResponse(response)
}
src/modules/master-data/express-companies/pages/ExpressCompaniesView.test.ts
+10 -29
View File
@@ -5,8 +5,6 @@ import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vites
import { listPlatformExpressCompanies, type PlatformExpressCompanyResource } from '@/modules/master-data/express-companies/api/platformExpressCompanies'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useAuthStore } from '@/core/auth/auth'
import QueryToolbar from '@/shared/components/QueryToolbar.vue'
import { listPlatformTenants, type PlatformTenantResource } from '../../../iam/api/platformIam'
import ExpressCompaniesView from './ExpressCompaniesView.vue'
vi.mock('@/modules/master-data/express-companies/api/platformExpressCompanies', () => ({
@@ -16,8 +14,6 @@ vi.mock('@/modules/master-data/express-companies/api/platformExpressCompanies',
changePlatformExpressCompanyStatus: vi.fn(),
}))
vi.mock('../../../iam/api/platformIam', () => ({ listPlatformTenants: vi.fn() }))
class ResizeObserverStub implements ResizeObserver {
observe() {}
unobserve() {}
@@ -38,7 +34,7 @@ function createMemoryStorage(): Storage {
const company: PlatformExpressCompanyResource = {
id: '19001',
tenantId: 10001,
tenantId: 0,
companyCode: 'SF',
companyName: '顺丰速运',
servicePhone: '95338',
@@ -49,16 +45,6 @@ const company: PlatformExpressCompanyResource = {
updatedAt: '2026-07-31T10:20:00',
}
const tenant = (id: number | string, tenantName: string): PlatformTenantResource => ({
id, tenantCode: String(id), tenantName, status: 'ACTIVE', legalName: tenantName,
legalRepresentative: null, unifiedSocialCreditCode: null, contactName: null,
contactPhone: null, contactEmail: null, servicePackage: null, contactWechat: null,
salesOwnerName: null, paymentTermDays: null, enterpriseType: null, establishedDate: null,
registeredCapital: null, registeredCapitalCurrency: null, registeredAddress: null,
internalRemark: null, createdAt: null, approvedAt: null,
})
const snowflakeTenantId = '9223372036854775806'
async function mountView() {
vi.stubGlobal('localStorage', createMemoryStorage())
vi.stubGlobal('sessionStorage', createMemoryStorage())
@@ -83,9 +69,6 @@ describe('ExpressCompaniesView query and table migration', () => {
beforeEach(() => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
document.body.innerHTML = ''
vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({
records: [tenant(10001, '默认企业'), tenant(snowflakeTenantId, '雪花企业')], page: 1, size: 200, total: 2, pages: 1,
})
vi.mocked(listPlatformExpressCompanies).mockReset().mockResolvedValue({
records: [company], page: 1, size: 20, total: 1, pages: 1,
})
@@ -95,12 +78,12 @@ describe('ExpressCompaniesView query and table migration', () => {
const wrapper = await mountView()
expect(wrapper.find('.query-toolbar').exists()).toBe(true)
expect(wrapper.find('input[aria-label="所属企业"]').exists()).toBe(true)
expect(wrapper.find('input[aria-label="所属企业"]').exists()).toBe(false)
expect(wrapper.find('.data-table').exists()).toBe(true)
expect(wrapper.text()).toContain('顺丰速运')
expect(wrapper.text()).toContain('全部企业 · 共 1 家快递公司')
expect(wrapper.text()).toContain('平台公共数据 · 共 1 家快递公司')
expect(wrapper.find('.metric-strip').exists()).toBe(false)
expect(listPlatformExpressCompanies).toHaveBeenCalledWith(undefined, 1, 20, '', '')
expect(listPlatformExpressCompanies).toHaveBeenCalledWith(1, 20, '', '')
})
it('does not request with edited filters until search is submitted', async () => {
@@ -113,18 +96,16 @@ describe('ExpressCompaniesView query and table migration', () => {
await searchButton?.trigger('click')
await flushPromises()
expect(listPlatformExpressCompanies).toHaveBeenLastCalledWith(undefined, 1, 20, '顺丰', '')
expect(listPlatformExpressCompanies).toHaveBeenLastCalledWith(1, 20, '顺丰', '')
})
it('preserves a snowflake tenant id as a string when switching enterprises', async () => {
it('opens the create form without selecting an enterprise', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
const model = { tenantId: snowflakeTenantId, keyword: '', status: '' }
toolbar.vm.$emit('update:modelValue', model)
toolbar.vm.$emit('search', model)
const createButton = wrapper.findAll('button').find((button) => button.text().trim() === '新增快递公司')
await createButton?.trigger('click')
await flushPromises()
expect(listPlatformExpressCompanies).toHaveBeenLastCalledWith(snowflakeTenantId, 1, 20, '', '')
expect(document.body.textContent).toContain('新增快递公司')
expect(document.body.textContent).not.toContain('请先在筛选条件中选择所属企业')
})
})
src/modules/master-data/express-companies/pages/ExpressCompaniesView.vue
+7 -86
View File
@@ -21,7 +21,6 @@ import {
type SavePlatformExpressCompanyRequest,
} from '@/modules/master-data/express-companies/api/platformExpressCompanies'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
const access = useAccessPreviewStore()
const loading = ref(false)
@@ -34,9 +33,6 @@ const rows = ref<PlatformExpressCompanyResource[]>([])
const page = ref(1)
const pageSize = ref(20)
const total = ref(0)
const tenants = ref<PlatformTenantResource[]>([])
const tenantLoadError = ref<ApiErrorDetails | null>(null)
const editorTenantId = ref('')
const loadError = ref<ApiErrorDetails | null>(null)
const statusLoadingIds = ref(new Set<string>())
const editLoadingIds = ref(new Set<string>())
@@ -46,21 +42,12 @@ const importFile = ref<File | null>(null)
const importResult = ref<PlatformExpressCompanyImportResult | null>(null)
const importError = ref<ApiErrorDetails | null>(null)
type ExpressCompanyFilters = QueryModel & {
tenantId: string
keyword: string
status: PlatformExpressCompanyStatus | ''
}
const filters = ref<ExpressCompanyFilters>({ tenantId: '', keyword: '', status: '' })
const filters = ref<ExpressCompanyFilters>({ keyword: '', status: '' })
const appliedFilters = ref<ExpressCompanyFilters>({ ...filters.value })
const queryFields = computed<QueryField[]>(() => [
{
key: 'tenantId',
type: 'select',
width: 180,
placeholder: tenantLoadError.value ? '企业列表加载失败' : '全部企业',
props: { 'aria-label': '所属企业', filterable: true, disabled: Boolean(tenantLoadError.value) },
options: tenants.value.map((tenant) => ({ value: String(tenant.id), label: `${tenant.tenantName}（${tenant.tenantCode || tenant.id}）` })),
},
{ key: 'keyword', type: 'input', placeholder: '快递公司名称或编码', props: { maxlength: 128, 'aria-label': '快递公司关键词' } },
{
key: 'status',
@@ -103,13 +90,6 @@ const { captureBaseline } = useUnsavedWorkRegistration({
requiredPermission: editorPermission,
})
const selectedEnterpriseId = computed(() => appliedFilters.value.tenantId)
const targetEnterpriseId = computed(() => filters.value.tenantId)
const selectedEnterpriseName = computed(() => {
if (!selectedEnterpriseId.value) return '全部企业'
return tenants.value.find((tenant) => String(tenant.id) === selectedEnterpriseId.value)?.tenantName || `企业 ${selectedEnterpriseId.value}`
})
watch(
() => access.can(editorPermission.value),
(canWrite) => {
@@ -142,7 +122,6 @@ function formatUpdatedAt(value?: string | null) {
const expressCompanyColumns: DataTableColumn[] = [
{ key: 'actions', label: '操作', width: 170, fixed: 'left', slotName: 'actions' },
{ key: 'company', label: '快递公司', minWidth: 210, slotName: 'company' },
{ key: 'tenant', label: '所属企业', minWidth: 190, showOverflowTooltip: true, slotName: 'tenant' },
{ prop: 'servicePhone', label: '客服电话', minWidth: 130, formatter: (row: PlatformExpressCompanyResource) => row.servicePhone || '—' },
{ key: 'website', label: '官方网站', minWidth: 210, slotName: 'website' },
{ key: 'trackingUrlTemplate', label: '轨迹查询模板', minWidth: 260, slotName: 'trackingUrlTemplate' },
@@ -151,50 +130,12 @@ const expressCompanyColumns: DataTableColumn[] = [
{ key: 'status', label: '状态', width: 100, slotName: 'status' },
]
function apiTenantId(value: string | undefined) {
if (!value) return undefined
const numeric = Number(value)
return Number.isSafeInteger(numeric) ? numeric : value
}
function requireSelectedEnterprise(action: string) {
if (!targetEnterpriseId.value) {
ElMessage.warning(`请先在筛选条件中选择所属企业，再${action}`)
return null
}
return apiTenantId(targetEnterpriseId.value)!
}
function tenantName(tenantId: number | string) {
return tenants.value.find((tenant) => String(tenant.id) === String(tenantId))?.tenantName || `企业 ${tenantId}`
}
async function loadTenants() {
tenantLoadError.value = null
try {
const records: PlatformTenantResource[] = []
let currentPage = 1
let pages = 1
do {
const result = await listPlatformTenants({ page: currentPage, size: 200 })
records.push(...result.records)
pages = Math.max(1, result.pages)
currentPage += 1
} while (currentPage <= pages)
tenants.value = records
} catch (error) {
tenants.value = []
tenantLoadError.value = getApiErrorDetails(error, '企业列表加载失败，暂时无法按所属企业筛选')
}
}
async function loadExpressCompanies() {
const sequence = ++loadSequence
loading.value = true
loadError.value = null
try {
const result = await listPlatformExpressCompanies(
apiTenantId(appliedFilters.value.tenantId),
page.value,
pageSize.value,
appliedFilters.value.keyword,
@@ -215,7 +156,6 @@ async function loadExpressCompanies() {
function applyFilters(model: QueryModel) {
appliedFilters.value = {
tenantId: String(model.tenantId || ''),
keyword: String(model.keyword || ''),
status: (model.status || '') as PlatformExpressCompanyStatus | '',
}
@@ -227,9 +167,6 @@ function applyFilters(model: QueryModel) {
}
function openCreate() {
const tenantId = requireSelectedEnterprise('新增快递公司')
if (!tenantId) return
editorTenantId.value = String(tenantId)
Object.assign(form, emptyForm())
captureBaseline()
editorOpen.value = true
@@ -253,14 +190,12 @@ function assignEditor(row: PlatformExpressCompanyResource) {
}
async function openEdit(row: PlatformExpressCompanyResource) {
const tenantId = apiTenantId(String(row.tenantId))!
editorTenantId.value = String(row.tenantId)
const id = String(row.id)
const pending = new Set(editLoadingIds.value)
pending.add(id)
editLoadingIds.value = pending
try {
assignEditor(await getPlatformExpressCompany(tenantId, row.id))
assignEditor(await getPlatformExpressCompany(row.id))
} catch (error) {
const details = getApiErrorDetails(error, '快递公司详情加载失败，请稍后重试')
ElMessage.error(details.requestId ? `${details.message}（requestId: ${details.requestId}）` : details.message)
@@ -272,7 +207,6 @@ async function openEdit(row: PlatformExpressCompanyResource) {
}
function openImport() {
if (!requireSelectedEnterprise('批量导入')) return
importFile.value = null
importResult.value = null
importError.value = null
@@ -326,8 +260,6 @@ function selectImportFile(event: Event) {
}
async function submitImport() {
const tenantId = requireSelectedEnterprise('批量导入')
if (!tenantId) return
if (!importFile.value) {
ElMessage.warning('请先选择填写完成的 XLSX 文件')
return
@@ -336,7 +268,7 @@ async function submitImport() {
importError.value = null
importResult.value = null
try {
const result = await importPlatformExpressCompanies(tenantId, importFile.value)
const result = await importPlatformExpressCompanies(importFile.value)
importResult.value = result
if (result.success) {
ElMessage.success(`成功导入 ${result.importedRows} 家快递公司`)
@@ -374,15 +306,13 @@ function buildPayload(): SavePlatformExpressCompanyRequest {
}
async function saveExpressCompany() {
const tenantId = form.id ? apiTenantId(editorTenantId.value) : requireSelectedEnterprise('新增快递公司')
if (!tenantId) return
const valid = await formRef.value?.validate().catch(() => false)
if (!valid) return
saving.value = true
try {
const payload = buildPayload()
if (form.id) await updatePlatformExpressCompany(tenantId, form.id, payload)
else await createPlatformExpressCompany(tenantId, payload)
if (form.id) await updatePlatformExpressCompany(form.id, payload)
else await createPlatformExpressCompany(payload)
editorOpen.value = false
ElMessage.success(form.id ? '快递公司资料已更新' : '快递公司已创建')
await loadExpressCompanies()
@@ -395,7 +325,6 @@ async function saveExpressCompany() {
}
async function toggleStatus(row: PlatformExpressCompanyResource) {
const tenantId = apiTenantId(String(row.tenantId))!
const nextStatus: PlatformExpressCompanyStatus = row.status === 'ACTIVE' ? 'INACTIVE' : 'ACTIVE'
const action = nextStatus === 'ACTIVE' ? '启用' : '停用'
try {
@@ -412,7 +341,7 @@ async function toggleStatus(row: PlatformExpressCompanyResource) {
pending.add(id)
statusLoadingIds.value = pending
try {
await changePlatformExpressCompanyStatus(tenantId, row.id, nextStatus)
await changePlatformExpressCompanyStatus(row.id, nextStatus)
ElMessage.success(`已${action}${row.companyName}`)
await loadExpressCompanies()
} catch (error) {
@@ -427,19 +356,12 @@ async function toggleStatus(row: PlatformExpressCompanyResource) {
watch([page, pageSize], () => { void loadExpressCompanies() })
onMounted(() => {
void loadTenants()
void loadExpressCompanies()
})
</script>
<template>
<div class="business-page express-company-page">
<el-alert v-if="tenantLoadError" type="warning" :closable="false" show-icon class="state-alert">
<template #title>所属企业列表加载失败</template>
<p>{{ tenantLoadError.message }}；快递公司仍按全部企业展示。</p>
<ApiErrorMeta :details="tenantLoadError" />
<el-button size="small" @click="loadTenants">重新加载企业列表</el-button>
</el-alert>
<el-alert v-if="loadError" type="error" :closable="false" show-icon class="state-alert">
<template #title>快递公司加载失败</template>
<p>{{ loadError.message }}</p>
@@ -453,7 +375,7 @@ onMounted(() => {
<div class="panel-heading">
<div>
<h2>快递公司列表</h2>
<p>{{ selectedEnterpriseName }} · 共 {{ total }} 家快递公司</p>
<p>平台公共数据 · 共 {{ total }} 家快递公司</p>
</div>
<div class="panel-actions">
<el-button v-if="access.can('platform:express:import')" :disabled="loading" @click="openImport"><Upload :size="16" />批量导入</el-button>
@@ -494,7 +416,6 @@ onMounted(() => {
<span v-else class="muted-value">仅查看</span>
</template>
<template #company="{ row }"><div class="express-company-cell"><span><Truck :size="17" /></span><div><strong>{{ (row as PlatformExpressCompanyResource).companyName }}</strong><small>{{ (row as PlatformExpressCompanyResource).companyCode }}</small></div></div></template>
<template #tenant="{ row }"><span>{{ tenantName((row as PlatformExpressCompanyResource).tenantId) }}</span></template>
<template #website="{ row }">
<a v-if="safeHttpUrl((row as PlatformExpressCompanyResource).website)" class="external-link" :href="safeHttpUrl((row as PlatformExpressCompanyResource).website)!" target="_blank" rel="noopener noreferrer">访问官网<ExternalLink :size="13" /></a>
<span v-else class="muted-value">{{ (row as PlatformExpressCompanyResource).website || '—' }}</span>
src/modules/warehouse-resources/locations/pages/LocationsView.test.ts
+58 -9
View File
@@ -5,16 +5,17 @@ import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vites
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useAuthStore } from '@/core/auth/auth'
import {
createPlatformLocation,
getPlatformLocation,
listPlatformLocations,
type PlatformLocationResource,
} from '../api/platformLocations'
import { listPlatformWarehouses, type PlatformWarehouseResource } from '../../../warehouses/api/platformWarehouses'
import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '../../../warehouses/api/platformWarehouses'
import QueryToolbar, { type QueryField, type QueryModel } from '@/shared/components/QueryToolbar.vue'
import DataTable from '@/shared/components/DataTable.vue'
import LocationsView from './LocationsView.vue'
vi.mock('../../../warehouses/api/platformWarehouses', () => ({ listPlatformWarehouses: vi.fn() }))
vi.mock('../../../warehouses/api/platformWarehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
vi.mock('../api/platformLocations', () => ({
listPlatformLocations: vi.fn(),
getPlatformLocation: vi.fn(),
@@ -59,6 +60,22 @@ const warehouse: PlatformWarehouseResource = {
remark: null,
}
const fbaWarehouse: PlatformWarehouseResource = {
...warehouse,
id: '9223372036854775802',
warehouseCode: 'FBA-ONT8',
warehouseName: 'ONT8 FBA 仓',
warehouseType: 'FBA',
}
const overseasWarehouse: PlatformWarehouseResource = {
...warehouse,
id: '9223372036854775801',
warehouseCode: 'US-LAX-01',
warehouseName: '洛杉矶海外仓',
warehouseType: 'OVERSEAS',
}
const availableLocation: PlatformLocationResource = {
id: '9223372036854775804',
tenantId,
@@ -124,29 +141,33 @@ describe('LocationsView', () => {
beforeEach(() => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
document.body.innerHTML = ''
vi.mocked(listPlatformWarehouses).mockReset().mockResolvedValue({
records: [warehouse], page: 1, size: 200, total: 1, pages: 1,
})
vi.mocked(listAllPlatformWarehouses).mockReset().mockResolvedValue([warehouse, fbaWarehouse, overseasWarehouse])
vi.mocked(listPlatformLocations).mockReset().mockResolvedValue({
records: [availableLocation, occupiedLocation], page: 1, size: 20, total: 2, pages: 1,
})
vi.mocked(getPlatformLocation).mockReset().mockResolvedValue({
location: availableLocation, warehouseCode: warehouse.warehouseCode, warehouseName: warehouse.warehouseName,
})
vi.mocked(createPlatformLocation).mockReset()
})
it('loads all warehouses and queries the full location list without requiring a customer or warehouse', async () => {
it('loads all warehouse candidates for querying while restricting write scope to domestic warehouses', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
const fields = toolbar.props('fields') as QueryField[]
expect(wrapper.find('[aria-label="所属企业"]').exists()).toBe(false)
expect(fields[0]?.placeholder).toBe('全部仓库')
expect(fields[0]?.options).toEqual([
{ value: warehouseId, label: '义乌收货仓（CN-YW-01）' },
{ value: fbaWarehouse.id, label: 'ONT8 FBA 仓（FBA-ONT8）' },
{ value: overseasWarehouse.id, label: '洛杉矶海外仓（US-LAX-01）' },
])
expect(fields.map(({ key, width }) => [key, width])).toEqual([
['warehouseId', 300], ['zoneCode', 210],
['locationCode', 220], ['locationType', 170], ['status', 160],
])
expect(listPlatformWarehouses).toHaveBeenCalledWith(1, 200)
expect(listAllPlatformWarehouses).toHaveBeenCalledWith()
expect(listPlatformLocations).toHaveBeenCalledWith({
page: 1,
size: 20,
@@ -175,7 +196,7 @@ describe('LocationsView', () => {
expect(panelHeading.text()).toContain('共 2 个库位')
expect(panelHeading.text()).toContain('新增库位')
expect(wrapper.findComponent(QueryToolbar).text()).not.toContain('新增库位')
expect(listPlatformWarehouses).toHaveBeenCalledWith(1, 200)
expect(listAllPlatformWarehouses).toHaveBeenCalledWith()
expect(listPlatformLocations).toHaveBeenLastCalledWith({
page: 1,
size: 20,
@@ -202,7 +223,23 @@ describe('LocationsView', () => {
expect(document.body.textContent).toContain('新增库位')
expect(document.body.textContent).toContain('所属仓库')
expect(document.body.textContent).toContain('请选择所属仓库')
expect(document.body.textContent).toContain('请选择国内仓')
})
it('does not use an FBA warehouse filter as the creation scope', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
toolbar.vm.$emit('update:modelValue', { ...(toolbar.props('modelValue') as QueryModel), warehouseId: fbaWarehouse.id })
await flushPromises()
const createButton = wrapper.find('.table-panel .panel-heading').findAll('button').find((button) => button.text().trim() === '新增库位')
await createButton!.trigger('click')
await flushPromises()
const saveButton = [...document.body.querySelectorAll('button')].find((button) => button.textContent?.trim() === '保存库位')
saveButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }))
await flushPromises()
expect(createPlatformLocation).not.toHaveBeenCalled()
})
it('keeps the operation column first and hides edit actions for occupied resources', async () => {
@@ -218,6 +255,18 @@ describe('LocationsView', () => {
expect(bodyRows[1]?.text()).not.toContain('更多')
})
it('does not offer editing for a location outside a domestic warehouse', async () => {
vi.mocked(listPlatformLocations).mockResolvedValue({
records: [{ ...availableLocation, warehouseId: fbaWarehouse.id }, availableLocation], page: 1, size: 20, total: 2, pages: 1,
})
const wrapper = await mountView()
const bodyRows = wrapper.findAll('tbody tr')
expect(bodyRows[0]?.text()).toContain('详情')
expect(bodyRows[0]?.text()).not.toContain('编辑')
expect(bodyRows[1]?.text()).toContain('编辑')
})
it('opens an authenticated detail view with warehouse context', async () => {
const wrapper = await mountView()
const detailButton = wrapper.find('.el-table__body-wrapper tbody tr button')
src/modules/warehouse-resources/locations/pages/LocationsView.vue
+36 -10
View File
@@ -23,7 +23,7 @@ import {
type PlatformLocationType,
type SavePlatformLocationRequest,
} from '../api/platformLocations'
import { listPlatformWarehouses, type PlatformWarehouseResource } from '../../../warehouses/api/platformWarehouses'
import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '../../../warehouses/api/platformWarehouses'
type DrawerMode = 'view' | 'create' | 'edit'
type LocationFilters = QueryModel & {
@@ -119,7 +119,7 @@ const emptyForm = () => ({
})
const form = reactive(emptyForm())
const rules: FormRules<typeof form> = {
warehouseId: [{ required: true, message: '请选择所属仓库', trigger: 'change' }],
warehouseId: [{ required: true, message: '请选择国内仓', trigger: 'change' }],
zoneCode: [{ required: true, message: '请输入库区编码', trigger: 'blur' }],
zoneName: [{ required: true, message: '请输入库区名称', trigger: 'blur' }],
locationCode: [
@@ -137,6 +137,9 @@ const rules: FormRules<typeof form> = {
}
const selectedWarehouse = computed(() => warehouses.value.find((item) => String(item.id) === form.warehouseId) ?? null)
const domesticWarehouses = computed(() => warehouses.value.filter((warehouse) => (
warehouse.warehouseType === 'DOMESTIC' && warehouse.status === 'ACTIVE'
)))
const editorOpen = computed(() => drawerOpen.value && drawerMode.value !== 'view')
const editorTitle = computed(() => drawerMode.value === 'create' ? '新增库位' : '编辑库位')
const drawerTitle = computed(() => drawerMode.value === 'view' ? '库位详情' : editorTitle.value)
@@ -197,6 +200,7 @@ function formatWeight(value: number | string | null) {
function canEdit(row: PlatformLocationResource) {
return access.can('platform:location:edit')
&& isDomesticWarehouse(row.warehouseId)
&& !row.sharedOverflow
&& (row.status === 'AVAILABLE' || row.status === 'DISABLED')
}
@@ -216,9 +220,20 @@ function actionError(error: unknown, fallback: string) {
ElMessage.error(details.requestId ? `${details.message}（requestId: ${details.requestId}）` : details.message)
}
function isDomesticWarehouse(warehouseId: number | string) {
return warehouses.value.some((warehouse) => (
String(warehouse.id) === String(warehouseId)
&& warehouse.warehouseType === 'DOMESTIC'
))
}
function isActiveDomesticWarehouse(warehouseId: number | string) {
return domesticWarehouses.value.some((warehouse) => String(warehouse.id) === String(warehouseId))
}
function requireCreateScope() {
if (!selectedWarehouse.value || !form.warehouseId) {
ElMessage.warning('请选择所属仓库')
ElMessage.warning('请选择国内仓')
return null
}
return { customerId: apiId(String(selectedWarehouse.value.tenantId)), warehouseId: apiId(form.warehouseId) }
@@ -234,9 +249,9 @@ async function loadWarehouses() {
warehouseError.value = null
warehouses.value = []
try {
const result = await listPlatformWarehouses(1, 200)
const records = await listAllPlatformWarehouses()
if (sequence !== warehouseLoadSequence) return
warehouses.value = result.records
warehouses.value = records
} catch (error) {
if (sequence !== warehouseLoadSequence) return
warehouseError.value = getApiErrorDetails(error, '仓库列表加载失败，请稍后重试')
@@ -304,7 +319,7 @@ function assignForm(resource: PlatformLocationResource) {
function openCreate() {
Object.assign(form, emptyForm())
form.warehouseId = selectedWarehouseId.value
form.warehouseId = isActiveDomesticWarehouse(selectedWarehouseId.value) ? selectedWarehouseId.value : ''
form.customerId = selectedWarehouse.value ? String(selectedWarehouse.value.tenantId) : ''
form.status = selectedWarehouse.value?.status === 'INACTIVE' ? 'DISABLED' : 'AVAILABLE'
detail.value = null
@@ -316,6 +331,10 @@ function openCreate() {
}
async function loadDetail(row: PlatformLocationResource, mode: 'view' | 'edit') {
if (mode === 'edit' && !isDomesticWarehouse(row.warehouseId)) {
ElMessage.warning('仅支持编辑国内仓库位')
return
}
const scope = recordScope(row)
drawerMode.value = mode
drawerOpen.value = true
@@ -355,6 +374,13 @@ function buildPayload(): SavePlatformLocationRequest {
async function saveLocation() {
const valid = await formRef.value?.validate().catch(() => false)
if (!valid) return
const warehouseAllowed = form.id
? isDomesticWarehouse(form.warehouseId)
: isActiveDomesticWarehouse(form.warehouseId)
if (!warehouseAllowed) {
ElMessage.error(form.id ? '库位仅支持归属国内仓' : '新增库位仅支持选择启用的国内仓')
return
}
const scope = form.id
? { customerId: apiId(form.customerId), warehouseId: apiId(form.warehouseId) }
: requireCreateScope()
@@ -479,8 +505,8 @@ onMounted(() => {
<ApiErrorMeta :details="warehouseError" />
<el-button size="small" @click="loadWarehouses()">重新加载仓库</el-button>
</el-alert>
<el-alert v-else-if="!warehouseLoading && warehouses.length === 0" type="info" :closable="false" show-icon title="暂无可选仓库">
请先在仓库管理中建立仓库，再维护库位。
<el-alert v-else-if="!warehouseLoading && domesticWarehouses.length === 0" type="info" :closable="false" show-icon title="暂无可选国内仓">
请先在仓库管理中建立国内仓，再维护库位。
</el-alert>
<el-alert v-if="loadError" type="error" :closable="false" show-icon class="state-alert">
<template #title>库位列表加载失败</template>
@@ -650,9 +676,9 @@ onMounted(() => {
<div><strong>{{ detail?.warehouseName || selectedWarehouse?.warehouseName }}（{{ detail?.warehouseCode || selectedWarehouse?.warehouseCode }}）</strong><span>平台公共资源 · 保存后不可跨仓移动</span></div>
</div>
<el-form-item v-if="drawerMode === 'create'" label="所属仓库" prop="warehouseId" required>
<el-select v-model="form.warehouseId" filterable placeholder="请选择所属仓库" :loading="warehouseLoading">
<el-select v-model="form.warehouseId" filterable placeholder="请选择国内仓" :loading="warehouseLoading">
<el-option
v-for="warehouse in warehouses"
v-for="warehouse in domesticWarehouses"
:key="String(warehouse.id)"
:label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`"
:value="String(warehouse.id)"
src/modules/warehouse-resources/pallets/api/platformPallets.test.ts
+2 -1
View File
@@ -16,9 +16,10 @@ vi.mock('@/shared/api/http', () => ({
const payload: SavePlatformPalletRequest = {
warehouseId: '19001',
palletCode: ' TP-001 ',
palletType: '木托盘',
capacityCbm: 1.2,
weightKg: 8,
color: '黄色',
remark: null,
}
src/modules/warehouse-resources/pallets/api/platformPallets.ts
+4 -1
View File
@@ -7,6 +7,8 @@ export interface PlatformPalletResource {
palletCode: string
palletType: string
capacityCbm: number | string
weightKg: number | string | null
color: string | null
remark: string | null
createdAt: string | null
updatedAt: string | null
@@ -31,9 +33,10 @@ export interface PlatformPalletQuery {
export interface SavePlatformPalletRequest {
warehouseId: number | string
palletCode: string
palletType: string
capacityCbm: number
weightKg: number
color: string | null
remark: string | null
}
src/modules/warehouse-resources/pallets/pages/PalletsView.test.ts
+54 -16
View File
@@ -4,7 +4,7 @@ import { enableAutoUnmount, flushPromises, mount, type VueWrapper } from '@vue/t
import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useAuthStore } from '@/core/auth/auth'
import { listPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
import DataTable from '@/shared/components/DataTable.vue'
import QueryToolbar from '@/shared/components/QueryToolbar.vue'
import {
@@ -15,7 +15,7 @@ import {
} from '../api/platformPallets'
import PalletsView from './PalletsView.vue'
vi.mock('@/modules/warehouses', () => ({ listPlatformWarehouses: vi.fn() }))
vi.mock('@/modules/warehouses', () => ({ listAllPlatformWarehouses: vi.fn() }))
vi.mock('../api/platformPallets', () => ({
listPlatformPallets: vi.fn(),
getPlatformPallet: vi.fn(),
@@ -48,9 +48,25 @@ const warehouse: PlatformWarehouseResource = {
contactPhone: null, contactEmail: null, status: 'ACTIVE', remark: null,
}
const fbaWarehouse: PlatformWarehouseResource = {
...warehouse,
id: '19002',
warehouseCode: 'FBA-ONT8',
warehouseName: 'ONT8 FBA 仓',
warehouseType: 'FBA',
}
const overseasWarehouse: PlatformWarehouseResource = {
...warehouse,
id: '19003',
warehouseCode: 'US-LAX-01',
warehouseName: '洛杉矶海外仓',
warehouseType: 'OVERSEAS',
}
const pallet: PlatformPalletResource = {
id: '20001', tenantId: 0, warehouseId: '19001', palletCode: 'TP-001', palletType: '木托盘',
capacityCbm: '1.200000', remark: '标准川字托盘', createdAt: '2026-08-04T09:00:00', updatedAt: '2026-08-04T10:00:00',
capacityCbm: '1.200000', weightKg: '8.000', color: '黄色', remark: '标准川字托盘', createdAt: '2026-08-04T09:00:00', updatedAt: '2026-08-04T10:00:00',
}
async function mountView(permissions = [
@@ -95,13 +111,13 @@ describe('PalletsView', () => {
beforeEach(() => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
document.body.innerHTML = ''
vi.mocked(listPlatformWarehouses).mockReset().mockResolvedValue({ records: [warehouse], page: 1, size: 200, total: 1, pages: 1 })
vi.mocked(listAllPlatformWarehouses).mockReset().mockResolvedValue([warehouse, fbaWarehouse, overseasWarehouse])
vi.mocked(listPlatformPallets).mockReset().mockResolvedValue({ records: [pallet], page: 1, size: 20, total: 1, pages: 1 })
vi.mocked(getPlatformPallet).mockReset().mockResolvedValue(pallet)
vi.mocked(createPlatformPallet).mockReset().mockResolvedValue('20002')
})
it('starts with all customers and all warehouses using compact filters', async () => {
it('starts with all warehouse candidates for querying using compact filters', async () => {
const wrapper = await mountView()
const toolbar = wrapper.findComponent(QueryToolbar)
const fields = toolbar.props('fields')
@@ -114,7 +130,12 @@ describe('PalletsView', () => {
])
expect(wrapper.find('.pallet-filter-toolbar').exists()).toBe(true)
expect(fields.find((field) => field.key === 'warehouseId')?.placeholder).toBe('全部仓库')
expect(listPlatformWarehouses).toHaveBeenCalledWith(1, 200)
expect(fields.find((field) => field.key === 'warehouseId')?.options).toEqual([
{ label: '义乌收货仓（CN-YW-01）', value: '19001' },
{ label: 'ONT8 FBA 仓（FBA-ONT8）', value: '19002' },
{ label: '洛杉矶海外仓（US-LAX-01）', value: '19003' },
])
expect(listAllPlatformWarehouses).toHaveBeenCalledWith()
expect(listPlatformPallets).toHaveBeenCalledWith({
page: 1, size: 20,
})
@@ -124,8 +145,8 @@ describe('PalletsView', () => {
const wrapper = await mountView()
await loadRows(wrapper)
expect(listPlatformWarehouses).toHaveBeenCalledTimes(1)
expect(listPlatformWarehouses).toHaveBeenCalledWith(1, 200)
expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
expect(listAllPlatformWarehouses).toHaveBeenCalledWith()
expect(listPlatformPallets).toHaveBeenCalledWith({
page: 1, size: 20,
})
@@ -179,8 +200,24 @@ describe('PalletsView', () => {
const wrapper = await mountView()
const warehouseField = wrapper.findComponent(QueryToolbar).props('fields').find((field) => field.key === 'warehouseId')
expect(listPlatformWarehouses).toHaveBeenCalledTimes(1)
expect(warehouseField?.options).toEqual([{ label: '义乌收货仓（CN-YW-01）', value: '19001' }])
expect(listAllPlatformWarehouses).toHaveBeenCalledTimes(1)
expect(warehouseField?.options).toEqual([
{ label: '义乌收货仓（CN-YW-01）', value: '19001' },
{ label: 'ONT8 FBA 仓（FBA-ONT8）', value: '19002' },
{ label: '洛杉矶海外仓（US-LAX-01）', value: '19003' },
])
})
it('does not offer editing for a pallet outside a domestic warehouse', async () => {
vi.mocked(listPlatformPallets).mockResolvedValue({
records: [{ ...pallet, id: '20002', warehouseId: fbaWarehouse.id }, pallet], page: 1, size: 20, total: 2, pages: 1,
})
const wrapper = await mountView()
const bodyRows = wrapper.findAll('.el-table__body-wrapper tbody tr')
expect(bodyRows[0]?.text()).toContain('查看')
expect(bodyRows[0]?.text()).not.toContain('编辑')
expect(bodyRows[1]?.text()).toContain('编辑')
})
it('applies pallet filters only after search', async () => {
@@ -206,18 +243,19 @@ describe('PalletsView', () => {
await createButton?.trigger('click')
await flushPromises()
await wrapper.find('input[placeholder="例如 TP-001"]').setValue('TP-002')
const palletTypeItem = wrapper.findAll('.el-form-item').find((item) => item.text().includes('托盘类型'))
palletTypeItem?.findComponent({ name: 'ElSelect' }).vm.$emit('update:modelValue', '塑料托盘')
const capacity = wrapper.findComponent({ name: 'ElInputNumber' })
capacity.vm.$emit('update:modelValue', 1.5)
await wrapper.find('textarea[placeholder="可填写规格、材质或现场识别说明"]').setValue('蓝色标准托盘')
const inputNumbers = wrapper.findAllComponents({ name: 'ElInputNumber' })
inputNumbers[0]?.vm.$emit('update:modelValue', 1.5)
inputNumbers[1]?.vm.$emit('update:modelValue', 10)
await wrapper.find('input[placeholder="例如 黄色"]').setValue('黑色')
await wrapper.find('textarea[placeholder="可填写其他说明"]').setValue('标准托盘')
const saveButton = wrapper.findAll('button').find((button) => button.text().trim() === '保存托盘')
await saveButton?.trigger('click')
await flushPromises()
expect(createPlatformPallet).toHaveBeenCalledWith(0, {
warehouseId: 19001, palletCode: 'TP-002', palletType: '塑料托盘', capacityCbm: 1.5, remark: '蓝色标准托盘',
warehouseId: 19001, palletType: '塑料托盘', capacityCbm: 1.5, weightKg: 10, color: '黑色', remark: '标准托盘',
})
})
@@ -264,7 +302,7 @@ describe('PalletsView', () => {
expect(wrapper.text()).not.toContain('客户列表暂时无法加载')
expect(wrapper.text()).not.toContain('所属企业')
expect(listPlatformWarehouses).toHaveBeenCalledWith(1, 200)
expect(listAllPlatformWarehouses).toHaveBeenCalledWith()
expect(listPlatformPallets).toHaveBeenCalledWith({
page: 1, size: 20,
})
src/modules/warehouse-resources/pallets/pages/PalletsView.vue
+71 -27
View File
@@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox, type FormInstance, type FormRules } from 'elem
import { Boxes, Eye, Pencil, Plus, Trash2, Warehouse as WarehouseIcon } from '@lucide/vue'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
import { listPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
import { listAllPlatformWarehouses, type PlatformWarehouseResource } from '@/modules/warehouses'
import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
import LoadErrorState from '@/shared/components/LoadErrorState.vue'
@@ -71,14 +71,10 @@ const queryFields = computed<QueryField[]>(() => [
},
])
const emptyForm = () => ({ id: '', customerId: '', warehouseId: '', palletCode: '', palletType: '', capacityCbm: null as number | null, remark: '' })
const emptyForm = () => ({ id: '', customerId: '', warehouseId: '', palletCode: '', palletType: '', capacityCbm: null as number | null, weightKg: null as number | null, color: '', remark: '' })
const form = reactive(emptyForm())
const rules: FormRules<typeof form> = {
warehouseId: [{ required: true, message: '请选择所属仓库', trigger: 'change' }],
palletCode: [
{ required: true, message: '请输入托盘编码', trigger: 'blur' },
{ max: 50, message: '托盘编码不能超过 50 个字符', trigger: 'blur' },
],
warehouseId: [{ required: true, message: '请选择国内仓', trigger: 'change' }],
palletType: [
{ required: true, message: '请输入托盘类型', trigger: 'blur' },
{ max: 32, message: '托盘类型不能超过 32 个字符', trigger: 'blur' },
@@ -90,10 +86,24 @@ const rules: FormRules<typeof form> = {
},
trigger: 'change',
}],
weightKg: [{
validator: (_rule, value, callback) => {
if (typeof value !== 'number' || !Number.isFinite(value) || value <= 0) callback(new Error('请输入大于 0 的托盘重量'))
else callback()
},
trigger: 'change',
}],
color: [
{ required: true, message: '请输入托盘颜色', trigger: 'blur' },
{ max: 32, message: '托盘颜色不能超过 32 个字符', trigger: 'blur' },
],
remark: [{ max: 500, message: '备注不能超过 500 个字符', trigger: 'blur' }],
}
const editorWarehouse = computed(() => warehouses.value.find((item) => String(item.id) === form.warehouseId) || null)
const domesticWarehouses = computed(() => warehouses.value.filter((warehouse) => (
warehouse.warehouseType === 'DOMESTIC' && warehouse.status === 'ACTIVE'
)))
const editorTitle = computed(() => form.id ? '编辑托盘' : '新增托盘')
const editorPermission = computed(() => form.id ? 'platform:pallet:edit' : 'platform:pallet:create')
const contextLocked = computed(() => editorOpen.value || detailOpen.value || saving.value || deletingIds.value.size > 0)
@@ -112,9 +122,9 @@ const columns: DataTableColumn[] = [
{ key: 'pallet', label: '托盘编码', minWidth: 190, slotName: 'pallet' },
{ prop: 'palletType', label: '托盘类型', minWidth: 140 },
{ key: 'capacity', label: '托盘容积（m³）', minWidth: 160, slotName: 'capacity' },
{ key: 'warehouse', label: '所属仓库', minWidth: 210, slotName: 'warehouse' },
{ key: 'weight', label: '托盘重量（kg）', minWidth: 160, slotName: 'weight' },
{ prop: 'color', label: '颜色', minWidth: 120 },
{ key: 'remark', label: '备注', minWidth: 220, slotName: 'remark' },
{ prop: 'updatedAt', label: '更新时间', minWidth: 160, formatter: (row: PlatformPalletResource) => formatDateTime(row.updatedAt) },
]
function apiId(value: string) {
@@ -132,10 +142,25 @@ function formatCapacity(value: number | string) {
return `${numeric.toLocaleString('zh-CN', { maximumFractionDigits: 6 })} m³`
}
function formatWeight(value: number | string | null) {
if (value === null) return '—'
const numeric = Number(value)
if (!Number.isFinite(numeric)) return String(value)
return `${numeric.toLocaleString('zh-CN', { maximumFractionDigits: 3 })} kg`
}
function warehouseFor(warehouseId: number | string) {
return warehouses.value.find((item) => String(item.id) === String(warehouseId)) || null
}
function isDomesticWarehouse(warehouseId: number | string) {
return warehouseFor(warehouseId)?.warehouseType === 'DOMESTIC'
}
function isActiveDomesticWarehouse(warehouseId: number | string) {
return domesticWarehouses.value.some((warehouse) => String(warehouse.id) === String(warehouseId))
}
function errorMessage(details: ApiErrorDetails) {
return details.requestId ? `${details.message}（requestId: ${details.requestId}）` : details.message
}
@@ -146,9 +171,9 @@ async function loadWarehouses() {
warehouseError.value = null
warehouseLoading.value = true
try {
const result = await listPlatformWarehouses(1, 200)
const records = await listAllPlatformWarehouses()
if (sequence !== warehouseSequence) return
warehouses.value = result.records
warehouses.value = records
} catch (error) {
if (sequence !== warehouseSequence) return
warehouseError.value = getApiErrorDetails(error, '仓库列表加载失败，请稍后重试')
@@ -200,7 +225,7 @@ function resetFilters() {
function openCreate() {
Object.assign(form, emptyForm())
form.warehouseId = filters.value.warehouseId
form.warehouseId = isActiveDomesticWarehouse(filters.value.warehouseId) ? filters.value.warehouseId : ''
form.customerId = editorWarehouse.value ? String(editorWarehouse.value.tenantId) : ''
editorOpen.value = true
captureBaseline()
@@ -215,6 +240,8 @@ function assignForm(resource: PlatformPalletResource) {
palletCode: resource.palletCode,
palletType: resource.palletType,
capacityCbm: Number(resource.capacityCbm),
weightKg: resource.weightKg === null ? null : Number(resource.weightKg),
color: resource.color || '',
remark: resource.remark || '',
})
editorOpen.value = true
@@ -241,6 +268,10 @@ async function openDetail(row: PlatformPalletResource) {
}
async function openEdit(row: PlatformPalletResource) {
if (!isDomesticWarehouse(row.warehouseId)) {
ElMessage.warning('仅支持编辑国内仓托盘')
return
}
try {
assignForm(await fetchDetail(row))
} catch (error) {
@@ -249,19 +280,23 @@ async function openEdit(row: PlatformPalletResource) {
}
async function savePallet() {
if (!await formRef.value?.validate().catch(() => false) || form.capacityCbm === null) return
if (!await formRef.value?.validate().catch(() => false) || form.capacityCbm === null || form.weightKg === null) return
const warehouse = editorWarehouse.value
if (!warehouse) {
ElMessage.error('所选仓库已不存在，请重新选择')
const warehouseAllowed = form.id
? warehouse?.warehouseType === 'DOMESTIC'
: warehouse?.warehouseType === 'DOMESTIC' && warehouse.status === 'ACTIVE'
if (!warehouse || !warehouseAllowed) {
ElMessage.error(form.id ? '托盘仅支持归属国内仓' : '新增托盘仅支持选择启用的国内仓')
return
}
form.customerId = String(warehouse.tenantId)
saving.value = true
const payload: SavePlatformPalletRequest = {
warehouseId: apiId(form.warehouseId),
palletCode: form.palletCode.trim(),
palletType: form.palletType.trim(),
capacityCbm: form.capacityCbm,
weightKg: form.weightKg,
color: form.color.trim() || null,
remark: form.remark.trim() || null,
}
try {
@@ -364,7 +399,7 @@ onMounted(() => {
<template #actions="{ row }">
<div class="table-actions pallet-row-actions">
<el-button link type="primary" title="查看托盘" @click="openDetail(row as PlatformPalletResource)"><Eye :size="15" />查看</el-button>
<el-button v-if="access.can('platform:pallet:edit')" link type="primary" title="编辑托盘" @click="openEdit(row as PlatformPalletResource)"><Pencil :size="15" />编辑</el-button>
<el-button v-if="access.can('platform:pallet:edit') && isDomesticWarehouse((row as PlatformPalletResource).warehouseId)" link type="primary" title="编辑托盘" @click="openEdit(row as PlatformPalletResource)"><Pencil :size="15" />编辑</el-button>
<el-button
v-if="access.can('platform:pallet:delete')"
link
@@ -379,7 +414,7 @@ onMounted(() => {
<div class="pallet-cell"><span><Boxes :size="18" /></span><strong>{{ (row as PlatformPalletResource).palletCode }}</strong></div>
</template>
<template #capacity="{ row }"><strong>{{ formatCapacity((row as PlatformPalletResource).capacityCbm) }}</strong></template>
<template #warehouse="{ row }"><span>{{ warehouseFor((row as PlatformPalletResource).warehouseId)?.warehouseName || '—' }}</span></template>
<template #weight="{ row }"><strong>{{ formatWeight((row as PlatformPalletResource).weightKg) }}</strong></template>
<template #remark="{ row }"><span class="remark-text">{{ (row as PlatformPalletResource).remark || '—' }}</span></template>
</DataTable>
</section>
@@ -398,6 +433,8 @@ onMounted(() => {
<el-descriptions-item label="托盘编码">{{ detail.palletCode }}</el-descriptions-item>
<el-descriptions-item label="托盘类型">{{ detail.palletType }}</el-descriptions-item>
<el-descriptions-item label="托盘容积">{{ formatCapacity(detail.capacityCbm) }}</el-descriptions-item>
<el-descriptions-item label="托盘重量">{{ formatWeight(detail.weightKg) }}</el-descriptions-item>
<el-descriptions-item label="颜色">{{ detail.color || '—' }}</el-descriptions-item>
<el-descriptions-item label="备注">{{ detail.remark || '—' }}</el-descriptions-item>
</el-descriptions>
<h3 class="detail-section-title">记录信息</h3>
@@ -430,9 +467,9 @@ onMounted(() => {
<div><strong>{{ editorWarehouse?.warehouseName || '当前仓库' }}</strong><span>{{ editorWarehouse?.warehouseCode || form.warehouseId }} · 平台公共资源</span></div>
</div>
<el-form-item v-else label="所属仓库" prop="warehouseId" required>
<el-select v-model="form.warehouseId" filterable placeholder="请选择所属仓库" :loading="warehouseLoading">
<el-select v-model="form.warehouseId" filterable placeholder="请选择国内仓" :loading="warehouseLoading">
<el-option
v-for="warehouse in warehouses"
v-for="warehouse in domesticWarehouses"
:key="String(warehouse.id)"
:label="`${warehouse.warehouseName}（${warehouse.warehouseCode}）`"
:value="String(warehouse.id)"
@@ -444,11 +481,11 @@ onMounted(() => {
<section class="editor-section" aria-labelledby="pallet-spec-heading">
<div class="editor-section-heading">
<Boxes :size="18" aria-hidden="true" />
<div><h3 id="pallet-spec-heading">托盘规格</h3><p>完善编码、类型与实际可用容积。</p></div>
<div><h3 id="pallet-spec-heading">托盘规格</h3><p>编码由系统自动生成，请维护类型、容积、重量和颜色。</p></div>
</div>
<div class="editor-field-grid">
<el-form-item label="托盘编码" prop="palletCode" required>
<el-input v-model="form.palletCode" maxlength="50" show-word-limit placeholder="例如 TP-001" />
<el-form-item label="托盘编码">
<el-input :model-value="form.palletCode || '保存后自动生成'" disabled aria-label="托盘编码（系统生成）" />
</el-form-item>
<el-form-item label="托盘类型" prop="palletType" required>
<el-select
@@ -463,12 +500,19 @@ onMounted(() => {
</el-select>
</el-form-item>
</div>
<el-form-item label="托盘容积（m³）" prop="capacityCbm" required>
<el-input-number v-model="form.capacityCbm" :min="0.000001" :max="999999999999.999999" :precision="6" :step="0.1" controls-position="right" aria-label="标准容积" />
<p class="field-help">用于服务端按总体积计算所需托盘数量，请填写托盘实际可用容积。</p>
<div class="editor-field-grid">
<el-form-item label="托盘容积（m³）" prop="capacityCbm" required>
<el-input-number v-model="form.capacityCbm" :min="0.000001" :max="999999999999.999999" :precision="6" :step="0.1" controls-position="right" aria-label="托盘容积" />
</el-form-item>
<el-form-item label="托盘重量（kg）" prop="weightKg" required>
<el-input-number v-model="form.weightKg" :min="0.001" :max="999999999999999.999" :precision="3" :step="0.5" controls-position="right" aria-label="托盘重量" />
</el-form-item>
</div>
<el-form-item label="颜色" prop="color" required>
<el-input v-model="form.color" maxlength="32" show-word-limit placeholder="例如 黄色" />
</el-form-item>
<el-form-item label="备注" prop="remark" class="editor-remark-field">
<el-input v-model="form.remark" type="textarea" :rows="4" maxlength="500" show-word-limit placeholder="可填写规格、材质或现场识别说明" />
<el-input v-model="form.remark" type="textarea" :rows="4" maxlength="500" show-word-limit placeholder="可填写其他说明" />
</el-form-item>
</section>
</el-form>
src/modules/warehouses/api/platformWarehouses.test.ts
+26
View File
@@ -6,6 +6,7 @@ import {
createPlatformWarehouse,
getPlatformWarehouse,
importWarehouses,
listAllPlatformWarehouses,
listPlatformWarehouses,
updatePlatformWarehouse,
type SavePlatformWarehouseRequest,
@@ -109,6 +110,31 @@ describe('platform warehouse API', () => {
})
})
it('loads every warehouse page for complete resource selectors', async () => {
const firstRecord = { id: '1', warehouseCode: 'ABE2', warehouseType: 'FBA' }
const domesticRecord = { id: '201', warehouseCode: 'CN-YIWU-01', warehouseType: 'DOMESTIC' }
vi.mocked(http.get)
.mockResolvedValueOnce({
code: '200',
data: { records: [firstRecord], page: 1, size: 200, total: 201, pages: 2 },
})
.mockResolvedValueOnce({
code: '200',
data: { records: [domesticRecord], page: 2, size: 200, total: 201, pages: 2 },
})
await expect(listAllPlatformWarehouses()).resolves.toEqual([
{ ...firstRecord, primaryAddress: null, addressSummary: null },
{ ...domesticRecord, primaryAddress: null, addressSummary: null },
])
expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/warehouse-admin', {
params: { page: 1, size: 200 },
})
expect(http.get).toHaveBeenNthCalledWith(2, '/platform/v1/warehouse-admin', {
params: { page: 2, size: 200 },
})
})
it('uses the implemented create, update, and status routes', async () => {
vi.mocked(http.post).mockResolvedValue({ code: '200', message: 'success', data: '19001' })
vi.mocked(http.put).mockResolvedValue({ code: '200', message: 'success', data: null })
src/modules/warehouses/api/platformWarehouses.ts
+15
View File
@@ -221,6 +221,21 @@ export async function listPlatformWarehouses(pageOrQuery: number | PlatformWareh
}
}
export async function listAllPlatformWarehouses(
filters: Omit<PlatformWarehouseQuery, 'page' | 'size'> = {},
): Promise<PlatformWarehouseSummaryResource[]> {
const size = 200
const firstPage = await listPlatformWarehouses({ ...filters, page: 1, size })
if (firstPage.pages <= 1) return firstPage.records
const remainingPages = await Promise.all(
Array.from({ length: firstPage.pages - 1 }, (_, index) => (
listPlatformWarehouses({ ...filters, page: index + 2, size })
)),
)
return [firstPage, ...remainingPages].flatMap((page) => page.records)
}
export async function getPlatformWarehouse(warehouseId: number | string) {
const response = await http.get<ApiEnvelope<PlatformWarehouseDetailResource>, ApiEnvelope<PlatformWarehouseDetailResource>>(
`${basePath}/${warehouseId}`,