优化

src/modules/master-data/counterparties/pages/PartnersView.vue

@@ -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; }