优化
This commit is contained in:
@@ -773,7 +773,7 @@ describe('LastMileOrdersView pending order and container conversion', () => {
|
||||
expect(listContainerPlanProgress).toHaveBeenLastCalledWith({ page: 1, size: 10, containerNo: undefined, createdFrom: undefined, createdTo: undefined })
|
||||
expect(wrapper.text()).not.toContain('柜子工作台（2）')
|
||||
expect(wrapper.text()).toContain('货柜工作台')
|
||||
expect(wrapper.text()).toContain('按柜查看和修改海外接柜仓；整柜计划齐全后自动生成托盘码')
|
||||
expect(wrapper.text()).not.toContain('按柜查看和修改海外接柜仓；整柜计划齐全后自动生成托盘码')
|
||||
expect(wrapper.text()).toContain('5个入仓码待生成计划')
|
||||
expect(wrapper.text()).toContain('共 15 个入仓码')
|
||||
expect(wrapper.text()).not.toContain('待补入仓码')
|
||||
|
||||
@@ -205,7 +205,7 @@ onMounted(() => { void Promise.all([loadConfig(), load()]) })
|
||||
<template #notices><el-alert v-if="error" type="error" :title="error" show-icon :closable="false" /><el-alert
|
||||
:type="autoSyncEnabled ? 'warning' : 'info'"
|
||||
:title="autoSyncEnabled ? '领星自动同步已开启' : '领星自动同步已关闭，仅支持人工推送'"
|
||||
|
||||
|
||||
show-icon
|
||||
:closable="false"
|
||||
/></template>
|
||||
|
||||
@@ -62,7 +62,9 @@ describe('physical return outbound', () => {
|
||||
await open('SKU-A')
|
||||
const marks = right().props('data').map((row: { cartonMark: string }) => row.cartonMark)
|
||||
expect(marks).toContain('PARCEL'); expect(marks).toContain('LOOSE-A'); expect(marks).not.toContain('OTHER-ORDER')
|
||||
expect(wrapper.text()).toContain('合箱')
|
||||
expect(wrapper.text()).not.toContain('包裹或箱子只出部分商品时')
|
||||
await wrapper.get('[aria-label="查看退货出库说明"]').trigger('focus')
|
||||
await vi.waitFor(() => expect(document.body.textContent).toContain('先在退货合箱作业生成新箱并贴标'))
|
||||
})
|
||||
it('blocks submission without a physical parcel or carton', async () => {
|
||||
await open('SKU-A')
|
||||
|
||||
@@ -77,7 +77,9 @@ describe('outbound candidate search and selection', () => {
|
||||
expect(sourceTable.text()).toContain('BOX-A')
|
||||
expect(sourceTable.text()).not.toContain('SP-OTHER')
|
||||
expect(wrapper.findComponent({ name: 'ElInputNumber' }).exists()).toBe(false)
|
||||
expect(wrapper.text()).toContain('合箱')
|
||||
expect(wrapper.text()).not.toContain('包裹或箱子只出部分商品时')
|
||||
await wrapper.get('[aria-label="查看退货出库说明"]').trigger('focus')
|
||||
await vi.waitFor(() => expect(document.body.textContent).toContain('先在退货合箱作业生成新箱并贴标'))
|
||||
})
|
||||
beforeEach(() => {
|
||||
vi.mocked(listPlatformTenants).mockReset().mockResolvedValue({ records: [], page: 1, size: 200, total: 0, pages: 0 })
|
||||
|
||||
@@ -347,11 +347,11 @@ onMounted(load)
|
||||
<el-pagination :disabled="createLocked" v-model:current-page="dropshipPage" v-model:page-size="dropshipPageSize" :page-sizes="[5, 10, 20, 50]" :pager-count="5" :total="filteredDropshipCandidates.length" layout="total, sizes, prev, pager, next, jumper" @size-change="dropshipPage = 1" />
|
||||
</div>
|
||||
<el-alert v-if="selectedDropshipCustomerCount > 1" title="当前选择包含多个客户，请按客户搜索后选择；一张出库单只能属于同一客户。" type="warning" :closable="false" />
|
||||
|
||||
|
||||
</section>
|
||||
</template>
|
||||
<template v-else-if="outboundType === 'WAREHOUSE_TRANSFER_OUTBOUND'">
|
||||
|
||||
|
||||
<section class="density-dialog-section" data-tone="source" aria-label="无目的地转运单"><h3 class="density-dialog-section__title">无目的地转运单<InlineHelp title="转运单选择说明"><p>仅展示已完成入库、换标已完成或无需换标，并且尚未设置目的地的仓储转运单。绑定后将从此列表移除并进入智能排车候选。</p></InlineHelp></h3><el-table v-loading="inventoryLoading" :data="transferCandidates" border stripe class="dropship-candidate-table">
|
||||
<el-table-column label="选择" width="68" align="center" fixed="left"><template #default="{ row }"><el-checkbox :disabled="createLocked || Boolean(candidateError)" :aria-label="'选择转运单 ' + row.transferNo" :model-value="selectedTransferPalletIds.includes(transferSelectionKey(row as WarehouseTransferOutboundCandidate))" @change="toggleTransferPallet(row as WarehouseTransferOutboundCandidate, $event)" /></template></el-table-column>
|
||||
<el-table-column label="客户" min-width="180" show-overflow-tooltip><template #default="{ row }">{{ transferCustomerName(row as WarehouseTransferOutboundCandidate) }}</template></el-table-column>
|
||||
@@ -364,7 +364,7 @@ onMounted(load)
|
||||
<section class="density-dialog-section" data-tone="work" aria-label="转运目的地登记"><h3 class="density-dialog-section__title">目的地</h3><table class="density-table density-table--editable outbound-editor-table "><tbody><tr><td colspan="2"><el-form-item label="目的地类型" required><el-radio-group v-model="destinationType"><el-radio-button label="FBA">FBA目的仓</el-radio-button><el-radio-button label="PRIVATE">私人仓</el-radio-button></el-radio-group></el-form-item></td></tr><tr v-if="destinationType === 'FBA'"><td colspan="2"><el-form-item label="FBA目的仓" required><el-select v-model="selectedDestinationWarehouseId" filterable clearable placeholder="请选择FBA目的仓"><el-option v-for="item in fbaWarehouseOptions" :key="item.value" :value="item.value" :label="item.label" /></el-select></el-form-item></td></tr><template v-else><tr><td><el-form-item label="私人仓地址" required><el-input v-model="deliveryAddress" placeholder="请输入完整派送地址" /></el-form-item></td><td><el-form-item label="邮编" required><el-input v-model="postalCode" maxlength="32" placeholder="请输入邮编" /></el-form-item></td></tr><tr><td><el-form-item label="联系人" required><el-input v-model="contactName" placeholder="请输入联系人" /></el-form-item></td><td><el-form-item label="联系电话" required><el-input v-model="contactPhone" placeholder="请输入联系电话" /></el-form-item></td></tr></template></tbody></table></section>
|
||||
</template>
|
||||
<template v-else>
|
||||
|
||||
|
||||
<section class="density-dialog-section" data-tone="work" aria-label="退货出库资料"><h3 class="density-dialog-section__title">退货出库资料<InlineHelp title="退货出库说明"><p>整包裹、整箱或整托出库。包裹或箱子只出部分商品时，请先在退货合箱作业生成新箱并贴标，再选择新箱出库。</p></InlineHelp></h3><table class="density-table density-table--editable outbound-editor-table "><tbody><tr><td><el-form-item v-if="outboundType === 'RETURN_OUTBOUND'" label="客户" required>
|
||||
<el-select v-model="selectedCustomerId" :loading="inventoryLoading" clearable filterable placeholder="请选择客户" @change="selectCustomer">
|
||||
<el-option v-for="item in customerOptions" :key="item.value" :value="item.value" :label="item.label" />
|
||||
|
||||
@@ -889,7 +889,7 @@ const tableColumns = computed(() =>
|
||||
</section>
|
||||
<section class="density-dialog-section" data-tone="summary" aria-label="合箱结果">
|
||||
<h3 class="density-dialog-section__title">{{ planDetail.status === 'COMPLETED' ? '合箱完成时结果（' + (planDetail.completedBy || '操作员未留存') + '）' : '计划箱子明细' }}<InlineHelp title="合箱结果说明"><p>结果数量为完成时快照；目标原箱内容包含在整箱数量中，本次合入数量见上表。</p></InlineHelp></h3>
|
||||
|
||||
|
||||
<el-table v-if="planDetail.completionCartons?.length" :data="planCartonItemRows">
|
||||
<el-table-column v-if="access.can(permission.returnCartonsList)" label="操作" width="130"><template #default="{ row }"><div class="row-actions density-actions admin-text-actions"><el-button class="density-action" data-tone="neutral" :loading="printingMark === row.cartonMark" :disabled="Boolean(printingMark) || !planDetail.resultCartons?.some(carton => carton.cartonMark === row.cartonMark && carton.status !== 'MERGED' && carton.totalQuantity > 0)" @click="printLabel(row.cartonMark)">打印当前箱唛</el-button></div></template></el-table-column>
|
||||
<el-table-column prop="cartonMark" label="实际箱唛" min-width="250"><template #default="{ row }"><LineClampText :content="row.cartonMark" /></template></el-table-column>
|
||||
|
||||
Reference in New Issue
Block a user