diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts index 8a8077ba..474f2906 100644 --- a/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts +++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.test.ts @@ -616,9 +616,25 @@ describe('GlobalSmartLoadingView', () => { expect(wrapper.text()).toContain('I180:3 箱') expect(wrapper.text()).toContain('I181:10 箱') expect(wrapper.text()).toContain('130 kg') + expect(wrapper.get('.candidate-pane').text()).toContain('整托加入 · 不可拆') + expect(wrapper.get('.plan-pane').text()).toContain('按箱加入') + expect(wrapper.text()).toContain('装柜规则') + expect(wrapper.text()).not.toContain('分配单位') wrapper.unmount() }) + it('uses one loading-rule column and expandable group details in both workbenches', () => { + for (const page of ['GlobalSmartLoadingView.vue', 'SmartLoadingWorkbenchView.vue']) { + const source = readFileSync(resolve(process.cwd(), `src/modules/container-loading/pages/${page}`), 'utf8') + expect(source.match(/label: '装柜规则'/g)).toHaveLength(2) + expect(source).not.toContain("label: '分配单位'") + expect(source).not.toContain('整组加入 · 不可拆<\/summary>/g)).toHaveLength(2) + expect(source.match(/'整托加入 · 不可拆' : '按箱加入'/g)).toHaveLength(2) + expect(source).toContain("row.memberOrderSummaries.join(';')") + } + }) + it('searches any shared-pallet inbound, retains its complete composition across pages, and resets the search', async () => { const sharedPallet = { ...candidate, inboundId: '180', inboundCode: 'I180', unitType: 'SEALED_PALLET' as const, diff --git a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue index d824f585..2ff69267 100644 --- a/src/modules/container-loading/pages/GlobalSmartLoadingView.vue +++ b/src/modules/container-loading/pages/GlobalSmartLoadingView.vue @@ -230,8 +230,7 @@ const candidateColumns: DataTableColumn[] = [ { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' }, { key: 'inboundCode', label: '入仓码', minWidth: 220, fixed: 'left', slotName: 'candidateInbounds' }, { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true }, - { key: 'unitType', label: '分配单位', width: 105, slotName: 'unitType' }, - { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' }, + { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' }, { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' }, { key: 'orderStatusSnapshot', prop: 'orderStatusSnapshot', label: '订单状态', width: 100, slotName: 'orderStatusSnapshot' }, { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 80 }, @@ -246,7 +245,7 @@ const itemColumns: DataTableColumn[] = [ { key: 'actions', label: '操作', width: 90, fixed: 'left', slotName: 'actions' }, { key: 'inboundCode', prop: 'inboundCode', label: '入仓码', minWidth: 140, fixed: 'left', showOverflowTooltip: true }, { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 145, showOverflowTooltip: true }, - { key: 'coLoadGroup', label: '同柜', minWidth: 80, slotName: 'coLoadGroup' }, + { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' }, { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 70, slotName: 'customerName' }, { key: 'packageCount', label: '分配箱数', width: 140, slotName: 'packageCount' }, { key: 'grossWeightKg', label: '毛重', width: 90, slotName: 'weight' }, @@ -749,7 +748,7 @@ onMounted(() => { void load(); void loadCustomers() }) - + 整组加入 · 不可拆 {{ candidateStatusLabel(row.orderStatusSnapshot) }} {{ formatMeasurement(row.unitGrossWeightKg, 'kg', 1) }} {{ formatMeasurement(row.totalGrossWeightKg, 'kg', 1) }} @@ -823,9 +822,8 @@ onMounted(() => { void load(); void loadCustomers() }) 删除 - + 整组加入 · 不可拆 使用:{{ row.packageCount }}未用:{{ row.remainingPackageCount }} - {{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }} {{ formatNumber(Number(row.grossWeightKg || 0), 1) }} kg {{ formatNumber(Number(row.volumeCbm || 0)) }} m³ diff --git a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue index 534bb9d5..31ab8689 100644 --- a/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue +++ b/src/modules/container-loading/pages/SmartLoadingWorkbenchView.vue @@ -134,7 +134,7 @@ const itemColumns: DataTableColumn[] = [ { key: 'sequence', prop: 'loadSequence', label: '顺序', width: 75 }, { key: 'order', label: '入仓码', minWidth: 190, slotName: 'order' }, { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true }, - { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' }, + { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' }, { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' }, { key: 'goods', label: '货物', minWidth: 190, slotName: 'goods' }, { key: 'packageCount', label: '分配箱数', width: 150, slotName: 'packageCount' }, @@ -145,8 +145,7 @@ const candidateColumns: DataTableColumn[] = [ { key: 'actions', label: '操作', width: 110, fixed: 'left', slotName: 'actions' }, { key: 'inboundCode', label: '入仓码', minWidth: 220, fixed: 'left', slotName: 'candidateInbounds' }, { key: 'palletNo', prop: 'palletNo', label: '托盘号', minWidth: 150, showOverflowTooltip: true }, - { key: 'unitType', label: '分配单位', width: 110, slotName: 'unitType' }, - { key: 'coLoadGroup', label: '同柜不可拆', minWidth: 210, slotName: 'coLoadGroup' }, + { key: 'coLoadGroup', label: '装柜规则', minWidth: 170, slotName: 'coLoadGroup' }, { key: 'customerName', prop: 'customerName', label: '客户', minWidth: 150, slotName: 'customerName' }, { key: 'goodsSummary', prop: 'goodsSummary', label: '货物摘要', minWidth: 180, slotName: 'goodsSummary' }, { key: 'availablePackageCount', prop: 'availablePackageCount', label: '箱数', width: 90 }, @@ -387,7 +386,7 @@ onMounted(load) 删除 {{ row.inboundCode || '—' }} - + 整组加入 · 不可拆 使用:{{ row.packageCount }}调整未用:{{ row.remainingPackageCount }} {{ formatNumber(Number(row.volumeCbm || 0)) }} m³{{ formatNumber(Number(row.grossWeightKg || 0),1) }} kg @@ -398,8 +397,7 @@ onMounted(load) - - {{ row.unitType === 'SEALED_PALLET' ? '封托托盘' : '箱件' }} + 整组加入 · 不可拆 {{ formatNumber(Number(row.averageUnitVolumeCbm || 0)) }} m³{{ formatNumber(Number(row.unitGrossWeightKg || 0),1) }} kg 未核验