merge latest release/test and preserve loading edit behavior

src/modules/container-loading/pages/ContainersView.vue

@@ -196,7 +196,7 @@ onMounted(() => { void Promise.all([loadWarehouses(), loadRows()]) })
         <section v-if="!warehouseError && !loadError" class="surface-panel table-panel">
           <DataTable v-model:page="page" v-model:page-size="pageSize" :data="rows" :columns="columns" :total="total" :loading="loading" preference-key="container-loading-table" empty-text="暂无货柜">
             <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate"><Plus :size="16" />新增货柜</el-button></template>
-            <template #actions="{ row }"><div class="row-actions"><el-button link type="primary" :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="canEdit && row.planStatus !== 'COMPLETED'" link type="primary" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="canSmartLoading && row.planStatus === 'EDITING'" link type="primary" @click="goWorkbench(row)"><Sparkles :size="15" />排柜</el-button></div></template>
+            <template #actions="{ row }"><div class="row-actions"><el-button link type="primary" :aria-label="containerViewLabel(row as ContainerBookingResource)" @click="openDetail(row)"><Eye :size="15" />查看</el-button><el-button v-if="canEdit && row.planStatus !== 'COMPLETED'" link type="primary" @click="openEdit(row)"><Pencil :size="15" />编辑</el-button><el-button v-if="canSmartLoading && row.planStatus !== 'COMPLETED'" link type="primary" @click="goWorkbench(row)"><Sparkles :size="15" />排柜</el-button></div></template>
             <template #cabinet="{ row }"><strong>{{ row.cabinetNo }}</strong><small>{{ row.bookingNo }}</small></template>
             <template #containerNo="{ row }">{{ row.containerNo || '待录入' }}</template>
             <template #status="{ row }"><el-tag :type="row.planStatus === 'COMPLETED' ? 'success' : row.planStatus === 'LOADING' ? 'warning' : 'info'">{{ statusText(row.planStatus) }}</el-tag></template>

src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts

@@ -11,11 +11,6 @@ import {
   recommendSmartLoading,
 } from '../api/platformContainerLoading'
 
-const { routerPush } = vi.hoisted(() => ({ routerPush: vi.fn() }))
-
-vi.mock('vue-router', () => ({
-  useRouter: () => ({ push: routerPush }),
-}))
 vi.mock('@/core/access/accessPreview', () => ({
   useAccessPreviewStore: () => ({ can: () => true }),
 }))
@@ -87,38 +82,22 @@ describe('GlobalSmartLoadingView', () => {
     expect(wrapper.text()).toContain('CB-1 装柜方案')
   })
 
-  it('keeps pushed containers visible and routes them to the preload list without loading an editing draft', async () => {
-    const pushed = { ...container, id: '9007199254740995', planId: '9007199254740996', cabinetNo: 'CB-2', planStatus: 'LOADING' as const }
-    vi.mocked(listContainers).mockResolvedValue({ records: [pushed], page: 1, size: 100, total: 1, pages: 1 })
+  it('keeps loading containers editable and hides completed containers', async () => {
+    const loadingContainer = { ...container, id: '9007199254740995', cabinetNo: 'CB-LOADING', planStatus: 'LOADING' as const }
+    const completedContainer = { ...container, id: '9007199254740996', cabinetNo: 'CB-COMPLETED', planStatus: 'COMPLETED' as const }
+    vi.mocked(listContainers).mockResolvedValue({ records: [completedContainer, loadingContainer], page: 1, size: 100, total: 2, pages: 1 })
+    vi.mocked(getSmartLoadingPlanByBooking).mockResolvedValue({ ...plan, bookingId: loadingContainer.id, status: 'LOADING' })
+
     const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
     await flushPromises()
 
-    expect(getSmartLoadingPlanByBooking).not.toHaveBeenCalled()
-    expect(listSmartLoadingCandidates).not.toHaveBeenCalled()
-    expect(wrapper.text()).toContain('该柜次正在预装流程中')
-    expect(wrapper.text()).not.toContain('智能推荐')
-    expect(wrapper.findAll('button').some((item) => item.text().trim() === '推送预装')).toBe(false)
-
-    await wrapper.findAll('button').find((item) => item.text().includes('查看预装清单'))!.trigger('click')
-    expect(routerPush).toHaveBeenCalledWith({
-      name: 'loading-plans',
-      query: { planId: pushed.planId, warehouseId: pushed.warehouseId },
-    })
-  })
-
-  it('routes completed containers to the read-only loading list', async () => {
-    const completed = { ...container, id: '9007199254740997', planId: '9007199254740998', cabinetNo: 'CB-3', planStatus: 'COMPLETED' as const }
-    vi.mocked(listContainers).mockResolvedValue({ records: [completed], page: 1, size: 100, total: 1, pages: 1 })
-    const wrapper = mount(GlobalSmartLoadingView, { global: { plugins: [ElementPlus] } })
-    await flushPromises()
-
-    expect(getSmartLoadingPlanByBooking).not.toHaveBeenCalled()
-    expect(wrapper.text()).toContain('该柜次已完成装柜')
-    await wrapper.findAll('button').find((item) => item.text().includes('查看装柜清单'))!.trigger('click')
-    expect(routerPush).toHaveBeenCalledWith({
-      name: 'loading-lists',
-      query: { planId: completed.planId, warehouseId: completed.warehouseId },
-    })
+    expect(getSmartLoadingPlanByBooking).toHaveBeenCalledWith(loadingContainer.id)
+    expect(wrapper.text()).toContain('CB-LOADING')
+    expect(wrapper.text()).toContain('装柜中')
+    expect(wrapper.text()).not.toContain('CB-COMPLETED')
+    expect(wrapper.text()).toContain('智能推荐')
+    expect(wrapper.text()).toContain('加入')
+    expect(wrapper.text()).not.toContain('推送预装')
   })
 
   it('refreshes the latest plan after A0409 without losing the selected container', async () => {

src/modules/container-loading/pages/GlobalSmartLoadingView.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue'
-import { useRouter } from 'vue-router'
 import { Plus, RefreshCw, Save, Sparkles, Trash2, Upload } from '@lucide/vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { useAccessPreviewStore } from '@/core/access/accessPreview'
@@ -31,7 +30,6 @@ import type {
 } from '../types'
 
 const access = useAccessPreviewStore()
-const router = useRouter()
 const containers = ref<ContainerBookingResource[]>([])
 const selectedContainerId = ref('')
 const plan = ref<SmartLoadingPlan | null>(null)
@@ -56,8 +54,7 @@ const canAssign = computed(() => access.can('platform:firstleg:smart-loading:ass
 const canDelete = computed(() => access.can('platform:firstleg:smart-loading:delete'))
 const canPush = computed(() => access.can('platform:firstleg:smart-loading:push'))
 const selectedContainer = computed(() => containers.value.find((item) => item.id === selectedContainerId.value) || null)
-const editable = computed(() => plan.value?.status === 'EDITING')
-const selectedPlanStatus = computed(() => selectedContainer.value?.planStatus || null)
+const editable = computed(() => plan.value?.status === 'EDITING' || plan.value?.status === 'LOADING')
 const assignedDetailIds = computed(() => new Set((plan.value?.items || []).map((item) => item.inboundDetailId)))
 const totalPackages = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.packageCount || 0), 0))
 const totalVolume = computed(() => (plan.value?.items || []).reduce((sum, item) => sum + Number(item.volumeCbm || 0), 0))
@@ -78,8 +75,7 @@ const queryFields = computed<QueryField[]>(() => [
   { key: 'warehouseId', type: 'select', label: '装柜仓库', options: warehouseOptions.value, width: 190 },
   { key: 'status', type: 'select', label: '柜次状态', width: 160, options: [
     { label: '可编辑', value: 'EDITING' },
-    { label: '已推送预装', value: 'LOADING' },
-    { label: '已完成', value: 'COMPLETED' },
+    { label: '装柜中', value: 'LOADING' },
   ] },
 ])
 
@@ -88,6 +84,7 @@ const filteredContainers = computed(() => {
   const warehouseId = String(appliedQuery.value.warehouseId || '')
   const status = String(appliedQuery.value.status || '')
   return containers.value.filter((item) => {
+    if (item.planStatus === 'COMPLETED') return false
     if (warehouseId && item.warehouseId !== warehouseId) return false
     if (status && item.planStatus !== status) return false
     if (!keyword) return true
@@ -134,7 +131,7 @@ function formatNumber(value: number, digits = 3) {
 function candidateRow(source: object) { return source as SmartLoadingCandidate }
 function itemRow(source: object) { return source as SmartLoadingItem }
 function statusLabel(status: ContainerPlanStatus) {
-  return ({ EDITING: '可编辑', LOADING: '已推送预装', COMPLETED: '已完成' } as const)[status]
+  return ({ EDITING: '可编辑', LOADING: '装柜中', COMPLETED: '已完成' } as const)[status]
 }
 function statusType(status: ContainerPlanStatus) {
   return status === 'EDITING' ? 'primary' : status === 'LOADING' ? 'warning' : 'success'
@@ -171,9 +168,7 @@ async function loadSelectedData(preserved: Record<string, number> = {}) {
   const request = ++selectionRequest
   clearSelectionData()
   if (!container) return
-  // LOADING/COMPLETED 计划已离开智能装柜编辑态。不要调用仅支持 EDITING
-  // 草稿恢复的接口，否则后端会按契约返回“已推送预装”冲突。
-  if (container.planStatus !== 'EDITING') return
+  if (container.planStatus === 'COMPLETED') return
   selectionLoading.value = true
   try {
     const [candidateResult, planResult] = await Promise.all([
@@ -195,14 +190,6 @@ async function loadSelectedData(preserved: Record<string, number> = {}) {
   }
 }
 
-function openList(status: 'LOADING' | 'COMPLETED') {
-  const routeName = status === 'LOADING' ? 'loading-plans' : 'loading-lists'
-  const params = selectedContainer.value
-    ? { planId: selectedContainer.value.planId || undefined, warehouseId: selectedContainer.value.warehouseId }
-    : undefined
-  void router.push({ name: routeName, query: params })
-}
-
 async function load() {
   loading.value = true
   loadError.value = null
@@ -211,7 +198,9 @@ async function load() {
     const remainingPages = firstPage.pages > 1
       ? await Promise.all(Array.from({ length: firstPage.pages - 1 }, (_, index) => listContainers({ page: index + 2, size: 100 })))
       : []
-    containers.value = [firstPage, ...remainingPages].flatMap((page) => page.records)
+    containers.value = [firstPage, ...remainingPages]
+      .flatMap((page) => page.records)
+      .filter((item) => item.planStatus !== 'COMPLETED')
     if (!filteredContainers.value.some((item) => item.id === selectedContainerId.value)) selectedContainerId.value = preferredContainerId()
     await loadSelectedData()
   } catch (error) {
@@ -385,7 +374,7 @@ onMounted(load)
           </section>
 
           <aside class="dispatch-pane container-pane" aria-label="货柜列表">
-            <header class="pane-header"><div><strong>货柜</strong><small>可用、装柜中与已完成</small></div></header>
+            <header class="pane-header"><div><strong>货柜</strong><small>可用与装柜中</small></div></header>
             <div v-loading="loading" class="container-list">
               <el-empty v-if="!filteredContainers.length" description="暂无符合条件的货柜" :image-size="72" />
               <button
@@ -412,7 +401,7 @@ onMounted(load)
               <div class="plan-actions">
                 <el-tooltip content="刷新当前柜次" placement="top"><el-button aria-label="刷新当前柜次" :loading="selectionLoading" @click="loadSelectedData()"><RefreshCw :size="16" /></el-button></el-tooltip>
                 <el-button v-if="canAssign && editable" type="primary" plain :loading="mutating" @click="recommend"><Sparkles :size="16" />智能推荐</el-button>
-                <el-button v-if="canPush && editable" type="primary" :disabled="!plan?.items.length" :loading="mutating" @click="pushPreload"><Upload :size="16" />推送预装</el-button>
+                <el-button v-if="canPush && plan?.status === 'EDITING'" type="primary" :disabled="!plan.items.length" :loading="mutating" @click="pushPreload"><Upload :size="16" />推送预装</el-button>
               </div>
             </header>
 
@@ -420,18 +409,6 @@ onMounted(load)
               <template #details><ApiErrorMeta :details="selectionError" /></template>
             </LoadErrorState>
             <el-empty v-else-if="!selectedContainer" description="请选择一个货柜" />
-            <section v-else-if="selectedPlanStatus === 'LOADING'" class="readonly-status-card" aria-label="预装中柜次">
-              <el-tag type="warning">已推送预装</el-tag>
-              <strong>该柜次正在预装流程中</strong>
-              <p>智能装柜方案已锁定，不能继续调整。预装运输信息和未拣货明细请在预装清单维护。</p>
-              <el-button type="primary" @click="openList('LOADING')">查看预装清单</el-button>
-            </section>
-            <section v-else-if="selectedPlanStatus === 'COMPLETED'" class="readonly-status-card" aria-label="已完成柜次">
-              <el-tag type="success">已完成</el-tag>
-              <strong>该柜次已完成装柜</strong>
-              <p>装柜计划、明细和运输信息已永久只读，请在装柜清单查看完整记录。</p>
-              <el-button type="primary" @click="openList('COMPLETED')">查看装柜清单</el-button>
-            </section>
             <el-empty v-else-if="noDraft" description="当前货柜尚未创建装柜方案">
               <el-button v-if="canCreate" type="primary" :loading="mutating" @click="createPlan"><Plus :size="16" />创建装柜方案</el-button>
             </el-empty>
@@ -489,9 +466,6 @@ onMounted(load)
 .plan-actions,.row-actions { flex-wrap: wrap; }
 .plan-actions :deep(.el-button + .el-button),.row-actions :deep(.el-button + .el-button) { margin-left: 0; }
 .capacity-grid { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 12px; padding: 12px; border-bottom: 1px solid var(--cc-border); }
-.readonly-status-card { display: grid; align-content: start; justify-items: start; gap: 10px; padding: 28px 24px; }
-.readonly-status-card strong { font-size: 16px; }
-.readonly-status-card p { max-width: 460px; margin: 0; color: var(--cc-muted); line-height: 1.6; }
 .meter-title { justify-content: space-between; margin-bottom: 8px; font-size: 12px; }
 .plan-pane :deep(.el-input-number) { width: 120px; }
 .assign-dialog p { margin: 0 0 10px; }