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-04 09:05:19 +08:00
parent fa922ca96f
commit 815d4e8daf
21 changed files with 994 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/warehouses/api/platformWarehouses.ts
+5 -5
View File
@@ -82,7 +82,7 @@ export interface PlatformWarehouseCapabilityRequest {
}
export interface SavePlatformWarehouseRequest {
tenantId: number
tenantId: number | string
warehouseCode: string
warehouseName: string
warehouseType: string
@@ -99,14 +99,14 @@ export interface SavePlatformWarehouseRequest {
const basePath = '/platform/v1/warehouse-admin'
export async function listPlatformWarehouses(tenantId: number, page = 1, size = 200) {
export async function listPlatformWarehouses(tenantId: number | string, page = 1, size = 200) {
const response = await http.get<ApiEnvelope<PlatformWarehousePage>, ApiEnvelope<PlatformWarehousePage>>(basePath, {
params: { tenantId, page, size },
})
return unwrapApiResponse(response)
}
export async function getPlatformWarehouse(tenantId: number, warehouseId: number | string) {
export async function getPlatformWarehouse(tenantId: number | string, warehouseId: number | string) {
const response = await http.get<ApiEnvelope<PlatformWarehouseDetailResource>, ApiEnvelope<PlatformWarehouseDetailResource>>(
`${basePath}/${warehouseId}`,
{ params: { tenantId } },
@@ -119,7 +119,7 @@ export async function createPlatformWarehouse(payload: SavePlatformWarehouseRequ
return unwrapApiResponse(response)
}
export async function updatePlatformWarehouse(tenantId: number, warehouseId: number | string, payload: SavePlatformWarehouseRequest) {
export async function updatePlatformWarehouse(tenantId: number | string, warehouseId: number | string, payload: SavePlatformWarehouseRequest) {
const response = await http.put<ApiEnvelope<null>, ApiEnvelope<null>>(`${basePath}/${warehouseId}`, payload, {
params: { tenantId },
})
@@ -127,7 +127,7 @@ export async function updatePlatformWarehouse(tenantId: number, warehouseId: num
}
export async function changePlatformWarehouseStatus(
tenantId: number,
tenantId: number | string,
warehouseId: number | string,
status: PlatformWarehouseStatus,
) {
src/modules/warehouses/pages/WarehousesView.test.ts
+28 -2
View File
@@ -12,6 +12,8 @@ import {
} from '@/modules/warehouses/api/platformWarehouses'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { useAuthStore } from '@/core/auth/auth'
import { listPlatformTenants, type PlatformTenantResource } from '../../iam/api/platformIam'
import PlatformTenantSelector from '../../iam/components/PlatformTenantSelector.vue'
import WarehousesView from './WarehousesView.vue'
vi.mock('@/modules/warehouses/api/platformWarehouses', () => ({
@@ -22,6 +24,8 @@ vi.mock('@/modules/warehouses/api/platformWarehouses', () => ({
changePlatformWarehouseStatus: vi.fn(),
}))
vi.mock('../../iam/api/platformIam', () => ({ listPlatformTenants: vi.fn() }))
class ResizeObserverStub implements ResizeObserver {
observe() {}
unobserve() {}
@@ -56,6 +60,16 @@ const warehouse: PlatformWarehouseResource = {
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'
const detail: PlatformWarehouseDetailResource = {
warehouse,
addresses: [{
@@ -94,6 +108,9 @@ describe('WarehousesView real API integration', () => {
vi.stubGlobal('ResizeObserver', ResizeObserverStub)
document.body.innerHTML = ''
vi.mocked(listPlatformWarehouses).mockReset().mockResolvedValue({ records: [warehouse], page: 1, size: 200, total: 1, pages: 1 })
vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({
records: [tenant(10001, '默认企业'), tenant(snowflakeTenantId, '雪花企业')], page: 1, size: 200, total: 2, pages: 1,
})
vi.mocked(getPlatformWarehouse).mockReset().mockResolvedValue(detail)
vi.mocked(createPlatformWarehouse).mockReset().mockResolvedValue('19005')
vi.mocked(updatePlatformWarehouse).mockReset().mockResolvedValue(null)
@@ -129,14 +146,23 @@ describe('WarehousesView real API integration', () => {
expect(wrapper.text()).toContain('测试环境收货仓')
})
it('does not render a tenant selector during the single-tenant phase', async () => {
it('renders an explicit tenant selector and defaults to tenant 10001', async () => {
const wrapper = await mountView()
expect(wrapper.find('[aria-label="目标租户 ID"]').exists()).toBe(false)
expect(wrapper.find('[aria-label="目标企业"]').exists()).toBe(true)
expect(wrapper.text()).not.toContain('查询仓库')
expect(wrapper.text()).toContain('租户 10001')
})
it('preserves a snowflake tenant id as a string when switching enterprises', async () => {
const wrapper = await mountView()
wrapper.findComponent(PlatformTenantSelector).vm.$emit('update:modelValue', snowflakeTenantId)
await flushPromises()
expect(listPlatformWarehouses).toHaveBeenLastCalledWith(snowflakeTenantId, 1, 200)
})
it('shows a recoverable real API error without falling back to demo warehouses', async () => {
vi.mocked(listPlatformWarehouses).mockRejectedValueOnce(new Error('Gateway unavailable'))
const wrapper = await mountView()
src/modules/warehouses/pages/WarehousesView.vue
+51 -24
View File
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { computed, onMounted, reactive, ref, watch } from 'vue'
import { computed, reactive, ref, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { MapPin, Pencil, Plus, Power, Warehouse as WarehouseIcon } from '@lucide/vue'
import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
@@ -17,16 +17,18 @@ import {
type SavePlatformWarehouseRequest,
} from '@/modules/warehouses/api/platformWarehouses'
import { useAccessPreviewStore } from '@/core/access/accessPreview'
import { PlatformTenantSelector } from '@/modules/iam'
import type { Warehouse } from '@/modules/warehouses/types'
const fixedTenantId = 10001
const access = useAccessPreviewStore()
const editorOpen = ref(false)
const saving = ref(false)
const loading = ref(false)
const editLoading = ref(false)
const page = ref(1)
const pageSize = ref(10)
const loadedTenantId = ref<number | null>(null)
const selectedTenantId = ref('')
const loadedTenantId = ref<string | null>(null)
const loadError = ref<ApiErrorDetails | null>(null)
const detailWarningCount = ref(0)
const statusLoadingIds = ref(new Set<string>())
@@ -82,7 +84,13 @@ const { captureBaseline } = useUnsavedWorkRegistration({
requiredPermission: editorPermission,
})
const warehouseReady = computed(() => loadedTenantId.value === fixedTenantId && !loading.value)
const warehouseReady = computed(() => Boolean(selectedTenantId.value)
&& loadedTenantId.value === selectedTenantId.value
&& !loading.value)
const tenantSwitchDisabled = computed(() => editorOpen.value
|| editLoading.value
|| saving.value
|| statusLoadingIds.value.size > 0)
const filteredRows = computed(() => rows.value.filter((warehouse) => {
const keyword = appliedFilters.value.keyword.trim().toLowerCase()
const matchesKeyword = !keyword || [warehouse.code, warehouse.name, warehouse.province, warehouse.city, warehouse.address]
@@ -159,14 +167,21 @@ function validateWarehouseForm() {
.every(Boolean)
}
async function loadWarehouses() {
function apiTenantId(value: string) {
const numeric = Number(value)
return Number.isSafeInteger(numeric) ? numeric : value
}
async function loadWarehouses(tenantId = selectedTenantId.value) {
if (!tenantId) return
const sequence = ++loadSequence
loading.value = true
loadError.value = null
try {
const result = await listPlatformWarehouses(fixedTenantId, 1, 200)
const requestTenantId = apiTenantId(tenantId)
const result = await listPlatformWarehouses(requestTenantId, 1, 200)
const details = await Promise.allSettled(
result.records.map((warehouse) => getPlatformWarehouse(fixedTenantId, warehouse.id)),
result.records.map((warehouse) => getPlatformWarehouse(requestTenantId, warehouse.id)),
)
if (sequence !== loadSequence) return
rows.value = result.records.map((warehouse, index) => {
@@ -174,7 +189,7 @@ async function loadWarehouses() {
return toRow(warehouse, detailResult?.status === 'fulfilled' ? detailResult.value : null)
})
detailWarningCount.value = details.filter((item) => item.status === 'rejected').length
loadedTenantId.value = fixedTenantId
loadedTenantId.value = tenantId
page.value = 1
} catch (error) {
if (sequence !== loadSequence) return
@@ -189,7 +204,7 @@ function requireCurrentTenant() {
ElMessage.warning('仓库数据尚未加载完成，请稍后重试')
return null
}
return fixedTenantId
return apiTenantId(selectedTenantId.value)
}
function openCreate() {
@@ -217,24 +232,30 @@ async function ensureDetail(warehouse: WarehouseRow) {
}
async function openEdit(warehouse: WarehouseRow) {
const detail = await ensureDetail(warehouse)
if (!detail) return
const address = detail.addresses[0]
Object.assign(form, warehouse, {
province: address?.stateProvince || '',
city: address?.city || '',
address: address?.addressLine1 || '',
})
clearWarehouseFormErrors()
captureBaseline()
editorOpen.value = true
const tenantAtStart = selectedTenantId.value
editLoading.value = true
try {
const detail = await ensureDetail(warehouse)
if (!detail || selectedTenantId.value !== tenantAtStart || loadedTenantId.value !== tenantAtStart) return
const address = detail.addresses[0]
Object.assign(form, warehouse, {
province: address?.stateProvince || '',
city: address?.city || '',
address: address?.addressLine1 || '',
})
clearWarehouseFormErrors()
captureBaseline()
editorOpen.value = true
} finally {
editLoading.value = false
}
}
function nullable(value: string) {
return value.trim() || null
}
function buildSaveRequest(tenantId: number): SavePlatformWarehouseRequest {
function buildSaveRequest(tenantId: number | string): SavePlatformWarehouseRequest {
const existing = form.id ? rows.value.find((item) => item.id === form.id)?.detail : null
const warehouse = existing?.warehouse
const currentAddress = existing?.addresses[0]
@@ -332,13 +353,19 @@ async function toggleStatus(warehouse: WarehouseRow) {
}
}
onMounted(() => {
void loadWarehouses()
watch(selectedTenantId, (tenantId) => {
editorOpen.value = false
rows.value = []
loadedTenantId.value = null
detailWarningCount.value = 0
page.value = 1
void loadWarehouses(tenantId)
})
</script>
<template>
<div class="business-page">
<PlatformTenantSelector v-model="selectedTenantId" :disabled="tenantSwitchDisabled" />
<el-alert v-if="loadError" type="error" :closable="false" show-icon class="state-alert">
<template #title>仓库数据加载失败</template>
<p>{{ loadErrorDescription }}</p>
@@ -355,7 +382,7 @@ onMounted(() => {
<div class="panel-heading">
<div>
<h2>平台收货仓</h2>
<p>租户 {{ fixedTenantId }} · 共 {{ filteredRows.length }} 个收货仓</p>
<p>租户 {{ selectedTenantId || '—' }} · 共 {{ filteredRows.length }} 个收货仓</p>
</div>
<el-button
v-if="access.can('platform:warehouse:create')"