优化

src/modules/overseas-warehouse/layoutAcceptance.test.ts

@@ -27,7 +27,7 @@ describe('overseas warehouse 1920px layout acceptance', () => {
 
   it('keeps all inbound-order row actions on one line', () => {
     const source = page('InboundOrdersView.vue')
-    expect(source).toContain('<template #actions="{ row }"><div class="row-actions density-actions">')
+    expect(source).toContain('<template #actions="{ row }"><div class="row-actions density-actions admin-text-actions">')
     expect(source).toContain('.row-actions { min-width: max-content; flex-wrap: nowrap; white-space: nowrap; }')
     expect(source).toContain('.row-actions :deep(.el-button) { flex: 0 0 auto; }')
     expect(readFileSync(resolve(process.cwd(), 'src/styles/adminDensity.css'), 'utf8')).toContain('.density-actions > :is(.el-button, .el-dropdown) { margin-left: 0; }')

src/modules/overseas-warehouse/pages/CustomerVisitsView.vue

@@ -159,18 +159,21 @@ onMounted(load)
 <template>
   <AdminPage class="admin-density">
     <ListPageLayout aria-label="客户回访列表">
-      <template #toolbar>
+
+
+      <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-customer-visits" row-key="id" empty-text="暂无可回访派送单" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>客户回访</h1></template>
+        <template #filters>
         <dl class="visit-summary density-detail-overview" aria-label="回访统计"><div><dt>可回访订单</dt><dd>{{ summary.visitable }}</dd></div><div><dt>待回访</dt><dd>{{ summary.pending }}</dd></div><div><dt>已完成回访</dt><dd>{{ summary.completed }}</dd></div></dl>
-        <QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="客户回访筛选" preference-key="overseas-customer-visits-query" :search-on-reset="false" @search="search" @reset="reset" />
+        <QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="客户回访筛选" preference-key="overseas-customer-visits-query" :search-on-reset="false" @search="search" @reset="reset" />
       </template>
-      <template v-if="error" #state><LoadErrorState title="客户回访列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-      <section v-if="!error" class="surface-panel table-panel">
-        <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-customer-visits" row-key="id" empty-text="暂无可回访派送单" @update:page="load()" @update:page-size="page = 1; load()">
-          <template #actions="{ row }"><el-button v-if="access.can(permission.customerVisitEdit)" class="density-action" data-tone="neutral" size="small" @click="openVisit(row as CustomerVisitRow)">{{ row.status === 'COMPLETED' ? '再次回访' : '回访' }}</el-button></template>
+        <template #notices><template v-if="error"><LoadErrorState title="客户回访列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+
+          <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button v-if="access.can(permission.customerVisitEdit)" class="density-action" data-tone="neutral" size="small" @click="openVisit(row as CustomerVisitRow)">{{ row.status === 'COMPLETED' ? '再次回访' : '回访' }}</el-button></div></template>
           <template #status="{ row }"><StatusBadge :status="row.status === 'COMPLETED' ? '已回访' : '待回访'" /></template>
           <template #pagination-left>共 {{ total }} 条回访记录</template>
-        </DataTable>
-      </section>
+        </DataTable></section>
     </ListPageLayout>
   </AdminPage>
 

src/modules/overseas-warehouse/pages/DispatchesView.test.ts

@@ -4,6 +4,7 @@ import { resolve } from 'node:path'
 import { enableAutoUnmount, flushPromises, mount } from '@vue/test-utils'
 import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import QueryToolbar, { type QueryModel } from '@/shared/components/QueryToolbar.vue'
+import LoadErrorState from '@/shared/components/LoadErrorState.vue'
 import { cancelDispatch, getDispatchBolPdf, listDispatches, removeDispatchItem, transferDispatchToDelivery, updateDispatch } from '../api/dispatches'
 import DispatchesView from './DispatchesView.vue'
 
@@ -60,9 +61,9 @@ describe('DispatchesView', () => {
     [['edit'], ['查看', '打印BOL', '编辑'], false],
     [['cancel'], ['查看', '打印BOL', '取消'], false],
     [['transfer-delivery'], ['查看', '打印BOL', '转派送'], false],
-    [['edit', 'transfer-delivery'], ['查看', '打印BOL', '转派送', ''], true],
-    [['edit', 'cancel'], ['查看', '打印BOL', '编辑', ''], true],
-    [['edit', 'cancel', 'transfer-delivery'], ['查看', '打印BOL', '转派送', ''], true],
+    [['edit', 'transfer-delivery'], ['查看', '打印BOL', '转派送', '更多'], true],
+    [['edit', 'cancel'], ['查看', '打印BOL', '编辑', '更多'], true],
+    [['edit', 'cancel', 'transfer-delivery'], ['查看', '打印BOL', '转派送', '更多'], true],
   ])('uses the row action threshold for permissions %j', async (allowed, labels, overflow) => {
     canPermission.mockImplementation(code => allowed.some(action => code === 'platform:overseas-warehouse:dispatch:' + action))
     const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
@@ -72,6 +73,23 @@ describe('DispatchesView', () => {
     expect(actions.find('.el-dropdown').exists()).toBe(overflow)
   })
 
+  it('keeps the integrated header and filters usable through failure and retry', async () => {
+    vi.mocked(listDispatches).mockRejectedValueOnce(new Error('网络错误'))
+    const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
+    await flushPromises()
+    const card = wrapper.get('.data-table--integrated')
+    expect(card.get('.data-table__toolbar h1').text()).toBe('排车列表')
+    expect(card.get('.data-table__toolbar button[aria-label="列设置"]').text()).toBe('字段设置')
+    expect(card.get('.data-table__filters').findComponent(QueryToolbar).exists()).toBe(true)
+    expect(card.find('.el-table').exists()).toBe(false)
+    expect(card.find('.data-table__pagination').exists()).toBe(false)
+    wrapper.findComponent(LoadErrorState).vm.$emit('retry')
+    await flushPromises()
+    expect(card.find('.data-table__state').exists()).toBe(false)
+    expect(card.get('.el-table').text()).toContain('PC-1')
+    expect(card.get('.data-table__pagination').text()).toContain('共 1 条排车记录')
+  })
+
   it('loads immediately and sends only supported page filters', async () => {
     const wrapper = mount(DispatchesView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
@@ -92,6 +110,13 @@ describe('DispatchesView', () => {
     expect(wrapper.text()).toContain('待发车')
     expect(wrapper.text()).toContain('FBA-1 · 已确认')
     expect(wrapper.text()).toContain('已预约')
+    expect(wrapper.get('.data-table').classes()).not.toContain('admin-text-actions')
+    expect(wrapper.get('.query-toolbar').classes()).not.toContain('admin-text-actions')
+    expect(wrapper.get('.data-table__toolbar button[aria-label="列设置"]').find('svg').exists()).toBe(true)
+    expect(wrapper.get('.query-toolbar__actions .el-button--primary').text()).toBe('查询')
+    expect(wrapper.get('button[aria-label="上一页"]').find('svg').exists()).toBe(true)
+    expect(wrapper.findAll('.query-toolbar__actions button svg')).toHaveLength(3)
+    expect(wrapper.get('.el-table__body-wrapper .row-actions').classes()).toContain('admin-text-actions')
   })
 
   it('keeps long dispatch identifiers as strings', async () => {

src/modules/overseas-warehouse/pages/DispatchesView.vue

@@ -561,13 +561,14 @@ onMounted(load)
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="海外仓排车列表">
     <OperationErrorToast :details="mutationError" />
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="排车列表筛选" preference-key="overseas-dispatches-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-    <template v-if="loadError" #state><LoadErrorState title="排车列表加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-dispatches" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
-       <template #actions="{ row }"><RowActions :actions="rowActions(row as DispatchListItem)" :more-label="`更多操作 · ${(row as DispatchListItem).dispatchNo || '当前记录'}`" @action="handleRowAction($event, row as DispatchListItem)" /></template>
+    <DataTable v-model:page="page" v-model:page-size="pageSize" appearance="integrated" :stripe="false" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-dispatches" row-key="id" empty-text="暂无排车记录" @update:page="load()" @update:page-size="page = 1; load()">
+      <template #toolbar-start><h1>排车列表</h1></template>
+      <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="排车列表筛选" preference-key="overseas-dispatches-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+      <template v-if="loadError" #state><LoadErrorState title="排车列表加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
+       <template #actions="{ row }"><RowActions text-actions :actions="rowActions(row as DispatchListItem)" :more-label="`更多操作 · ${(row as DispatchListItem).dispatchNo || '当前记录'}`" @action="handleRowAction($event, row as DispatchListItem)" /></template>
       <template #status="{ row }"><StatusBadge :status="String((row as DispatchListItem).status || '—')" /></template>
       <template #pagination-left>共 {{ total }} 条排车记录</template>
-    </DataTable></section>
+    </DataTable>
   </ListPageLayout></AdminPage><AppDialog class="admin-density-dialog" v-model="transferOpen" title="转派送" width="min(1120px, calc(100vw - 28px))" confirm-text="确认提交" :confirm-loading="transferSaving" @confirm="submitTransfer"><el-form class="density-form" label-position="top"><h3>派送信息</h3><div class="transfer-grid"><el-form-item label="排车单号"><el-input :model-value="transferRow?.dispatchNo" readonly /></el-form-item><el-form-item label="预计派送时间" required><el-date-picker v-model="transferForm.plannedDeliveryAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" placeholder="请选择预计派送时间" /></el-form-item><el-form-item label="派送方式" required><el-select v-model="transferForm.deliveryMethod" placeholder="请选择"><el-option v-for="option in deliveryMethodOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="快递/车队"><el-input v-model="transferForm.carrierName" placeholder="请输入快递或车队名称" /></el-form-item><el-form-item label="运单号"><el-input v-model="transferForm.waybillNo" placeholder="请输入运单号" /></el-form-item><el-form-item label="提货方式" required><el-select v-model="transferForm.pickupMethod" placeholder="请选择"><el-option v-for="option in pickupMethodOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="装车类型" required><el-select v-model="transferForm.loadingType" placeholder="请选择"><el-option v-for="option in loadingTypeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="司机/车队名称"><el-input v-model="transferForm.driverName" placeholder="请输入司机或车队名称" /></el-form-item><el-form-item label="联系电话"><el-input v-model="transferForm.driverPhone" placeholder="请输入联系电话" /></el-form-item><el-form-item label="车牌号"><el-input v-model="transferForm.vehiclePlate" placeholder="请输入车牌号" /></el-form-item><el-form-item label="车辆类型"><el-select v-model="transferForm.vehicleType" clearable placeholder="请选择"><el-option v-for="option in vehicleTypeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="车辆大小"><el-select v-model="transferForm.vehicleSize" clearable placeholder="请选择"><el-option v-for="option in vehicleSizeOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item label="预约账号"><el-select v-model="transferForm.appointmentAccount" clearable placeholder="请选择"><el-option v-for="option in appointmentAccountOptions" :key="option.value" v-bind="option" /></el-select></el-form-item><el-form-item v-if="isBuyAppointment" label="卖家姓名" required><el-input v-model="transferForm.sellerName" placeholder="请输入卖家姓名" /></el-form-item></div><h3>费用信息（USD）</h3><div class="transfer-grid"><el-form-item label="派送费用" required><el-input-number v-model="transferForm.deliveryFee" :min="0" :precision="2" controls-position="right" placeholder="请输入派送费用" /></el-form-item><el-form-item v-if="needsLoadingFee" label="装车费" required><el-input-number v-model="transferForm.loadingFee" :min="0" :precision="2" controls-position="right" placeholder="请输入装车费" /></el-form-item><el-form-item v-if="isBuyAppointment" label="买约费用" required><el-input-number v-model="transferForm.appointmentFee" :min="0" :precision="2" controls-position="right" placeholder="请输入买约费用" /></el-form-item></div><el-form-item label="备注"><el-input v-model="transferForm.remark" type="textarea" :rows="3" placeholder="请输入派送备注（选填）" /></el-form-item><el-alert title="费用不会自动带出，请手工填写后提交；提交后将生成待出库单、待派送单，并保存费用明细" type="info" :closable="false" /></el-form></AppDialog>
   <AppDialog class="admin-density-dialog" v-model="editOpen" title="编辑排车" width="min(900px, calc(100vw - 48px))" confirm-text="保存" :confirm-loading="editSaving" @confirm="submitEdit"><el-alert :title="`当前状态：${editRow?.status || '—'}；普通编辑不会修改排车状态；未生成出库单前可移除托盘。`" type="info" :closable="false" /><el-form class="density-form" label-position="top"><div class="edit-grid"><el-form-item label="车牌号"><el-input v-model="editForm.vehiclePlate" placeholder="请输入车牌号" /></el-form-item><el-form-item label="司机"><el-input v-model="editForm.driverName" placeholder="请输入司机姓名" /></el-form-item><el-form-item label="联系电话"><el-input v-model="editForm.driverPhone" placeholder="请输入联系电话" /></el-form-item><el-form-item label="拖车公司名称"><el-input v-model="editForm.carrierName" placeholder="请输入拖车公司名称" /></el-form-item><el-form-item label="路线"><el-input v-model="editForm.route" readonly placeholder="按已排托盘自动汇总 FBA 仓" /></el-form-item><el-form-item label="发车时间"><el-date-picker v-model="editForm.departAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="预计到达时间"><el-date-picker v-model="editForm.estimatedArrivalAt" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss" /></el-form-item><el-form-item label="FBA预约号"><el-input v-model="editForm.fbaAppointmentNo" placeholder="请输入 FBA 预约号" /></el-form-item><el-form-item label="FBA预约状态"><el-select v-model="editForm.fbaAppointmentStatus" clearable><el-option label="待预约" value="PENDING" /><el-option label="已预约" value="BOOKED" /><el-option label="已确认" value="CONFIRMED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item><el-form-item label="车辆预约状态"><el-select v-model="editForm.vehicleAppointmentStatus" clearable><el-option label="待预约" value="PENDING" /><el-option label="已预约" value="BOOKED" /><el-option label="已确认" value="CONFIRMED" /><el-option label="已取消" value="CANCELLED" /></el-select></el-form-item></div></el-form><h3>已排车托盘</h3><el-table :data="editItems" border max-height="280" empty-text="暂无托盘"><el-table-column label="操作" width="90" fixed="left"><template #default="{ row }"><el-button class="density-action" data-tone="danger" :loading="removingItemId === String(row.id)" :disabled="Boolean(removingItemId)" @click="removePallet(row)">移除</el-button></template></el-table-column><el-table-column prop="palletNo" label="托盘号" min-width="160" /><el-table-column prop="orderNo" label="订单号" min-width="160" /><el-table-column prop="inboundCode" label="入仓码" min-width="140" /><el-table-column prop="packageCount" label="箱数" width="80" align="right" /></el-table></AppDialog>
 </template>

src/modules/overseas-warehouse/pages/ExceptionOrdersView.vue

@@ -78,11 +78,16 @@ onMounted(load)
 
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="异常订单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="异常订单筛选" preference-key="overseas-exception-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-    <template v-if="error" #state><LoadErrorState title="异常订单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-    <section v-if="!error" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-exception-orders" row-key="id" empty-text="暂无异常订单" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-exception-orders" row-key="id" empty-text="暂无异常订单" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>异常订单</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="异常订单筛选" preference-key="overseas-exception-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+        <template #notices><template v-if="error"><LoadErrorState title="异常订单列表加载失败" :message="error.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+
       <template #toolbar-actions><el-button v-if="access.can(permission.exceptionOrderCreate)" type="primary" @click="openCreate"><Plus :size="16" />新增异常订单</el-button></template>
-      <template #actions="{ row }"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row as ExceptionOrderRow)">查看</el-button></template>
+      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row as ExceptionOrderRow)">查看</el-button></div></template>
       <template #related="{ row }"><div class="related-orders"><span v-if="row.lastMileOrderNo" class="related-order-reference">尾程 <OrderReferenceText :value="String(row.lastMileOrderNo)" /></span><span v-if="row.deliveryNo">派送 {{ row.deliveryNo }}</span><span v-if="row.inboundCode">入仓 {{ row.inboundCode }}</span><span v-if="row.outboundNo">出库 {{ row.outboundNo }}</span></div></template>
       <template #handlerName="{ row }">{{ displayHandler(row.handlerName) }}</template>
       <template #status="{ row }"><StatusBadge :status="statusLabels[String(row.status)] || String(row.status)" /></template><template #pagination-left>共 {{ total }} 条异常订单</template>

src/modules/overseas-warehouse/pages/InboundOrdersView.vue

@@ -191,11 +191,16 @@ onMounted(() => { void load() })
 
 <template>
   <AdminPage class="admin-density"><OperationErrorToast :details="mutationError" /><ListPageLayout aria-label="海外仓入库单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="入库单筛选" preference-key="overseas-inbound-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-    <template v-if="loadError" #state><LoadErrorState title="入库单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inbound-orders" row-key="lineId" empty-text="暂无入库单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inbound-orders" row-key="lineId" empty-text="暂无入库单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>入库单</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="入库单筛选" preference-key="overseas-inbound-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="入库单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
+
+
       <template #toolbar-actions><el-button v-if="access.can(permission.inboundOrderAppointment)" plain :disabled="!selectedRows.length" @click="openAppointment"><CalendarCheck2 :size="16" />预约</el-button><el-button v-if="access.can(permission.inboundOrderSmartDispatch)" type="primary" @click="openSmartDispatch"><Truck :size="16" />智能排车</el-button></template>
-      <template #actions="{ row }"><div class="row-actions density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button></div></template>
+      <template #actions="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.inboundOrderEdit) && ['待入库'].includes((row as InboundOrderListItem).status)" size="small" @click="openPlanEdit(row)">编辑</el-button><el-button class="density-action" data-tone="neutral" v-if="(row as InboundOrderListItem).appointmentNo !== '—' && access.can(permission.inboundOrderAppointment)" size="small" @click="openAppointmentEdit(row)">预约</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条入库单 · 已选 {{ selectedRows.length }} 条</template>
     </DataTable></section>
   </ListPageLayout>

src/modules/overseas-warehouse/pages/InventoryTransactionsView.vue

@@ -42,10 +42,16 @@ function search(model: QueryModel) { page.value = 1; void load(model) }; functio
 async function exportLedger() { exportLoading.value = true; try { const range = Array.isArray(filters.value.occurredDate) ? filters.value.occurredDate.map(String) : []; saveCsv(await downloadInventoryLedger({ customerName: String(filters.value.customerName || '').trim() || undefined, destinationWarehouseCode: String(filters.value.warehouse || '').trim() || undefined, skuCode: String(filters.value.sku || '').trim() || undefined, businessType: String(filters.value.businessType || '').trim() || undefined, businessOrderNo: String(filters.value.businessOrderNo || '').trim() || undefined, inboundCode: String(filters.value.inboundCode || '').trim() || undefined, inboundOrderNo: String(filters.value.inboundOrderNo || '').trim() || undefined, outboundOrderNo: String(filters.value.outboundOrderNo || '').trim() || undefined, occurredFrom: range[0] ? `${range[0]}T00:00:00` : undefined, occurredTo: range[1] ? `${range[1]}T23:59:59` : undefined }) as Blob, '进销存记录.csv') } catch { ElMessage.error('进销存导出失败，请重试') } finally { exportLoading.value = false } }
 </script>
 
-<template><AdminPage class="admin-density"><ListPageLayout aria-label="进销存记录列表"><template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="进销存记录筛选" preference-key="overseas-inventory-transactions-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-  <template v-if="loadError" #state><LoadErrorState title="进销存记录加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-  <template v-else #state><p class="read-only-boundary">本页面仅用于查询库存流水，不提供出库单跳转或库存变更操作。</p></template>
-  <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inventory-transactions" row-key="id" empty-text="暂无进销存记录" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-actions><el-button v-if="access.can(permission.inventoryExport)" plain :loading="exportLoading" @click="exportLedger"><Download :size="16" />导出记录</el-button><el-button class="density-back" link @click="back"><ArrowLeft :size="16" />返回库存管理</el-button></template><template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" :disabled="(row as InventoryTransactionListItem).inboundCode === '—'" @click="openRelationship(row as InventoryTransactionListItem)">关联数据</el-button></div></template><template #pagination-left>共 {{ total }} 条进销存记录</template></DataTable></section>
+<template><AdminPage class="admin-density"><ListPageLayout aria-label="进销存记录列表">
+
+
+  <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inventory-transactions" row-key="id" empty-text="暂无进销存记录" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>进销存记录</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="进销存记录筛选" preference-key="overseas-inventory-transactions-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="进销存记录加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
+<template v-else><p class="read-only-boundary">本页面仅用于查询库存流水，不提供出库单跳转或库存变更操作。</p></template></template>
+
+<template #toolbar-actions><el-button v-if="access.can(permission.inventoryExport)" plain :loading="exportLoading" @click="exportLedger"><Download :size="16" />导出记录</el-button><el-button class="density-back" link @click="back"><ArrowLeft :size="16" />返回库存管理</el-button></template><template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" :disabled="(row as InventoryTransactionListItem).inboundCode === '—'" @click="openRelationship(row as InventoryTransactionListItem)">关联数据</el-button></div></template><template #pagination-left>共 {{ total }} 条进销存记录</template></DataTable></section>
   <InboundCodeRelationshipDialog dense v-if="relationshipDialogOpen" v-model="relationshipDialogOpen" :inbound-code="relationshipDialogInboundCode" :can-read-base="access.can('platform:order:list')" :can-read-loading="access.can('platform:firstleg:smart-loading:list')" :can-read-overseas="access.can('platform:overseas-warehouse:inventory:list')" />
 </ListPageLayout></AdminPage></template>
 <style scoped>.read-only-boundary{margin:var(--admin-space-3) 2px 0;color:var(--cc-muted);font-size:var(--admin-font-caption);line-height:1.5}</style>

src/modules/overseas-warehouse/pages/InventoryView.vue

@@ -88,12 +88,17 @@ onMounted(() => { void loadWarehouses(); void load() })
 
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="海外仓库存管理">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading || contextLoading" ariaLabel="库存筛选" preference-key="overseas-inventory-query" @search="search" @reset="page = 1; rows = []; total = 0; summary = null" /></template>
-    <template #metrics><section class="inventory-metrics" aria-label="库存汇总"><div v-for="metric in metrics" :key="metric[0]" class="inventory-metric" :class="`is-${metric[2]}`"><span>{{ metric[0] }}</span><strong>{{ metric[1] }}</strong></div></section></template>
-    <template v-if="loadError" #state><LoadErrorState title="库存数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inventory" row-key="id" empty-text="暂无库存记录" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-inventory" row-key="id" empty-text="暂无库存记录" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>库存管理</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading || contextLoading" ariaLabel="库存筛选" preference-key="overseas-inventory-query" @search="search" @reset="page = 1; rows = []; total = 0; summary = null" /></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="库存数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
+        <template #before-results><section class="inventory-metrics" aria-label="库存汇总"><div v-for="metric in metrics" :key="metric[0]" class="inventory-metric" :class="`is-${metric[2]}`"><span>{{ metric[0] }}</span><strong>{{ metric[1] }}</strong></div></section></template>
+
       <template #toolbar-actions><el-button v-if="access.can(overseasWarehousePermissions.inventoryExport)" plain :loading="exportLoading" @click="exportBalances"><Download :size="16" />导出库存</el-button><el-button @click="router.push({ name: 'overseas-inventory-transactions' })"><BookOpen :size="16" />进销存记录</el-button></template>
-      <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button></div></template>
+      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条库存记录</template>
     </DataTable></section>
   </ListPageLayout></AdminPage>

src/modules/overseas-warehouse/pages/LastMileOrdersView.vue

@@ -906,8 +906,14 @@ onMounted(() => { void load() })
 
 <template>
   <AdminPage class="admin-density"><OperationErrorToast :details="actionError" /><ListPageLayout aria-label="尾程订单列表">
-    <template #toolbar>
-      <section class="surface-panel last-mile-toolbar" aria-label="尾程订单状态与筛选">
+
+
+
+
+    <DataTable appearance="integrated" :stripe="false" :results-visible="!loadError" :column-settings-mode="statusTab === '柜子' ? 'hide' : 'show'" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="statusTab === '柜子' ? undefined : total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
+      <template #toolbar-start><h1>尾程订单</h1></template>
+      <template #filters>
+      <section class="last-mile-toolbar integrated-query-group" aria-label="尾程订单状态与筛选">
         <el-radio-group v-model="statusTab" aria-label="尾程订单状态" @change="changeStatusTab">
           <el-radio-button value="全部">全部</el-radio-button>
           <el-radio-button value="待分配">待分配</el-radio-button>
@@ -917,15 +923,14 @@ onMounted(() => { void load() })
         <QueryToolbar v-model="filters" :fields="fields" :available-fields="allFields" :loading="loading" ariaLabel="尾程订单筛选" preference-key="overseas-last-mile-orders-query" :search-on-reset="false" @search="search" @reset="reset" />
       </section>
     </template>
-    <template v-if="loadError" #state>
+      <template #notices><template v-if="loadError">
       <LoadErrorState title="尾程订单加载失败" :message="loadError.message" :loading="loading" @retry="load">
         <template #details><ApiErrorMeta :details="loadError" /></template>
       </LoadErrorState>
-    </template>
-    <LoadErrorState v-if="actionError" title="尾程订单操作失败" :message="actionError.message" compact>
+    </template><LoadErrorState v-if="actionError" title="尾程订单操作失败" :message="actionError.message" compact>
       <template #details><ApiErrorMeta :details="actionError" /></template>
-    </LoadErrorState>
-    <section v-if="!loadError && statusTab === '柜子'" class="surface-panel container-workbench" :aria-busy="loading">
+    </LoadErrorState></template>
+      <template v-if="statusTab === '柜子'" #results><section class="container-workbench" :aria-busy="loading">
       <header class="container-workbench__header">
         <div><strong>货柜工作台</strong><span>按柜查看和修改海外接柜仓；整柜计划齐全后自动生成托盘码</span></div>
         <el-tag type="warning" effect="plain">{{ containerTotal }} 个货柜</el-tag>
@@ -960,16 +965,16 @@ onMounted(() => { void load() })
         <span>共 {{ containerTotal }} 个货柜</span>
         <el-pagination :current-page="page" :page-size="pageSize" :page-sizes="[10, 20, 50]" :total="containerTotal" layout="sizes, prev, pager, next" background @current-change="changeContainerPage" @size-change="changeContainerPageSize" />
       </div>
-    </section>
-    <section v-else-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-last-mile-orders" row-key="id" empty-text="暂无尾程订单" @selection-change="onSelectionChange" @update:page="load()" @update:page-size="page = 1; load()">
-      <template #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderExport)" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || hasSelectedRejectedReturn() || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || hasSelectedRejectedReturn() || hasSelectedInboundPlan() || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
+    </section></template>
+
+      <template v-if="statusTab !== '柜子'" #toolbar-actions><el-button v-if="access.can(permission.lastMileOrderExport)" plain :loading="exportLoading" @click="exportOrders"><Download :size="16" />导出订单</el-button><el-button v-if="access.can(permission.lastMileOrderTransfer)" plain :disabled="!selectedRows.length || hasSelectedRejectedReturn() || actionLoading" @click="openTransfer">转仓</el-button><el-button v-if="access.can(permission.inboundOrderCreate)" type="primary" plain :disabled="selectedRows.length !== 1 || hasSelectedRejectedReturn() || hasSelectedInboundPlan() || actionLoading" @click="openInboundPlan()">生成入库计划</el-button><el-button v-if="statusTab === '待分配' && access.can(permission.inboundOrderCreate)" type="primary" :disabled="actionLoading" @click="openContainerConversion">按柜批量生成</el-button></template>
       <template #relabelOrderNo="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.relabelNo }}</div><span v-if="!row.relabelApplications?.length">{{ row.relabelOrderNo }}</span></template>
       <template #relabelStatus="{ row }"><div v-for="application in row.relabelApplications" :key="application.relabelNo" class="relabel-suborder">{{ application.statusLabel }} · {{ application.quantity }} 件</div><span v-if="!row.relabelApplications?.length">{{ row.relabelStatus }}</span></template>
-      <template #actions="{ row }"><RowActions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
+      <template #actions="{ row }"><RowActions text-actions :actions="lastMileRowActions(row as LastMileOrderListItem)" :more-label="`更多尾程订单操作 · ${(row as LastMileOrderListItem).orderNo || '当前记录'}`" @action="handleLastMileRowAction($event, row as LastMileOrderListItem)" /></template>
       <template #orderNo="{ row }"><OrderReferenceText :value="String(row.orderNo || '')" copyable /></template>
       <template #cartonDifference="{ row }"><span :class="{ 'package-difference--nonzero': typeof row.cartonDifference === 'number' && row.cartonDifference !== 0 }">{{ packageDifferenceText(row.cartonDifference) }}</span></template>
       <template #pagination-left>共 {{ total }} 条尾程订单 · 已选 {{ selectedRows.length }} 条</template>
-    </DataTable></section>
+    </DataTable>
   </ListPageLayout></AdminPage>
   <WarehouseTransferReviewDialog v-if="transferReviewTarget" v-model="transferReviewOpen" :customer-id="transferReviewTarget.customerId" :customer-name="transferReviewTarget.owner" :transfer-no="transferReviewTarget.orderNo" @reviewed="load()" />
   <AppDialog class="admin-density-dialog" v-model="transferOpen" title="转仓" confirm-text="确认转仓" :loading="transferWarehouseLoading" :confirm-loading="actionLoading" :confirm-disabled="!transferForm.warehouseId || Boolean(transferWarehouseError)" @confirm="submitTransfer">
@@ -1106,7 +1111,7 @@ onMounted(() => { void load() })
 
 <style scoped>
 .relabel-suborder { min-height: 30px; line-height: 30px; white-space: nowrap; }
-.last-mile-toolbar { padding: var(--admin-space-5) var(--admin-space-5) 0; }
+.last-mile-toolbar { min-width: 0; }
 .row-actions { white-space: nowrap; }
 .command-form { margin-top: var(--admin-space-5); }
 .command-form__grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 0 var(--admin-space-5); }
@@ -1117,7 +1122,7 @@ onMounted(() => { void load() })
 .manual-node-table__head { position: sticky; top: 0; z-index: 1; background: var(--cc-surface); color: var(--cc-muted); font-size: var(--admin-font-body); font-weight: 600; }
 .manual-node-table__row { border-top: 1px solid var(--cc-border); }
 .manual-node-table__row :deep(.el-date-editor) { width: 100%; }
-.last-mile-toolbar :deep(.query-toolbar) { margin-top: var(--admin-space-5); padding: var(--admin-space-5) 0 var(--admin-space-5); border: 0; border-top: 1px solid var(--cc-border); border-radius: 0; }
+
 .container-convert-hint { margin: 0 0 var(--admin-space-5); color: var(--cc-muted); line-height: 1.6; }
 .container-convert-alert { margin-top: var(--admin-space-5); }
 .container-preview { margin-top: var(--admin-space-5); }

src/modules/overseas-warehouse/pages/LocationsView.vue

@@ -46,6 +46,11 @@ async function remove(row: OverseasLocationDto) { if (!canDelete(row)) return; t
 onMounted(() => { void loadWarehouses() })
 </script>
 
-<template><AdminPage class="admin-density"><ListPageLayout aria-label="海外仓库位管理"><template #toolbar><QueryToolbar v-model="filters" :fields="queryFields" ariaLabel="海外库位筛选" preference-key="overseas-locations-query" @search="search" @reset="page = 1; load()" /></template><template #state><LoadErrorState v-if="loadError" title="海外库位加载失败" :message="loadError.message" :loading="loading" @retry="load" /></template><section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" row-key="id" empty-text="暂无库位" @update:page="load()" @update:page-size="page = 1; load()"><template #toolbar-actions><el-button v-if="access.can(permission.locationCreate)" type="primary" @click="openCreate"><Plus :size="16" />新增库位</el-button></template><template #actions="{ row }"><div class="density-actions"><el-button v-if="canEdit(row as OverseasLocationDto)" size="small" class="density-action" @click="openEdit(row as OverseasLocationDto)">编辑</el-button><el-button v-if="canStatus(row as OverseasLocationDto)" size="small" class="density-action" :data-tone="(row as OverseasLocationDto).status === 'ACTIVE' ? 'danger' : 'success'" @click="toggleStatus(row as OverseasLocationDto)">{{ (row as OverseasLocationDto).status === 'ACTIVE' ? '停用' : '启用' }}</el-button><el-button v-if="canDelete(row as OverseasLocationDto)" size="small" class="density-action" data-tone="danger" @click="remove(row as OverseasLocationDto)">删除</el-button></div></template><template #warehouse="{ row }">{{ (row as OverseasLocationDto).warehouseName || warehouseNameById.get(String((row as OverseasLocationDto).warehouseId)) || '—' }}</template><template #locationType="{ row }"><el-tag :type="isA0(row as OverseasLocationDto) ? 'warning' : 'info'">{{ typeLabels[(row as OverseasLocationDto).locationType] || '普通库位' }}</el-tag></template><template #status="{ row }"><el-tag>{{ statusLabels[(row as OverseasLocationDto).status] || '—' }}</el-tag></template><template #pagination-left>共 {{ total }} 个库位</template></DataTable></section></ListPageLayout><AppDialog v-model="editorOpen" :title="editing ? '编辑海外库位' : '新增海外库位'" width="min(560px, calc(100vw - 28px))" :confirm-loading="saving" :show-confirm="false"><el-form label-position="top" :disabled="saving"><div class="editor-grid"><el-form-item label="海外仓" required><el-select v-model="form.warehouseId" :disabled="Boolean(editing)" placeholder="请选择海外仓"><el-option v-for="item in warehouses" :key="item.id" :value="item.id" :label="`${item.warehouseName}（${item.warehouseCode}）`" /></el-select></el-form-item><el-form-item label="库位编码" required><el-input v-model="form.locationCode" maxlength="50" placeholder="请输入库位编码" /></el-form-item><el-form-item label="库位名称"><el-input v-model="form.locationName" maxlength="100" placeholder="请输入库位名称（选填）" /></el-form-item><el-form-item label="最大承重（kg）" required><el-input-number v-model="form.maxWeightKg" :min="0" :precision="3" controls-position="right" placeholder="请输入最大承重" /></el-form-item></div><el-form-item label="备注"><el-input v-model="form.remark" maxlength="500" placeholder="请输入备注（选填）" /></el-form-item></el-form><template #footer><el-button :disabled="saving" @click="editorOpen = false">取消</el-button><el-button type="primary" :loading="saving" @click="save"><Save :size="16" />保存库位</el-button></template></AppDialog></AdminPage></template>
+<template><AdminPage class="admin-density"><ListPageLayout aria-label="海外仓库位管理"><section><DataTable preference-key="overseas-warehouse-locationsview" appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" row-key="id" empty-text="暂无库位" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>库位管理</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="queryFields" ariaLabel="海外库位筛选" preference-key="overseas-locations-query" @search="search" @reset="page = 1; load()" /></template>
+        <template #notices><LoadErrorState v-if="loadError" title="海外库位加载失败" :message="loadError.message" :loading="loading" @retry="load" /></template>
+
+<template #toolbar-actions><el-button v-if="access.can(permission.locationCreate)" type="primary" @click="openCreate"><Plus :size="16" />新增库位</el-button></template><template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button v-if="canEdit(row as OverseasLocationDto)" size="small" class="density-action" @click="openEdit(row as OverseasLocationDto)">编辑</el-button><el-button v-if="canStatus(row as OverseasLocationDto)" size="small" class="density-action" :data-tone="(row as OverseasLocationDto).status === 'ACTIVE' ? 'danger' : 'success'" @click="toggleStatus(row as OverseasLocationDto)">{{ (row as OverseasLocationDto).status === 'ACTIVE' ? '停用' : '启用' }}</el-button><el-button v-if="canDelete(row as OverseasLocationDto)" size="small" class="density-action" data-tone="danger" @click="remove(row as OverseasLocationDto)">删除</el-button></div></template><template #warehouse="{ row }">{{ (row as OverseasLocationDto).warehouseName || warehouseNameById.get(String((row as OverseasLocationDto).warehouseId)) || '—' }}</template><template #locationType="{ row }"><el-tag :type="isA0(row as OverseasLocationDto) ? 'warning' : 'info'">{{ typeLabels[(row as OverseasLocationDto).locationType] || '普通库位' }}</el-tag></template><template #status="{ row }"><el-tag>{{ statusLabels[(row as OverseasLocationDto).status] || '—' }}</el-tag></template><template #pagination-left>共 {{ total }} 个库位</template></DataTable></section></ListPageLayout><AppDialog v-model="editorOpen" :title="editing ? '编辑海外库位' : '新增海外库位'" width="min(560px, calc(100vw - 28px))" :confirm-loading="saving" :show-confirm="false"><el-form label-position="top" :disabled="saving"><div class="editor-grid"><el-form-item label="海外仓" required><el-select v-model="form.warehouseId" :disabled="Boolean(editing)" placeholder="请选择海外仓"><el-option v-for="item in warehouses" :key="item.id" :value="item.id" :label="`${item.warehouseName}（${item.warehouseCode}）`" /></el-select></el-form-item><el-form-item label="库位编码" required><el-input v-model="form.locationCode" maxlength="50" placeholder="请输入库位编码" /></el-form-item><el-form-item label="库位名称"><el-input v-model="form.locationName" maxlength="100" placeholder="请输入库位名称（选填）" /></el-form-item><el-form-item label="最大承重（kg）" required><el-input-number v-model="form.maxWeightKg" :min="0" :precision="3" controls-position="right" placeholder="请输入最大承重" /></el-form-item></div><el-form-item label="备注"><el-input v-model="form.remark" maxlength="500" placeholder="请输入备注（选填）" /></el-form-item></el-form><template #footer><el-button :disabled="saving" @click="editorOpen = false">取消</el-button><el-button type="primary" :loading="saving" @click="save"><Save :size="16" />保存库位</el-button></template></AppDialog></AdminPage></template>
 
 <style scoped>.editor-grid{display:grid;grid-template-columns:repeat(2,minmax(0,1fr));gap:0 14px}.editor-grid :deep(.el-select),.editor-grid :deep(.el-input-number){width:100%}@media(max-width:720px){.editor-grid{grid-template-columns:1fr}}</style>

src/modules/overseas-warehouse/pages/MojiaSkuSyncView.test.ts

@@ -0,0 +1,71 @@
+import { computed } from 'vue'
+import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+import ElementPlus from 'element-plus'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import DataTable from '@/shared/components/DataTable.vue'
+import { UI_PREFERENCE_SCOPE, preferenceStorageKey } from '@/shared/utils/uiLayoutPreference'
+import { listMojiaSkuSync } from '../api/mojiaSkuSync'
+import MojiaSkuSyncView from './MojiaSkuSyncView.vue'
+
+vi.mock('@/core/access/accessPreview', () => ({ useAccessPreviewStore: () => ({ can: () => true }) }))
+vi.mock('../api/mojiaSkuSync', () => ({
+  getMojiaSkuSyncConfig: vi.fn().mockResolvedValue({ autoSyncEnabled: false }),
+  listMojiaSkuSync: vi.fn(), retryMojiaSkuSync: vi.fn(), updateMojiaSkuSync: vi.fn(),
+  submitLingxingVerificationCode: vi.fn(), testLingxingConnection: vi.fn(),
+}))
+let wrapper: VueWrapper | undefined
+async function mountView() {
+  wrapper = mount(MojiaSkuSyncView, {
+    attachTo: document.body,
+    global: { plugins: [ElementPlus], provide: { [UI_PREFERENCE_SCOPE as symbol]: computed(() => 'mojia-test') } },
+  })
+  await flushPromises()
+  return wrapper
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  localStorage.clear()
+  vi.mocked(listMojiaSkuSync).mockResolvedValue({
+    records: [{ id: 'record-1', measurementKind: 'SKU', boxCode: '', skuCode: 'SKU-TEST', lengthCm: 20, widthCm: 10, heightCm: 10, weightKg: 1, revision: 1 }],
+    page: 1, size: 20, total: 70, pages: 4,
+  })
+})
+afterEach(() => { wrapper?.unmount(); wrapper = undefined; document.body.innerHTML = '' })
+
+describe('MojiaSkuSyncView shared pagination', () => {
+  it('preserves server paging and resets to page one when querying or changing page size', async () => {
+    const view = await mountView()
+    expect(view.get('h1').text()).toBe('称重机器')
+    expect(view.getComponent(DataTable).props('pageSizes')).toEqual([10, 20, 30, 40, 50, 100])
+    view.getComponent(DataTable).vm.$emit('update:page', 2)
+    await flushPromises()
+    expect(listMojiaSkuSync).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2, size: 20 }))
+    await view.get('input[placeholder="搜索箱码或 SKU"]').setValue('SKU-QUERY')
+    await view.get('.sync-filters .el-button--primary').trigger('click')
+    await flushPromises()
+    expect(listMojiaSkuSync).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, code: 'SKU-QUERY' }))
+    view.getComponent(DataTable).vm.$emit('update:page', 2)
+    await flushPromises()
+    vi.mocked(listMojiaSkuSync).mockClear()
+    view.getComponent(DataTable).vm.$emit('update:pageSize', 50)
+    await flushPromises()
+    expect(listMojiaSkuSync).toHaveBeenCalledTimes(1)
+    expect(listMojiaSkuSync).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, size: 50, code: 'SKU-QUERY' }))
+  })
+
+  it('restores resized columns after remount while preserving query buttons and operation permissions', async () => {
+    const view = await mountView()
+    expect(view.find('button[aria-label="列设置"]').exists()).toBe(true)
+    expect(view.get('.sync-filters .el-button--primary').classes()).not.toContain('density-action')
+    expect(view.getComponent(DataTable).props('columns')[0]).toMatchObject({ key: 'actions', fixed: 'left' })
+    view.getComponent({ name: 'ElTable' }).vm.$emit('header-dragend', 260, 180, { columnKey: 'sourceCode' })
+    await flushPromises()
+    expect(JSON.parse(localStorage.getItem(preferenceStorageKey('table', 'mojia-test', 'mojia-sku-sync-table'))!).widths.sourceCode).toBe(260)
+    view.unmount()
+    wrapper = undefined
+    const restored = await mountView()
+    const column = restored.findAllComponents({ name: 'ElTableColumn' }).find(item => item.props('columnKey') === 'sourceCode')!
+    expect(column.props('width')).toBe(260)
+    expect(restored.get('.el-table__body .admin-text-actions').findAll('button').map(button => button.text())).toEqual(['编辑', '人工推送'])
+  })
+})

src/modules/overseas-warehouse/pages/MojiaSkuSyncView.vue

@@ -2,7 +2,7 @@
 import '@/styles/adminDensity.css'
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { Cable, Edit3, RefreshCw, RotateCw } from '@lucide/vue'
+import { Cable, RefreshCw } from '@lucide/vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import ListPageLayout from '@/shared/components/ListPageLayout.vue'
@@ -188,18 +188,10 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
 <template>
   <AdminPage class="admin-density mojia-sku-sync-page">
     <ListPageLayout aria-label="称重机器">
-      <section class="surface-panel table-panel" :aria-busy="loading">
-        <el-alert v-if="error" type="error" :title="error" show-icon :closable="false" />
-        <el-alert
-          :type="autoSyncEnabled ? 'warning' : 'info'"
-          :title="autoSyncEnabled ? '领星自动同步已开启' : '领星自动同步已关闭，仅支持人工推送'"
-          description="开关由 Nacos 配置 firstleg.lingxing.auto-sync-enabled 控制。"
-          show-icon
-          :closable="false"
-        />
-        <DataTable :data="rows" :columns="columns" :loading="loading" row-key="id" border stripe empty-text="暂无墨家机器上传记录">
-          <template #toolbar-start>
-            <div class="sync-filters">
+      <DataTable v-model:page="page" v-model:page-size="size" :total="total" :page-sizes="[10, 20, 30, 40, 50, 100]" @update:page="load" @update:page-size="search" appearance="integrated" :stripe="false" column-settings-mode="show" preference-key="mojia-sku-sync-table" :data="rows" :columns="columns" :loading="loading" :aria-busy="loading" row-key="id" border empty-text="暂无墨家机器上传记录">
+          <template #toolbar-start><h1>称重机器</h1></template>
+          <template #filters>
+            <div class="sync-filters query-toolbar">
               <el-input v-model.trim="form.code" clearable placeholder="搜索箱码或 SKU" @keyup.enter="search" />
               <el-select v-model="form.measurementKind" clearable placeholder="上传类型" style="width: 130px"><el-option label="箱码" value="BOX_LABEL" /><el-option label="SKU" value="SKU" /></el-select>
               <el-select v-model="form.syncStatus" clearable placeholder="同步状态" style="width: 140px">
@@ -210,11 +202,20 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
               <el-button :loading="testingConnection" @click="testConnection"><Cable :size="16" />测试连接</el-button>
             </div>
           </template>
+          <template #notices><el-alert v-if="error" type="error" :title="error" show-icon :closable="false" /><el-alert
+          :type="autoSyncEnabled ? 'warning' : 'info'"
+          :title="autoSyncEnabled ? '领星自动同步已开启' : '领星自动同步已关闭，仅支持人工推送'"
+          description="开关由 Nacos 配置 firstleg.lingxing.auto-sync-enabled 控制。"
+          show-icon
+          :closable="false"
+        /></template>
+
+
           <template #toolbar-actions><el-button :loading="loading" @click="load"><RefreshCw :size="16" />刷新</el-button></template>
           <template #actions="{ row }">
-            <div class="density-actions">
-              <el-button v-if="canEdit" class="density-action" @click="openEdit(asRecord(row))"><Edit3 :size="15" />编辑</el-button>
-              <el-button v-if="canRetry && row.measurementKind === 'SKU' && row.syncStatus !== 'SUCCESS'" class="density-action" data-tone="primary" :loading="actionId === row.id" @click="retry(asRecord(row))"><RotateCw :size="15" />人工推送</el-button>
+            <div class="density-actions row-actions admin-text-actions">
+              <el-button v-if="canEdit" class="density-action" @click="openEdit(asRecord(row))">编辑</el-button>
+              <el-button v-if="canRetry && row.measurementKind === 'SKU' && row.syncStatus !== 'SUCCESS'" class="density-action" data-tone="primary" :loading="actionId === row.id" @click="retry(asRecord(row))">人工推送</el-button>
             </div>
           </template>
           <template #sourceCode="{ row }">{{ row.measurementKind === 'SKU' ? row.skuCode : row.boxCode }}</template>
@@ -226,8 +227,6 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
           <template #measuredAt="{ row }">{{ formatTime(row.measuredAt) }}</template>
           <template #failure="{ row }">{{ row.syncFailureReason || '—' }}</template>
         </DataTable>
-        <div class="sync-pagination"><el-pagination v-model:current-page="page" v-model:page-size="size" :total="total" background layout="total, sizes, prev, pager, next" @current-change="load" @size-change="search" /></div>
-      </section>
     </ListPageLayout>
     <AppDialog v-model="editOpen" class="admin-density-dialog" title="编辑 SKU 测量修正版" width="min(620px, calc(100vw - 28px))" confirm-text="保存并重新同步" :confirm-loading="Boolean(actionId)" @confirm="saveEdit">
       <el-form label-position="top" class="sync-edit-form">

src/modules/overseas-warehouse/pages/OutboundsView.vue

@@ -196,11 +196,16 @@ onMounted(load)
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="出库单">
     <OperationErrorToast :details="mutationError" />
-    <template #toolbar><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="出库单筛选" preference-key="overseas-outbounds-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-    <template v-if="error" #state><LoadErrorState title="出库单列表加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template>
-    <section v-if="!error" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-outbounds" row-key="id" empty-text="暂无出库单" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!error" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-outbounds" row-key="id" empty-text="暂无出库单" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>出库单</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="出库单筛选" preference-key="overseas-outbounds-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+        <template #notices><template v-if="error"><LoadErrorState title="出库单列表加载失败" :message="error.message" @retry="load"><template #details><ApiErrorMeta :details="error" /></template></LoadErrorState></template></template>
+
+
       <template #toolbar-actions><el-button v-if="access.can(permission.outboundCreate)" type="primary" @click="openCreate"><Plus :size="16" />新建出库单</el-button></template>
-      <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row as OutboundRow)">详情</el-button><el-button class="density-action" data-tone="danger" v-if="canCancel(row as OutboundRow)" size="small" @click="cancel(row as OutboundRow)">取消</el-button></div></template>
+      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row as OutboundRow)">详情</el-button><el-button class="density-action" data-tone="danger" v-if="canCancel(row as OutboundRow)" size="small" @click="cancel(row as OutboundRow)">取消</el-button></div></template>
       <template #outboundType="{ row }">{{ outboundTypeLabel(row.outboundType) }}</template>
       <template #status="{ row }"><StatusBadge :status="row.status === 'CANCELLED' ? '已取消' : row.status === 'OUTBOUNDED' ? '已出库' : row.status === 'PICKED' ? '已拣货' : row.status === 'WAIT_OUTBOUND' ? '待出库' : row.status === 'PICKING' ? '拣货中' : row.status === 'WAIT_PICK' ? '待拣货' : '未知状态'" /></template>
     </DataTable></section>

src/modules/overseas-warehouse/pages/PalletsView.vue

@@ -146,11 +146,16 @@ onMounted(initialize)
   <AdminPage class="admin-density"><OperationErrorToast :details="mutationError" />
   <section class="summary-grid" aria-label="海外托盘数量概览"><article><span>托盘总数</span><strong>{{ summary.totalCount }}</strong></article><article><span>闲置托盘</span><strong class="idle">{{ summary.idleCount }}</strong></article><article><span>占用托盘</span><strong class="occupied">{{ summary.occupiedCount }}</strong></article><article><span>已报废</span><strong>{{ summary.scrappedCount }}</strong></article></section>
   <ListPageLayout aria-label="托盘管理列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading || contextLoading" ariaLabel="托盘筛选" preference-key="overseas-pallets-query" @search="search" @reset="resetSearch" /></template>
-    <template v-if="loadError" #state><LoadErrorState title="托盘数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="retryLoad"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-pallets" row-key="id" empty-text="暂无托盘" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-pallets" row-key="id" empty-text="暂无托盘" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>托盘管理</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading || contextLoading" ariaLabel="托盘筛选" preference-key="overseas-pallets-query" @search="search" @reset="resetSearch" /></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="托盘数据加载失败" :message="loadError.message" :loading="loading || contextLoading" @retry="retryLoad"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
+
+
       <template #toolbar-actions><el-button v-if="access.can(permission.palletCreate)" type="primary" @click="openCreate"><Plus :size="16" />新增托盘</el-button></template>
-      <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button v-if="access.can(permission.palletList)" class="density-action" data-tone="neutral" size="small" :loading="printingId === row.id" :disabled="Boolean(printingId) && printingId !== row.id" @click="printPallet(row)">打印</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.palletEdit)" size="small" @click="openEdit(row)">编辑</el-button></div></template>
+      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button v-if="access.can(permission.palletList)" class="density-action" data-tone="neutral" size="small" :loading="printingId === row.id" :disabled="Boolean(printingId) && printingId !== row.id" @click="printPallet(row)">打印</el-button><el-button class="density-action" data-tone="neutral" v-if="access.can(permission.palletEdit)" size="small" @click="openEdit(row)">编辑</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条托盘</template>
     </DataTable></section>
   </ListPageLayout>

src/modules/overseas-warehouse/pages/RelabelOrdersView.vue

@@ -190,11 +190,16 @@ watch(dialogOpen, (open) => { if (!open) createIdempotencyKey.value = '' })
 
 <template>
   <AdminPage class="admin-density"><ListPageLayout aria-label="换标单列表">
-    <template #toolbar><QueryToolbar v-model="filters" class="surface-panel" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
-    <template v-if="loadError" #state><LoadErrorState title="换标单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template>
-    <section v-if="!loadError" class="surface-panel table-panel"><DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-relabel-orders" row-key="orderNo" empty-text="暂无换标单" @update:page="load()" @update:page-size="page = 1; load()">
+
+
+    <section><DataTable appearance="integrated" :stripe="false" column-settings-mode="show" :results-visible="!loadError" v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :loading="loading" :total="total" preference-key="overseas-relabel-orders" row-key="orderNo" empty-text="暂无换标单" @update:page="load()" @update:page-size="page = 1; load()">
+        <template #toolbar-start><h1>换标单</h1></template>
+        <template #filters><QueryToolbar v-model="filters" :fields="fields" :loading="loading" ariaLabel="换标单筛选" preference-key="overseas-relabel-orders-query" :search-on-reset="false" @search="search" @reset="reset" /></template>
+        <template #notices><template v-if="loadError"><LoadErrorState title="换标单加载失败" :message="loadError.message" :loading="loading" @retry="load"><template #details><ApiErrorMeta :details="loadError" /></template></LoadErrorState></template></template>
+
+
       <template #toolbar-actions><el-button v-if="access.can(permission.relabelOrderCreate)" type="primary" @click="openForm('create')"><Plus :size="16" />新增换标单</el-button></template>
-      <template #actions="{ row }"><div class="density-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="warning" v-if="access.can(permission.relabelOrderStatus) && canAudit(row)" size="small" @click="openForm('edit', row)">审核</el-button></div></template>
+      <template #actions="{ row }"><div class="density-actions row-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" size="small" @click="openDetail(row)">查看</el-button><el-button class="density-action" data-tone="warning" v-if="access.can(permission.relabelOrderStatus) && canAudit(row)" size="small" @click="openForm('edit', row)">审核</el-button></div></template>
       <template #pagination-left>共 {{ total }} 条换标单</template>
     </DataTable></section>
   </ListPageLayout>

src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.test.ts

@@ -0,0 +1,92 @@
+import { computed } from 'vue'
+import { flushPromises, mount, type VueWrapper } from '@vue/test-utils'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import ElementPlus from 'element-plus'
+import DataTable from '@/shared/components/DataTable.vue'
+import { UI_PREFERENCE_SCOPE, preferenceStorageKey } from '@/shared/utils/uiLayoutPreference'
+import { getReturnCarton, listReturnCartons, listReturnInventoryMovements, listReturnStock } from '../api/returnInventory'
+import ReturnInventoryManagementView from './ReturnInventoryManagementView.vue'
+
+vi.mock('@/modules/iam', () => ({
+  listPlatformTenants: vi.fn().mockResolvedValue({ records: [{ id: 'customer-1', tenantName: '测试客户', status: 'ACTIVE' }] }),
+  listSharedReceivingOverseasWarehouseOptions: vi.fn().mockResolvedValue([{ id: 'warehouse-1', warehouseName: '测试仓库' }]),
+}))
+vi.mock('../api/returnInventory', () => ({
+  listReturnStock: vi.fn(), listReturnCartons: vi.fn(), listReturnInventoryMovements: vi.fn(),
+  getReturnCarton: vi.fn(), getReturnCartonLabel: vi.fn(),
+}))
+const wrappers: VueWrapper[] = []
+const stock = { customerId: 'customer-1', overseasWarehouseId: 'warehouse-1', skuCode: 'SKU-TEST', totalQuantity: 8, availableQuantity: 6, cartonQuantity: 1, updatedAt: '2026-09-30' }
+const carton = { customerId: 'customer-1', overseasWarehouseId: 'warehouse-1', cartonMark: 'RETURN-BOX-1', status: 'AVAILABLE', skuTypes: 1, totalQuantity: 8, createdAt: '2026-09-30' }
+async function mountView(mode: 'inventory' | 'cartons') {
+  const wrapper = mount(ReturnInventoryManagementView, {
+    props: { mode }, attachTo: document.body,
+    global: { plugins: [ElementPlus], provide: { [UI_PREFERENCE_SCOPE as symbol]: computed(() => 'rollout-test') } },
+  })
+  wrappers.push(wrapper)
+  await flushPromises()
+  return wrapper
+}
+beforeEach(() => {
+  vi.clearAllMocks()
+  localStorage.clear()
+  vi.mocked(listReturnStock).mockResolvedValue({ records: [stock], page: 1, size: 20, total: 45, pages: 3 })
+  vi.mocked(listReturnCartons).mockResolvedValue({ records: [carton], page: 1, size: 20, total: 1, pages: 1 })
+  vi.mocked(listReturnInventoryMovements).mockResolvedValue({ records: [{ ...stock, movementType: 'MERGE', referenceNo: 'MERGE-1', totalDelta: -2, availableDelta: -2, occurredAt: '2026-09-30' }], page: 1, size: 20, total: 1, pages: 1 })
+  vi.mocked(getReturnCarton).mockResolvedValue({ ...carton, items: [{ skuCode: 'SKU-TEST', quantity: 8 }] })
+})
+afterEach(() => {
+  wrappers.splice(0).forEach(wrapper => wrapper.unmount())
+  document.body.innerHTML = ''
+})
+
+describe('ReturnInventoryManagementView shared list', () => {
+  it('keeps query submission and server pagination when using the shared table', async () => {
+    const wrapper = await mountView('inventory')
+    expect(wrapper.get('h1').text()).toBe('退货库存管理')
+    expect(wrapper.text()).toContain('SKU-TEST')
+    expect(wrapper.find('button[aria-label="列设置"]').exists()).toBe(true)
+    await wrapper.get('input[placeholder="SKU"]').setValue('SKU-QUERY')
+    await wrapper.get('.query-panel button').trigger('click')
+    await flushPromises()
+    expect(listReturnStock).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, skuCode: 'SKU-QUERY' }))
+    wrapper.getComponent(DataTable).vm.$emit('update:page', 2)
+    await flushPromises()
+    expect(listReturnStock).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2, size: 20, skuCode: 'SKU-QUERY' }))
+    wrapper.getComponent(DataTable).vm.$emit('update:pageSize', 50)
+    await flushPromises()
+    expect(listReturnStock).toHaveBeenLastCalledWith(expect.objectContaining({ page: 1, size: 50 }))
+  })
+
+  it('keeps stock and movement columns and saved widths independent', async () => {
+    const wrapper = await mountView('inventory')
+    wrapper.getComponent({ name: 'ElTable' }).vm.$emit('header-dragend', 260, 170, { columnKey: 'skuCode' })
+    await flushPromises()
+    const stockKey = preferenceStorageKey('table', 'rollout-test', 'overseas-return-stock')
+    expect(JSON.parse(localStorage.getItem(stockKey)!).widths.skuCode).toBe(260)
+    const tabs = wrapper.getComponent({ name: 'ElTabs' })
+    tabs.vm.$emit('update:modelValue', 'movements')
+    tabs.vm.$emit('tab-change', 'movements')
+    await flushPromises()
+    expect(listReturnInventoryMovements).toHaveBeenCalledWith(expect.objectContaining({ page: 1 }))
+    expect(wrapper.text()).toContain('退货合箱')
+    expect(wrapper.text()).toContain('MERGE-1')
+    expect(wrapper.getComponent(DataTable).props('preferenceKey')).toBe('overseas-return-movements')
+    const skuColumn = wrapper.findAllComponents({ name: 'ElTableColumn' }).find(column => column.props('columnKey') === 'skuCode')!
+    expect(skuColumn.props('width')).not.toBe(260)
+  })
+
+  it('keeps carton details reachable and the operation column fixed first', async () => {
+    const wrapper = await mountView('cartons')
+    const columns = wrapper.getComponent(DataTable).props('columns')
+    expect(columns[0]).toMatchObject({ key: 'actions', fixed: 'left', label: '操作' })
+    expect(wrapper.get('h1').text()).toBe('退货箱号管理')
+    const actions = wrapper.get('.el-table__body .admin-text-actions')
+    expect(actions.findAll('button').map(button => button.text())).toEqual(['详情', '箱唛'])
+    await actions.get('button').trigger('click')
+    await flushPromises()
+    expect(getReturnCarton).toHaveBeenCalledWith('RETURN-BOX-1')
+    expect(document.body.textContent).toContain('退货箱号详情')
+    expect(document.body.textContent).toContain('SKU-TEST')
+  })
+})

src/modules/overseas-warehouse/pages/ReturnInventoryManagementView.vue

@@ -4,6 +4,7 @@ import { computed, onMounted, reactive, ref } from 'vue'
 import { Search } from '@lucide/vue'
 import { ElMessage } from 'element-plus'
 import { listPlatformTenants, listSharedReceivingOverseasWarehouseOptions, type PlatformTenantResource } from '@/modules/iam'
+import DataTable, { type DataTableColumn } from '@/shared/components/DataTable.vue'
 import AdminPage from '@/shared/components/AdminPage.vue'
 import AppDialog from '@/shared/components/AppDialog.vue'
 import { getReturnCarton, getReturnCartonLabel, listReturnCartons, listReturnInventoryMovements, listReturnStock, type ReturnCartonDetail, type ReturnCartonRow, type ReturnInventoryMovement, type ReturnStockRow } from '../api/returnInventory'
@@ -47,15 +48,66 @@ async function loadOptions() {
 async function openCarton(mark: string) { try { detail.value = await getReturnCarton(mark); detailOpen.value = true } catch (e) { ElMessage.error(e instanceof Error ? e.message : '箱号详情加载失败') } }
 async function printLabel(mark: string) { try { const label = await getReturnCartonLabel(mark); const popup = window.open('', '_blank'); if (!popup) return ElMessage.warning('请允许浏览器打开打印窗口'); popup.opener = null; popup.document.open(); popup.document.write(label.printableHtml); popup.document.close(); popup.focus(); popup.print() } catch (e) { ElMessage.error(e instanceof Error ? e.message : '箱唛加载失败') } }
 onMounted(() => { void load(); void loadOptions() })
+const stockColumns: DataTableColumn[] = [
+  { key: 'stock-0', label: '客户', minWidth: 180, slotName: 'stock-0' },
+  { key: 'stock-1', label: '海外仓', minWidth: 180, slotName: 'stock-1' },
+  { key: 'skuCode', label: 'SKU', prop: 'skuCode', minWidth: 170 },
+  { key: 'productNameZh', label: '中文品名', prop: 'productNameZh', minWidth: 180 },
+  { key: 'totalQuantity', label: '总库存', prop: 'totalQuantity', align: 'right' },
+  { key: 'availableQuantity', label: '可用库存', prop: 'availableQuantity', align: 'right' },
+  { key: 'updatedAt', label: '更新时间', prop: 'updatedAt', minWidth: 180 },
+]
+const movementColumns: DataTableColumn[] = [
+  { key: 'movement-0', label: '客户', minWidth: 180, slotName: 'movement-0' },
+  { key: 'movement-1', label: '海外仓', minWidth: 180, slotName: 'movement-1' },
+  { key: 'skuCode', label: 'SKU', prop: 'skuCode', minWidth: 170 },
+  { key: 'productNameZh', label: '中文品名', prop: 'productNameZh', minWidth: 180 },
+  { key: 'movement-4', label: '业务类型', minWidth: 120, slotName: 'movement-4' },
+  { key: 'referenceNo', label: '关联单号/箱号', prop: 'referenceNo', minWidth: 220 },
+  { key: 'totalDelta', label: '总库存变动', prop: 'totalDelta', align: 'right' },
+  { key: 'availableDelta', label: '可用库存变动', prop: 'availableDelta', align: 'right' },
+  { key: 'occurredAt', label: '发生时间', prop: 'occurredAt', minWidth: 180 },
+]
+const cartonColumns: DataTableColumn[] = [
+  { key: 'actions', label: '操作', width: 140, fixed: 'left', slotName: 'carton-0' },
+  { key: 'cartonMark', label: '箱号', prop: 'cartonMark', minWidth: 220 },
+  { key: 'carton-2', label: '客户', minWidth: 180, slotName: 'carton-2' },
+  { key: 'carton-3', label: '海外仓', minWidth: 180, slotName: 'carton-3' },
+  { key: 'sourceReturnNo', label: '来源退货单', prop: 'sourceReturnNo', minWidth: 220 },
+  { key: 'fbaCartonMark', label: 'FBA箱唛', prop: 'fbaCartonMark', minWidth: 180 },
+  { key: 'carton-6', label: '目的仓', minWidth: 180, slotName: 'carton-6' },
+  { key: 'relabelNo', label: '换标单号', prop: 'relabelNo', minWidth: 200 },
+  { key: 'carton-8', label: '换标状态', width: 110, slotName: 'carton-8' },
+  { key: 'carton-9', label: '状态', width: 100, slotName: 'carton-9' },
+  { key: 'skuTypes', label: 'SKU种类', prop: 'skuTypes', align: 'right' },
+  { key: 'totalQuantity', label: '总件数', prop: 'totalQuantity', align: 'right' },
+  { key: 'carton-12', label: '箱规', minWidth: 190, slotName: 'carton-12' },
+  { key: 'weight', label: '重量(kg)', prop: 'weight', align: 'right' },
+  { key: 'createdAt', label: '创建时间', prop: 'createdAt', minWidth: 180 },
+]
+const tableRows = computed(() => props.mode === 'cartons' ? cartonRows.value : inventoryTab.value === 'stock' ? stockRows.value : movementRows.value)
+const tableColumns = computed(() => props.mode === 'cartons' ? cartonColumns : inventoryTab.value === 'stock' ? stockColumns : movementColumns)
 </script>
 
 <template><AdminPage as="div" class="business-page return-inventory-page admin-density">
-  <el-tabs class="density-element-tabs" v-if="mode==='inventory'" v-model="inventoryTab" @tab-change="changeInventoryTab"><el-tab-pane name="stock" ><template #label><span class="density-tab-icon" aria-hidden="true">🏷️</span><span>退货库存</span></template></el-tab-pane><el-tab-pane name="movements" ><template #label><span class="density-tab-icon" aria-hidden="true">📝</span><span>退货进销存明细</span></template></el-tab-pane></el-tabs>
-  <section class="surface-panel query-panel"><el-select v-model="query.customerId" clearable filterable placeholder="全部客户" :loading="optionsLoading"><el-option v-for="item in customerOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-select v-model="query.overseasWarehouseId" clearable filterable placeholder="全部海外仓" :loading="optionsLoading"><el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-input v-model="query.skuCode" clearable placeholder="SKU" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.cartonMark" clearable placeholder="箱号/箱唛" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.returnNo" clearable placeholder="退货单号" @keyup.enter="search" /><el-select v-if="mode==='cartons'" v-model="query.status" clearable placeholder="箱状态"><el-option label="可用" value="AVAILABLE" /><el-option label="已合箱" value="MERGED" /></el-select><el-button type="primary" @click="search"><Search :size="16" />查询</el-button></section>
-  <section class="surface-panel table-panel"><el-table v-if="mode==='inventory' && inventoryTab==='stock'" v-loading="loading" :data="stockRows"><el-table-column label="客户" min-width="180"><template #default="{row}">{{ customerName(row.customerId) }}</template></el-table-column><el-table-column label="海外仓" min-width="180"><template #default="{row}">{{ warehouseName(row.overseasWarehouseId) }}</template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="170" /><el-table-column prop="productNameZh" label="中文品名" min-width="180" /><el-table-column prop="totalQuantity" label="总库存" align="right" /><el-table-column prop="availableQuantity" label="可用库存" align="right" /><el-table-column prop="updatedAt" label="更新时间" min-width="180" /></el-table>
-  <el-table v-else-if="mode==='inventory'" v-loading="loading" :data="movementRows"><el-table-column label="客户" min-width="180"><template #default="{row}">{{ customerName(row.customerId) }}</template></el-table-column><el-table-column label="海外仓" min-width="180"><template #default="{row}">{{ warehouseName(row.overseasWarehouseId) }}</template></el-table-column><el-table-column prop="skuCode" label="SKU" min-width="170" /><el-table-column prop="productNameZh" label="中文品名" min-width="180" /><el-table-column label="业务类型" min-width="120"><template #default="{row}">{{ row.movementType === 'RECEIPT' ? '退货签收' : row.movementType === 'MERGE' ? '退货合箱' : '退货出库' }}</template></el-table-column><el-table-column prop="referenceNo" label="关联单号/箱号" min-width="220" /><el-table-column prop="totalDelta" label="总库存变动" align="right" /><el-table-column prop="availableDelta" label="可用库存变动" align="right" /><el-table-column prop="occurredAt" label="发生时间" min-width="180" /></el-table>
-  <el-table v-else v-loading="loading" :data="cartonRows"><el-table-column label="操作" width="140" fixed="left"><template #default="{row}"><div class="density-actions"><el-button class="density-action" data-tone="neutral" @click="openCarton(row.cartonMark)">详情</el-button><el-button class="density-action" data-tone="neutral" @click="printLabel(row.cartonMark)">箱唛</el-button></div></template></el-table-column><el-table-column prop="cartonMark" label="箱号" min-width="220" /><el-table-column label="客户" min-width="180"><template #default="{row}">{{ customerName(row.customerId) }}</template></el-table-column><el-table-column label="海外仓" min-width="180"><template #default="{row}">{{ warehouseName(row.overseasWarehouseId) }}</template></el-table-column><el-table-column prop="sourceReturnNo" label="来源退货单" min-width="220" /><el-table-column prop="fbaCartonMark" label="FBA箱唛" min-width="180" /><el-table-column label="目的仓" min-width="180"><template #default="{row}">{{ row.destinationWarehouseCode || row.destinationWarehouseName || '—' }}</template></el-table-column><el-table-column prop="relabelNo" label="换标单号" min-width="200" /><el-table-column label="换标状态" width="110"><template #default="{row}">{{ row.relabelStatus === 'COMPLETED' ? '已完成' : row.relabelStatus === 'BOUND' ? '已绑定' : row.relabelStatus || '未绑定' }}</template></el-table-column><el-table-column label="状态" width="100"><template #default="{row}">{{ statusLabel(row.status) }}</template></el-table-column><el-table-column prop="skuTypes" label="SKU种类" align="right" /><el-table-column prop="totalQuantity" label="总件数" align="right" /><el-table-column label="箱规" min-width="190"><template #default="{row}">{{ row.length ? `${row.length}×${row.width}×${row.height} cm` : '—' }}</template></el-table-column><el-table-column prop="weight" label="重量(kg)" align="right" /><el-table-column prop="createdAt" label="创建时间" min-width="180" /></el-table>
-  <el-pagination v-model:current-page="query.page" v-model:page-size="query.size" :total="total" layout="total, sizes, prev, pager, next" :page-sizes="[20,50,100]" @current-change="load" @size-change="query.page=1;load()" /></section>
+
+
+  <DataTable appearance="integrated" :stripe="false" column-settings-mode="show" v-model:page="query.page" v-model:page-size="query.size" :data="tableRows" :columns="tableColumns" :loading="loading" :total="total" :page-sizes="[20, 50, 100]" :preference-key="`overseas-return-${mode === 'inventory' ? inventoryTab : 'cartons'}`" @update:page="load" @update:page-size="query.page = 1; load()">
+    <template #toolbar-start><h1>{{ mode === 'inventory' ? '退货库存管理' : '退货箱号管理' }}</h1></template>
+    <template #filters><el-tabs class="density-element-tabs" v-if="mode==='inventory'" v-model="inventoryTab" @tab-change="changeInventoryTab"><el-tab-pane name="stock" ><template #label><span class="density-tab-icon" aria-hidden="true">🏷️</span><span>退货库存</span></template></el-tab-pane><el-tab-pane name="movements" ><template #label><span class="density-tab-icon" aria-hidden="true">📝</span><span>退货进销存明细</span></template></el-tab-pane></el-tabs><section class="query-toolbar query-panel"><el-select v-model="query.customerId" clearable filterable placeholder="全部客户" :loading="optionsLoading"><el-option v-for="item in customerOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-select v-model="query.overseasWarehouseId" clearable filterable placeholder="全部海外仓" :loading="optionsLoading"><el-option v-for="item in warehouseOptions" :key="item.value" :label="item.label" :value="item.value" /></el-select><el-input v-model="query.skuCode" clearable placeholder="SKU" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.cartonMark" clearable placeholder="箱号/箱唛" @keyup.enter="search" /><el-input v-if="mode==='cartons'" v-model="query.returnNo" clearable placeholder="退货单号" @keyup.enter="search" /><el-select v-if="mode==='cartons'" v-model="query.status" clearable placeholder="箱状态"><el-option label="可用" value="AVAILABLE" /><el-option label="已合箱" value="MERGED" /></el-select><el-button type="primary" @click="search"><Search :size="16" />查询</el-button></section></template>
+    <template #stock-0="{ row }">{{ customerName(row.customerId) }}</template>
+    <template #stock-1="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
+    <template #movement-0="{ row }">{{ customerName(row.customerId) }}</template>
+    <template #movement-1="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
+    <template #movement-4="{ row }">{{ row.movementType === 'RECEIPT' ? '退货签收' : row.movementType === 'MERGE' ? '退货合箱' : '退货出库' }}</template>
+    <template #carton-0="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" @click="openCarton(row.cartonMark)">详情</el-button><el-button class="density-action" data-tone="neutral" @click="printLabel(row.cartonMark)">箱唛</el-button></div></template>
+    <template #carton-2="{ row }">{{ customerName(row.customerId) }}</template>
+    <template #carton-3="{ row }">{{ warehouseName(row.overseasWarehouseId) }}</template>
+    <template #carton-6="{ row }">{{ row.destinationWarehouseCode || row.destinationWarehouseName || '—' }}</template>
+    <template #carton-8="{ row }">{{ row.relabelStatus === 'COMPLETED' ? '已完成' : row.relabelStatus === 'BOUND' ? '已绑定' : row.relabelStatus || '未绑定' }}</template>
+    <template #carton-9="{ row }">{{ statusLabel(row.status) }}</template>
+    <template #carton-12="{ row }">{{ row.length ? `${row.length}×${row.width}×${row.height} cm` : '—' }}</template>
+  </DataTable>
   <AppDialog class="admin-density-dialog" v-model="detailOpen" title="退货箱号详情" width="min(1080px, calc(100vw - 56px))" :show-footer="false"><template v-if="detail"><el-descriptions class="density-descriptions" :column="2" border><el-descriptions-item label="箱号">{{detail.cartonMark}}</el-descriptions-item><el-descriptions-item label="客户">{{customerName(detail.customerId)}}</el-descriptions-item><el-descriptions-item label="海外仓">{{warehouseName(detail.overseasWarehouseId)}}</el-descriptions-item><el-descriptions-item label="来源退货单">{{detail.sourceReturnNo||'—'}}</el-descriptions-item><el-descriptions-item label="FBA箱唛">{{detail.fbaCartonMark||'—'}}</el-descriptions-item><el-descriptions-item label="目的仓">{{detail.destinationWarehouseCode||detail.destinationWarehouseName||'—'}}</el-descriptions-item><el-descriptions-item label="换标单号">{{detail.relabelNo||'—'}}</el-descriptions-item><el-descriptions-item label="换标状态">{{detail.relabelStatus === 'COMPLETED' ? '已完成' : detail.relabelStatus === 'BOUND' ? '已绑定' : detail.relabelStatus || '未绑定'}}</el-descriptions-item><el-descriptions-item label="状态">{{statusLabel(detail.status)}}</el-descriptions-item><el-descriptions-item label="箱规">{{detail.length?`${detail.length}×${detail.width}×${detail.height} cm`:'—'}}</el-descriptions-item><el-descriptions-item label="重量">{{detail.weight?`${detail.weight} kg`:'—'}}</el-descriptions-item></el-descriptions><el-table :data="detail.items" class="detail-items"><el-table-column prop="skuCode" label="SKU" /><el-table-column prop="productNameZh" label="中文品名" /><el-table-column prop="quantity" label="数量" align="right" /></el-table></template></AppDialog>
 </AdminPage></template>
 <style scoped>.return-inventory-page{display:grid;gap:var(--admin-space-5)}.query-panel{display:flex;gap:var(--admin-space-4);flex-wrap:wrap;padding:var(--admin-space-5)}.query-panel .el-input,.query-panel .el-select{width:180px}.table-panel{padding:var(--admin-space-5)}.el-pagination{justify-content:flex-end;margin-top:var(--admin-space-5)}.detail-items{margin-top:var(--admin-space-5)}</style>

src/modules/overseas-warehouse/pages/prototypeContract.test.ts

@@ -244,7 +244,7 @@ describe('overseas warehouse first-batch prototype contract', () => {
       expect(value).toMatch(/total\.value = \w+\.total/)
       expect(value).toContain('v-model:page="page"')
       expect(value).toContain('v-model:page-size="pageSize"')
-      expect(value).toContain(':total="total"')
+      expect(value).toMatch(/:total="(?:total|statusTab === '柜子' \? undefined : total)"/)
       expect(value).toContain('@update:page="load()"')
       expect(value).toContain('@update:page-size="page = 1; load()"')
     }
@@ -341,11 +341,11 @@ describe('overseas warehouse first-batch prototype contract', () => {
       const value = source(fileName)
       expect(value).toContain(routeName)
       if (fileName === 'DispatchesView.vue') {
-        expect(value).toContain('<RowActions :actions="rowActions(row as DispatchListItem)"')
+        expect(value).toMatch(/<RowActions\b[^>]*:actions="rowActions\(row as DispatchListItem\)"/)
         expect(value).toContain("{ key: 'detail', label: '查看', priority: 300 }")
         expect(value).toContain("if (command === 'detail') openDetail(row)")
       } else if (fileName === 'LastMileOrdersView.vue') {
-        expect(value).toContain('<RowActions :actions="lastMileRowActions(row as LastMileOrderListItem)"')
+        expect(value).toContain('<RowActions text-actions :actions="lastMileRowActions(row as LastMileOrderListItem)"')
         expect(value).toContain("{ key: 'detail', label: '查看', priority: 500 }")
         expect(value).toContain("if (command === 'detail') openDetail(row)")
       } else {

src/modules/overseas-warehouse/routes.ts

@@ -6,7 +6,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/last-mile-orders',
     name: 'overseas-last-mile-orders',
     component: () => import('./pages/LastMileOrdersView.vue'),
-    meta: { title: '尾程订单', description: '管理海外接柜后的尾程订单与入仓衔接', permission: permission.lastMileOrderList },
+    meta: { showPageHeading: false, title: '尾程订单', description: '管理海外接柜后的尾程订单与入仓衔接', permission: permission.lastMileOrderList },
   },
   {
     path: 'overseas-warehouse/last-mile-orders/:orderId',
@@ -18,7 +18,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/inbound-orders',
     name: 'overseas-inbound-orders',
     component: () => import('./pages/InboundOrdersView.vue'),
-    meta: { title: '入库单', description: '管理海外合作仓入库、预约与排车衔接', permission: permission.inboundOrderList },
+    meta: { showPageHeading: false, title: '入库单', description: '管理海外合作仓入库、预约与排车衔接', permission: permission.inboundOrderList },
   },
   {
     path: 'overseas-warehouse/inbound-orders/:orderId',
@@ -30,7 +30,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/dispatches',
     name: 'overseas-dispatches',
     component: () => import('./pages/DispatchesView.vue'),
-    meta: { title: '排车列表', description: '查看海外仓车辆调度、预约与发车状态', permission: permission.dispatchList },
+    meta: { title: '排车列表', description: '查看海外仓车辆调度、预约与发车状态', permission: permission.dispatchList, showPageHeading: false },
   },
   {
     path: 'overseas-warehouse/dispatches/:dispatchNo',
@@ -42,7 +42,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/outbounds',
     name: 'overseas-outbounds',
     component: () => import('./pages/OutboundsView.vue'),
-    meta: { title: '出库单', description: '查询海外仓出库单并创建一件代发出库', permission: permission.outboundList },
+    meta: { showPageHeading: false, title: '出库单', description: '查询海外仓出库单并创建一件代发出库', permission: permission.outboundList },
   },
   {
     path: 'overseas-warehouse/outbounds/:outboundNo',
@@ -54,7 +54,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/delivery-orders',
     name: 'overseas-delivery-orders',
     component: () => import('./pages/DeliveryOrdersView.vue'),
-    meta: { title: '派送单列表', description: '查询海外仓派送订单及履约信息', permission: permission.deliveryList },
+    meta: { showPageHeading: false, title: '派送单列表', description: '查询海外仓派送订单及履约信息', permission: permission.deliveryList },
   },
   {
     path: 'overseas-warehouse/delivery-orders/:deliveryNo',
@@ -66,39 +66,39 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/exception-orders',
     name: 'overseas-exception-orders',
     component: () => import('./pages/ExceptionOrdersView.vue'),
-    meta: { title: '异常订单', description: '查询和新增海外仓异常、拒收及退货单据', permission: permission.exceptionOrderList },
+    meta: { showPageHeading: false, title: '异常订单', description: '查询和新增海外仓异常、拒收及退货单据', permission: permission.exceptionOrderList },
   },
   {
     path: 'overseas-warehouse/customer-visits',
     name: 'overseas-customer-visits',
     component: () => import('./pages/CustomerVisitsView.vue'),
-    meta: { title: '客户回访', description: '跟进已完成派送单并维护入仓单维度回访资料', permission: permission.customerVisitList },
+    meta: { showPageHeading: false, title: '客户回访', description: '跟进已完成派送单并维护入仓单维度回访资料', permission: permission.customerVisitList },
   },
   {
     path: 'overseas-warehouse/inventory',
     name: 'overseas-inventory',
     component: () => import('./pages/InventoryView.vue'),
-    meta: { title: '库存管理', description: '查看海外仓库存汇总、可用量和库内分布', permission: permission.inventoryList },
+    meta: { showPageHeading: false, title: '库存管理', description: '查看海外仓库存汇总、可用量和库内分布', permission: permission.inventoryList },
   },
   {
     path: 'overseas-warehouse/return-inventory',
     name: 'overseas-return-inventory',
     component: () => import('./pages/ReturnInventoryManagementView.vue'),
     props: { mode: 'inventory' },
-    meta: { title: '退货库存管理', description: '按客户和 SKU 查询退货签收后的可用库存', permission: permission.returnInventoryList },
+    meta: { showPageHeading: false, title: '退货库存管理', description: '按客户和 SKU 查询退货签收后的可用库存', permission: permission.returnInventoryList },
   },
   {
     path: 'overseas-warehouse/return-cartons',
     name: 'overseas-return-cartons',
     component: () => import('./pages/ReturnInventoryManagementView.vue'),
     props: { mode: 'cartons' },
-    meta: { title: '退货箱号管理', description: '查询合箱后的箱号、箱规和箱内 SKU', permission: permission.returnCartonsList },
+    meta: { showPageHeading: false, title: '退货箱号管理', description: '查询合箱后的箱号、箱规和箱内 SKU', permission: permission.returnCartonsList },
   },
   {
     path: 'overseas-warehouse/inventory-transactions',
     name: 'overseas-inventory-transactions',
     component: () => import('./pages/InventoryTransactionsView.vue'),
-    meta: { title: '进销存记录', description: '查看海外仓库存的只读变动流水', permission: permission.inventoryList },
+    meta: { showPageHeading: false, title: '进销存记录', description: '查看海外仓库存的只读变动流水', permission: permission.inventoryList },
   },
   {
     path: 'overseas-warehouse/inventory/:inventoryId',
@@ -110,7 +110,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/relabel-orders',
     name: 'overseas-relabel-orders',
     component: () => import('./pages/RelabelOrdersView.vue'),
-    meta: { title: '换标单', description: '管理海外仓换标作业要求与费用信息', permission: permission.relabelOrderList },
+    meta: { showPageHeading: false, title: '换标单', description: '管理海外仓换标作业要求与费用信息', permission: permission.relabelOrderList },
   },
   {
     path: 'overseas-warehouse/relabel-orders/:orderId',
@@ -122,7 +122,7 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/pallets',
     name: 'overseas-pallets',
     component: () => import('./pages/PalletsView.vue'),
-    meta: { title: '托盘管理', description: '管理海外仓托盘主数据与使用状态', permission: permission.palletList },
+    meta: { showPageHeading: false, title: '托盘管理', description: '管理海外仓托盘主数据与使用状态', permission: permission.palletList },
   },
   {
     path: 'overseas-warehouse/pallets/:palletId',
@@ -134,12 +134,12 @@ export const overseasWarehouseRoutes = [
     path: 'overseas-warehouse/locations',
     name: 'overseas-locations',
     component: () => import('./pages/LocationsView.vue'),
-    meta: { title: '库位管理', description: '维护海外仓普通库位与 A0 共享溢出位', permission: permission.locationList },
+    meta: { showPageHeading: false, title: '库位管理', description: '维护海外仓普通库位与 A0 共享溢出位', permission: permission.locationList },
   },
   {
     path: 'general/mojia-sku-sync',
     name: 'mojia-sku-sync',
     component: () => import('./pages/MojiaSkuSyncView.vue'),
-    meta: { title: '称重机器', description: '查看墨家机器上传的箱码和 SKU 测量记录', permission: permission.mojiaSkuSyncList },
+    meta: { showPageHeading: false, title: '称重机器', description: '查看墨家机器上传的箱码和 SKU 测量记录', permission: permission.mojiaSkuSyncList },
   },
 ] satisfies RouteRecordRaw[]