优化

src/modules/suppliers/api/platformSuppliers.test.ts

@@ -8,7 +8,7 @@ vi.mock('@/shared/api/http', async (original) => ({
   http: { get: vi.fn(), post: vi.fn(), put: vi.fn(), patch: vi.fn() },
 }))
 
-const payload: SaveSupplierRequest = { name: '测试供应商', category: 'BOOKING', scope: 'DOMESTIC', region: '宁波', legalRepresentative: '张三', contactName: '李四', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: '9007199254740995', status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null }
+const payload: SaveSupplierRequest = { name: '测试供应商', category: 'BOOKING', region: '宁波', legalRepresentative: '张三', contactName: '李四', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: '9007199254740995', status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null }
 const resource = { id: 9007199254740993, tenantId: 0, ...payload, createdBy: 9007199254740994, createdAt: '2026-08-13T10:00:00', updatedBy: null, updatedAt: '2026-08-13T10:00:00', deleted: false, version: 1 }
 
 describe('platform supplier API', () => {
@@ -18,8 +18,9 @@ describe('platform supplier API', () => {
     vi.mocked(http.get)
       .mockResolvedValueOnce({ code: '200', data: { records: [resource], page: 1, size: 20, total: 1, pages: 1 } })
       .mockResolvedValueOnce({ code: '200', data: { booking: 1, customs: 2, trucking: 3, certificate: 4 } })
-    const page = await listSuppliers({ page: 1, size: 20, category: 'BOOKING', scope: 'DOMESTIC', keyword: '测试' })
-    expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/suppliers', { params: expect.objectContaining({ category: 'BOOKING', scope: 'DOMESTIC', keyword: '测试' }) })
+    const page = await listSuppliers({ page: 1, size: 20, category: 'BOOKING', keyword: '测试' })
+    expect(http.get).toHaveBeenNthCalledWith(1, '/platform/v1/suppliers', { params: expect.objectContaining({ category: 'BOOKING', keyword: '测试' }) })
+    expect(vi.mocked(http.get).mock.calls[0]?.[1]?.params).not.toHaveProperty('scope')
     expect(page.records[0]).toMatchObject({ id: expect.any(String), tenantId: '0', licenseFileId: expect.any(String), createdBy: expect.any(String) })
     expect(await getSupplierStats()).toEqual({ booking: 1, customs: 2, trucking: 3, certificate: 4 })
     expect(http.get).toHaveBeenNthCalledWith(2, '/platform/v1/suppliers/stats')

src/modules/suppliers/api/platformSuppliers.ts

@@ -18,7 +18,7 @@ export async function listSuppliers(query: SupplierQuery): Promise<SupplierPage>
   const response = await http.get<ApiEnvelope<SupplierPage>, ApiEnvelope<SupplierPage>>(basePath, {
     params: {
       page: query.page ?? 1, size: query.size ?? 20, category: query.category,
-      scope: query.scope || undefined, region: query.region?.trim() || undefined,
+      region: query.region?.trim() || undefined,
       status: query.status || undefined, keyword: query.keyword?.trim() || undefined,
     },
   })

src/modules/suppliers/pages/SupplierDetailView.vue

@@ -11,7 +11,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import SupplierLicenseDialog from '@/modules/suppliers/components/SupplierLicenseDialog.vue'
 import { getSupplier } from '@/modules/suppliers/api/platformSuppliers'
-import { categoryLabels, scopeLabels, settlementLabels, statusLabels, type Supplier } from '@/modules/suppliers/types'
+import { categoryLabels, settlementLabels, statusLabels, type Supplier } from '@/modules/suppliers/types'
 
 const route = useRoute(); const router = useRouter(); const access = useAccessPreviewStore()
 const canView = computed(() => access.can('platform:supplier:list'))
@@ -19,7 +19,7 @@ const supplierId = computed(() => typeof route.params.id === 'string' ? route.pa
 const supplier = ref<Supplier | null>(null); const loading = ref(false); const error = ref<ApiErrorDetails | null>(null); const licenseOpen = ref(false)
 let loadSequence = 0
 const items = computed(() => supplier.value ? [
-  ['供应商名称', supplier.value.name], ['供应商类别', categoryLabels[supplier.value.category]], ['国内/国外', supplier.value.scope ? scopeLabels[supplier.value.scope] : '—'], ['地区', supplier.value.region],
+  ['供应商名称', supplier.value.name], ['供应商类别', categoryLabels[supplier.value.category]], ['地区', supplier.value.region],
   ['法人代表', supplier.value.legalRepresentative], ['联系人', supplier.value.contactName], ['联系电话', supplier.value.phone], ['电子邮箱', supplier.value.email || '—'],
   ['营业执照号', supplier.value.businessLicenseNo || '—'], ['结算周期', settlementLabels[supplier.value.settlementPeriod]], ['公司地址', supplier.value.address || '—'], ['备注', supplier.value.remark || '—'],
 ] : [])

src/modules/suppliers/pages/SupplierFormView.vue

@@ -12,7 +12,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useUnsavedWorkRegistration } from '@/core/unsaved-work/useUnsavedWorkRegistration'
 import { createSupplier, getSupplier, updateSupplier } from '@/modules/suppliers/api/platformSuppliers'
-import { categoryLabels, scopeLabels, settlementLabels, statusLabels, type SaveSupplierRequest, type SupplierCategory } from '@/modules/suppliers/types'
+import { categoryLabels, settlementLabels, statusLabels, type SaveSupplierRequest } from '@/modules/suppliers/types'
 
 const route = useRoute()
 const router = useRouter()
@@ -25,7 +25,7 @@ const loading = ref(false)
 const saving = ref(false)
 const loadError = ref<ApiErrorDetails | null>(null)
 const submitError = ref<ApiErrorDetails | null>(null)
-const initial = (): SaveSupplierRequest => ({ name: '', category: 'BOOKING', scope: 'DOMESTIC', region: '', legalRepresentative: '', contactName: '', phone: '', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null })
+const initial = (): SaveSupplierRequest => ({ name: '', category: 'BOOKING', region: '', legalRepresentative: '', contactName: '', phone: '', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null })
 const form = reactive(initial())
 const rules: FormRules<SaveSupplierRequest> = {
   name: [{ required: true, message: '请输入供应商名称', trigger: 'blur' }], category: [{ required: true, message: '请选择供应商类别', trigger: 'change' }],
@@ -38,7 +38,7 @@ const { captureBaseline } = useUnsavedWorkRegistration({ key: 'supplier-editor',
 
 function optional(value: string | null) { return value?.trim() || null }
 function payload(): SaveSupplierRequest {
-  return { ...form, name: form.name.trim(), scope: form.category === 'BOOKING' ? form.scope : null, region: form.region.trim(), legalRepresentative: form.legalRepresentative.trim(), contactName: form.contactName.trim(), phone: form.phone.trim(), email: optional(form.email), address: optional(form.address), businessLicenseNo: optional(form.businessLicenseNo), licenseFileId: form.licenseFileId, remark: optional(form.remark) }
+  return { ...form, name: form.name.trim(), region: form.region.trim(), legalRepresentative: form.legalRepresentative.trim(), contactName: form.contactName.trim(), phone: form.phone.trim(), email: optional(form.email), address: optional(form.address), businessLicenseNo: optional(form.businessLicenseNo), licenseFileId: form.licenseFileId, remark: optional(form.remark) }
 }
 let loadSequence = 0
 function resetForm() { Object.assign(form, initial()) }
@@ -54,7 +54,7 @@ async function load() {
   try {
     const data = await getSupplier(requestedId)
     if (sequence !== loadSequence || requestedId !== supplierId.value) return
-    Object.assign(form, { name: data.name, category: data.category, scope: data.scope, region: data.region, legalRepresentative: data.legalRepresentative, contactName: data.contactName, phone: data.phone, email: data.email, address: data.address, businessLicenseNo: data.businessLicenseNo, licenseFileId: data.licenseFileId, status: data.status, settlementPeriod: data.settlementPeriod, remark: data.remark })
+    Object.assign(form, { name: data.name, category: data.category, region: data.region, legalRepresentative: data.legalRepresentative, contactName: data.contactName, phone: data.phone, email: data.email, address: data.address, businessLicenseNo: data.businessLicenseNo, licenseFileId: data.licenseFileId, status: data.status, settlementPeriod: data.settlementPeriod, remark: data.remark })
     captureBaseline()
   } catch (error) {
     if (sequence === loadSequence && requestedId === supplierId.value) loadError.value = getApiErrorDetails(error, '供应商详情加载失败')
@@ -62,7 +62,6 @@ async function load() {
 }
 async function save() {
   if (!access.can(requiredPermission.value)) return
-  if (form.category === 'BOOKING' && !form.scope) { ElMessage.error('请选择订舱国内/国外范围'); return }
   if (!await formRef.value?.validate().catch(() => false)) return
   saving.value = true; submitError.value = null
   try {
@@ -73,7 +72,6 @@ async function save() {
   } catch (error) { submitError.value = getApiErrorDetails(error, editing.value ? '供应商修改失败' : '供应商新增失败') } finally { saving.value = false }
 }
 
-watch(() => form.category, (category) => { if (category === 'BOOKING' && !form.scope) form.scope = 'DOMESTIC'; if (category !== 'BOOKING') form.scope = null })
 watch(supplierId, () => { void load() }, { immediate: true })
 </script>
 
@@ -90,7 +88,6 @@ watch(supplierId, () => { void load() }, { immediate: true })
               <el-form-item label="供应商名称" prop="name"><el-input v-model="form.name" maxlength="160" placeholder="请输入供应商名称" /></el-form-item>
               <el-form-item label="供应商类别" prop="category"><el-select v-model="form.category"><el-option v-for="(label, value) in categoryLabels" :key="value" :label="label" :value="value" /></el-select></el-form-item>
               <el-form-item label="地区" prop="region"><el-input v-model="form.region" maxlength="80" placeholder="请输入地区" /></el-form-item>
-              <el-form-item v-if="form.category === 'BOOKING'" label="国内/国外" prop="scope"><el-select v-model="form.scope"><el-option v-for="(label, value) in scopeLabels" :key="value" :label="label" :value="value" /></el-select></el-form-item>
               <el-form-item label="法人代表" prop="legalRepresentative"><el-input v-model="form.legalRepresentative" maxlength="80" placeholder="请输入法人代表" /></el-form-item>
               <el-form-item label="联系人" prop="contactName"><el-input v-model="form.contactName" maxlength="80" placeholder="请输入联系人" /></el-form-item>
               <el-form-item label="联系电话" prop="phone"><el-input v-model="form.phone" maxlength="40" placeholder="请输入联系电话" /></el-form-item>

src/modules/suppliers/pages/SupplierRouteReuse.behavior.test.ts

@@ -21,7 +21,7 @@ vi.mock('@/core/unsaved-work/useUnsavedWorkRegistration', () => ({ useUnsavedWor
 vi.mock('@/modules/suppliers/api/platformSuppliers', () => ({ getSupplier: mocks.getSupplier, updateSupplier: mocks.updateSupplier, createSupplier: vi.fn() }))
 
 function supplier(id: string, name: string): Supplier {
-  return { id, tenantId: '0', name, category: 'BOOKING', scope: 'DOMESTIC', region: '宁波', legalRepresentative: '法人', contactName: '联系人', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null, createdBy: null, createdAt: '', updatedBy: null, updatedAt: '', deleted: false, version: 1 }
+  return { id, tenantId: '0', name, category: 'BOOKING', region: '宁波', legalRepresentative: '法人', contactName: '联系人', phone: '13800000000', email: null, address: null, businessLicenseNo: null, licenseFileId: null, status: 'ACTIVE', settlementPeriod: 'MONTHLY_30', remark: null, createdBy: null, createdAt: '', updatedBy: null, updatedAt: '', deleted: false, version: 1 }
 }
 
 function deferred<T>() {

src/modules/suppliers/pages/SuppliersView.test.ts

@@ -22,6 +22,11 @@ describe('supplier formal pages', () => {
     expect(source).toContain('class="supplier-query-panel"')
     expect(source).toContain('class="supplier-query-toolbar"')
     expect(source).toContain('grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 12px')
+    expect(source).not.toContain('订舱范围')
+    expect(source).not.toContain('国内/国外')
+    expect(formSource).not.toContain('form.scope')
+    expect(formSource).not.toContain('prop="scope"')
+    expect(detailSource).not.toContain('国内/国外')
   })
 
   it('uses independent routes for list, detail, create and edit', () => {

src/modules/suppliers/pages/SuppliersView.vue

@@ -14,7 +14,7 @@ import { getApiErrorDetails, type ApiErrorDetails } from '@/shared/api/http'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import SupplierLicenseDialog from '@/modules/suppliers/components/SupplierLicenseDialog.vue'
 import { changeSupplierStatus, getSupplierStats, listSuppliers } from '@/modules/suppliers/api/platformSuppliers'
-import { categoryLabels, scopeLabels, settlementLabels, statusLabels, type Supplier, type SupplierCategory, type SupplierScope, type SupplierStats, type SupplierStatus } from '@/modules/suppliers/types'
+import { categoryLabels, settlementLabels, statusLabels, type Supplier, type SupplierCategory, type SupplierStats, type SupplierStatus } from '@/modules/suppliers/types'
 
 const router = useRouter()
 const access = useAccessPreviewStore()
@@ -30,14 +30,13 @@ const loadError = ref<ApiErrorDetails | null>(null)
 const actionId = ref('')
 const licenseOpen = ref(false)
 const licenseSupplier = ref<Supplier | null>(null)
-type Filters = QueryModel & { status: SupplierStatus | ''; scope: SupplierScope | ''; region: string; keyword: string }
-const filters = ref<Filters>({ status: '', scope: '', region: '', keyword: '' })
+type Filters = QueryModel & { status: SupplierStatus | ''; region: string; keyword: string }
+const filters = ref<Filters>({ status: '', region: '', keyword: '' })
 const applied = ref<Filters>({ ...filters.value })
 let sequence = 0
 
 const queryFields = computed<QueryField[]>(() => [
   { key: 'status', type: 'select', label: '状态', placeholder: '全部状态', width: 150, options: [{ label: '合作中', value: 'ACTIVE' }, { label: '停用', value: 'INACTIVE' }] },
-  ...(activeCategory.value === 'BOOKING' ? [{ key: 'scope', type: 'select' as const, label: '订舱范围', placeholder: '全部国内/国外', width: 170, options: [{ label: '国内', value: 'DOMESTIC' }, { label: '国外', value: 'INTERNATIONAL' }] }] : []),
   { key: 'region', type: 'input', label: '地区', placeholder: '请输入地区', width: 170, props: { maxlength: 80 } },
   { key: 'keyword', type: 'input', label: '名称或联系人', placeholder: '供应商名称/联系人', width: 220, props: { maxlength: 160 } },
 ])
@@ -46,7 +45,6 @@ const columns = computed<DataTableColumn[]>(() => [
   { key: 'actions', label: '操作', width: 260, fixed: 'left', slotName: 'actions' },
   { key: 'name', label: '供应商名称', minWidth: 230, slotName: 'name' },
   { key: 'category', label: '类别', width: 90, slotName: 'category' },
-  ...(activeCategory.value === 'BOOKING' ? [{ key: 'scope', label: '国内/国外', width: 110, slotName: 'scope' }] : []),
   { key: 'region', label: '地区', minWidth: 110 },
   { key: 'legalRepresentative', label: '法人', minWidth: 120 },
   { key: 'contactName', label: '联系人', minWidth: 110 },
@@ -70,7 +68,7 @@ async function load() {
   loadError.value = null
   try {
     const [result, counts] = await Promise.all([
-      listSuppliers({ page: page.value, size: pageSize.value, category: activeCategory.value, status: applied.value.status, scope: activeCategory.value === 'BOOKING' ? applied.value.scope : '', region: applied.value.region, keyword: applied.value.keyword }),
+      listSuppliers({ page: page.value, size: pageSize.value, category: activeCategory.value, status: applied.value.status, region: applied.value.region, keyword: applied.value.keyword }),
       getSupplierStats(),
     ])
     if (current !== sequence) return
@@ -87,7 +85,7 @@ async function load() {
 function search() { applied.value = { ...filters.value }; page.value = 1; void load() }
 function switchCategory(category: SupplierCategory) {
   activeCategory.value = category
-  filters.value.scope = ''; applied.value.scope = ''; page.value = 1
+  page.value = 1
   void load()
 }
 function showLicense(row: Supplier) { licenseSupplier.value = row; licenseOpen.value = true }
@@ -150,7 +148,6 @@ onMounted(load)
           </template>
           <template #name="{ row }"><strong class="supplier-name">{{ row.name }}</strong></template>
           <template #category="{ row }">{{ categoryLabels[row.category as SupplierCategory] }}</template>
-          <template #scope="{ row }">{{ row.scope ? scopeLabels[row.scope as SupplierScope] : '—' }}</template>
           <template #license="{ row }"><el-button size="small" plain type="primary" @click="showLicense(supplierRow(row))"><FileText :size="15" />查看</el-button></template>
           <template #status="{ row }"><StatusBadge :status="statusLabels[row.status as SupplierStatus]" /></template>
           <template #settlement="{ row }">{{ settlementLabels[supplierRow(row).settlementPeriod] }}</template>

src/modules/suppliers/types.ts

@@ -1,5 +1,4 @@
 export type SupplierCategory = 'BOOKING' | 'CUSTOMS' | 'TRUCKING' | 'CERTIFICATE'
-export type SupplierScope = 'DOMESTIC' | 'INTERNATIONAL'
 export type SupplierStatus = 'ACTIVE' | 'INACTIVE'
 export type SettlementPeriod = 'MONTHLY_30' | 'MONTHLY_45' | 'MONTHLY_60' | 'MONTHLY_90' | 'PER_TRANSACTION' | 'IMMEDIATE'
 
@@ -8,7 +7,6 @@ export interface Supplier {
   tenantId: string
   name: string
   category: SupplierCategory
-  scope: SupplierScope | null
   region: string
   legalRepresentative: string
   contactName: string
@@ -42,7 +40,6 @@ export interface SupplierQuery {
   page?: number
   size?: number
   category?: SupplierCategory
-  scope?: SupplierScope | ''
   region?: string
   status?: SupplierStatus | ''
   keyword?: string
@@ -51,7 +48,6 @@ export interface SupplierQuery {
 export interface SaveSupplierRequest {
   name: string
   category: SupplierCategory
-  scope: SupplierScope | null
   region: string
   legalRepresentative: string
   contactName: string
@@ -66,7 +62,6 @@ export interface SaveSupplierRequest {
 }
 
 export const categoryLabels: Record<SupplierCategory, string> = { BOOKING: '订舱', CUSTOMS: '报关', TRUCKING: '拖车', CERTIFICATE: '证书' }
-export const scopeLabels: Record<SupplierScope, string> = { DOMESTIC: '国内', INTERNATIONAL: '国外' }
 export const statusLabels: Record<SupplierStatus, string> = { ACTIVE: '合作中', INACTIVE: '停用' }
 export const settlementLabels: Record<SettlementPeriod, string> = {
   MONTHLY_30: '月结30天', MONTHLY_45: '月结45天', MONTHLY_60: '月结60天', MONTHLY_90: '月结90天', PER_TRANSACTION: '票结', IMMEDIATE: '现结',