diff --git a/src/modules/overseas-warehouse/api/dispatches.ts b/src/modules/overseas-warehouse/api/dispatches.ts index 0b4cc59d..6cfd0f6b 100644 --- a/src/modules/overseas-warehouse/api/dispatches.ts +++ b/src/modules/overseas-warehouse/api/dispatches.ts @@ -248,7 +248,6 @@ export interface TransferDeliveryPayload { paidAt?: string; paymentMethod?: 'ONLINE' | 'BANK_TRANSFER' | 'CASH' | 'OTHER'; paymentReferenceNo?: string paymentVoucherFileIds?: string[]; chargeableQuantity?: number; quantityUnit?: string; unitPrice?: number periodStart?: string; periodEnd?: string; remark?: string }> - palletCartonMarks?: Record } export async function transferDispatchToDelivery(dispatchNo: string, payload: TransferDeliveryPayload) { const response = await overseasHttp.post, ApiEnvelope>( diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts index 00c780d5..35b51f84 100644 --- a/src/modules/overseas-warehouse/pages/DispatchesView.test.ts +++ b/src/modules/overseas-warehouse/pages/DispatchesView.test.ts @@ -134,8 +134,8 @@ describe('DispatchesView', () => { expect(source).toMatch(/access\.can\(permission\.dispatchTransferDelivery\)\s*&&\s*\['PENDING_DEPARTURE', 'PICKING', 'READY_TO_DEPART'\]\.includes\(row\.statusCode\)/) expect(source).toContain('未生成出库单前可移除托盘') expect(source).toContain('removeDispatchItem') - expect(source).toContain('托盘箱唛确认') - expect(source).toContain('palletCartonMarks') + expect(source).not.toContain('托盘箱唛确认') + expect(source).not.toContain('palletCartonMarks') expect(source).not.toContain('departDispatch') canPermission.mockReturnValue(false) diff --git a/src/modules/overseas-warehouse/pages/DispatchesView.vue b/src/modules/overseas-warehouse/pages/DispatchesView.vue index 88ec5198..9086ae57 100644 --- a/src/modules/overseas-warehouse/pages/DispatchesView.vue +++ b/src/modules/overseas-warehouse/pages/DispatchesView.vue @@ -74,7 +74,6 @@ const transferForm = reactive({ deliveryFee: undefined as number | undefined, loadingFee: undefined as number | undefined, appointmentFee: undefined as number | undefined, - cartonMarksJson: '', remark: '', }) @@ -396,7 +395,6 @@ function openTransfer(row: DispatchListItem) { deliveryFee: undefined, loadingFee: undefined, appointmentFee: undefined, - cartonMarksJson: '', remark: '', }) mutationError.value = null @@ -516,10 +514,6 @@ async function submitTransfer() { amount: Number(amount), remark: feeName, })) - let palletCartonMarks: Record | undefined - if (transferForm.cartonMarksJson.trim()) { - try { const parsed = JSON.parse(transferForm.cartonMarksJson); if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) throw new Error(); palletCartonMarks = Object.fromEntries(Object.entries(parsed).map(([pallet, marks]) => [pallet, Array.isArray(marks) ? marks.map((mark) => String(mark).trim()).filter(Boolean) : []])) } catch { ElMessage.warning('托盘箱唛分配格式不正确,请使用 JSON:{"托盘号":["箱唛1","箱唛2"]}'); return } - } transferSaving.value = true try { await transferDispatchToDelivery(transferRow.value.dispatchNo, { @@ -539,7 +533,6 @@ async function submitTransfer() { sellerName: isBuyAppointment.value ? transferForm.sellerName.trim() : undefined, remark: transferForm.remark.trim() || undefined, fees, - palletCartonMarks, }) transferOpen.value = false ElMessage.success('已生成出库单和派送单') @@ -564,7 +557,7 @@ onMounted(load) -

派送信息

入库未逐箱绑定时,在出库前确认箱唛属于哪个实际托盘。

费用信息(USD)

+

派送信息

费用信息(USD)

已排车托盘