优化

src/modules/master-data/express-companies/pages/ExpressCompaniesView.test.ts

@@ -1,4 +1,6 @@
 import ElementPlus from 'element-plus'
+import { readFileSync } from 'node:fs'
+import { resolve } from 'node:path'
 import { createPinia, setActivePinia } from 'pinia'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
@@ -7,6 +9,8 @@ import { useAccessPreviewStore } from '@/core/access/accessPreview'
 import { useAuthStore } from '@/core/auth/auth'
 import ExpressCompaniesView from './ExpressCompaniesView.vue'
 
+const expressCompaniesSource = readFileSync(resolve(process.cwd(), 'src/modules/master-data/express-companies/pages/ExpressCompaniesView.vue'), 'utf8')
+
 vi.mock('@/modules/master-data/express-companies/api/platformExpressCompanies', () => ({
   listPlatformExpressCompanies: vi.fn(),
   getPlatformExpressCompany: vi.fn(),
@@ -69,6 +73,19 @@ enableAutoUnmount(afterEach)
 afterAll(() => vi.unstubAllGlobals())
 
 describe('ExpressCompaniesView query and table migration', () => {
+  it('keeps operation first and exposes the prototype business columns separately', () => {
+    const actionsIndex = expressCompaniesSource.indexOf("{ key: 'actions', label: '操作'")
+    const nameIndex = expressCompaniesSource.indexOf("{ key: 'company', label: '公司名称'")
+    const codeIndex = expressCompaniesSource.indexOf("{ key: 'companyCode', prop: 'companyCode', label: '编码'")
+    const websiteIndex = expressCompaniesSource.indexOf("{ key: 'website', label: '官方网站'")
+    const phoneIndex = expressCompaniesSource.indexOf("{ key: 'servicePhone', prop: 'servicePhone', label: '客服电话'")
+    expect([actionsIndex, nameIndex, codeIndex, websiteIndex, phoneIndex].every((index) => index >= 0)).toBe(true)
+    expect(actionsIndex).toBeLessThan(nameIndex)
+    expect(nameIndex).toBeLessThan(codeIndex)
+    expect(codeIndex).toBeLessThan(websiteIndex)
+    expect(websiteIndex).toBeLessThan(phoneIndex)
+    expect(expressCompaniesSource).toContain("label: '更新时间', minWidth: 150, defaultVisible: false")
+  })
   beforeEach(() => {
     vi.stubGlobal('ResizeObserver', ResizeObserverStub)
     document.body.innerHTML = ''

src/modules/master-data/express-companies/pages/ExpressCompaniesView.vue

@@ -119,11 +119,12 @@ 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: 'servicePhone', prop: 'servicePhone', label: '客服电话', minWidth: 130, formatter: (row: PlatformExpressCompanyResource) => row.servicePhone || '—' },
+  { key: 'company', label: '公司名称', minWidth: 210, slotName: 'company' },
+  { key: 'companyCode', prop: 'companyCode', label: '编码', minWidth: 120 },
   { key: 'website', label: '官方网站', minWidth: 210, slotName: 'website' },
-  { key: 'updatedAt', prop: 'updatedAt', label: '更新时间', minWidth: 150, defaultVisible: false, formatter: (row: PlatformExpressCompanyResource) => formatUpdatedAt(row.updatedAt) },
+  { key: 'servicePhone', prop: 'servicePhone', label: '客服电话', minWidth: 130, formatter: (row: PlatformExpressCompanyResource) => row.servicePhone || '—' },
   { key: 'status', label: '状态', width: 100, slotName: 'status' },
+  { key: 'updatedAt', prop: 'updatedAt', label: '更新时间', minWidth: 150, defaultVisible: false, formatter: (row: PlatformExpressCompanyResource) => formatUpdatedAt(row.updatedAt) },
 ]
 
 async function loadExpressCompanies() {
@@ -330,7 +331,7 @@ onMounted(() => {
           </div>
           <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 #company="{ row }"><div class="express-company-cell"><span><Truck :size="17" /></span><div><strong>{{ (row as PlatformExpressCompanyResource).companyName }}</strong></div></div></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>
@@ -393,7 +394,6 @@ onMounted(() => {
 .express-company-cell > span { display: grid; width: 34px; height: 34px; flex: 0 0 34px; place-items: center; border: 1px solid var(--cc-border); border-radius: 7px; background: #f8fafc; color: var(--cc-primary); }
 .express-company-cell > div { display: flex; min-width: 0; flex-direction: column; gap: 3px; }
 .express-company-cell strong { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.express-company-cell small { color: var(--cc-muted); font-size: 11px; }
 .external-link { display: inline-flex; align-items: center; gap: 5px; color: var(--cc-primary); font-size: 12px; text-decoration: none; }
 .external-link:hover { text-decoration: underline; }
 .tracking-template { display: block; max-width: 100%; color: #475467; font-family: "Cascadia Code", Consolas, monospace; font-size: 11px; overflow-wrap: anywhere; }