From 9b1dec75dd4561313d06dd05cf2c496402c9a3cb Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Tue, 20 Oct 2026 14:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/BusinessOrdersView.vue | 2 +- .../components/ProcurementDetailPanel.vue | 2 +- .../components/TransportDemandForm.vue | 32 +++++++------- .../cross-border/views/ProcurementView.vue | 6 +-- src/modules/dashboard/views/DashboardView.vue | 2 +- .../components/CustomsDocumentsDialog.vue | 4 +- .../components/OrderProgressPanel.vue | 4 +- .../components/TransportFactsTable.vue | 2 +- .../views/FirstLegOrdersView.test.mjs | 6 +-- .../first-leg/views/FirstLegOrdersView.vue | 44 +++++++++---------- .../first-leg/views/QuickOrderView.vue | 4 +- .../api/transferQuantities.ts | 23 ---------- .../components/DiscardStatistics.vue | 25 ----------- .../components/TransferQuantityPanel.vue | 30 ------------- .../views/ReturnInventoryView.vue | 2 +- .../views/ReturnOrdersView.test.mjs | 16 +++---- .../views/ReturnOrdersView.vue | 15 ++----- .../views/WarehouseServiceView.vue | 34 +++++--------- 18 files changed, 78 insertions(+), 175 deletions(-) delete mode 100644 src/modules/overseas-warehouse/api/transferQuantities.ts delete mode 100644 src/modules/overseas-warehouse/components/DiscardStatistics.vue delete mode 100644 src/modules/overseas-warehouse/components/TransferQuantityPanel.vue diff --git a/src/modules/cross-border/components/BusinessOrdersView.vue b/src/modules/cross-border/components/BusinessOrdersView.vue index 9183bd1..f55b7b5 100644 --- a/src/modules/cross-border/components/BusinessOrdersView.vue +++ b/src/modules/cross-border/components/BusinessOrdersView.vue @@ -274,7 +274,7 @@ onMounted(() => { if (props.detailPage) void loadDetail(); else if (!props.creat

{{ configuration.title }}下单

-

请填写订单信息,带 * 项为必填项

+
返回列表
diff --git a/src/modules/cross-border/components/ProcurementDetailPanel.vue b/src/modules/cross-border/components/ProcurementDetailPanel.vue index 4324b63..349e6fa 100644 --- a/src/modules/cross-border/components/ProcurementDetailPanel.vue +++ b/src/modules/cross-border/components/ProcurementDetailPanel.vue @@ -60,7 +60,7 @@ const hasPending = computed(() => props.detail.fees.some(f => f.walletStatus?.en -

这里显示已实际交给承运方的记录;国内寄客户后,本单履约完成。

+

费用与资金结果

diff --git a/src/modules/cross-border/components/TransportDemandForm.vue b/src/modules/cross-border/components/TransportDemandForm.vue index 8fb89b4..460c928 100644 --- a/src/modules/cross-border/components/TransportDemandForm.vue +++ b/src/modules/cross-border/components/TransportDemandForm.vue @@ -27,14 +27,14 @@ defineExpose({

运输信息

- + - - - - + + + +
@@ -42,25 +42,25 @@ defineExpose({

货物信息

- - - - - - + + + + + +

费用与时效

- - + +
- - - + + +
diff --git a/src/modules/cross-border/views/ProcurementView.vue b/src/modules/cross-border/views/ProcurementView.vue index 86f7a35..ea9ed66 100644 --- a/src/modules/cross-border/views/ProcurementView.vue +++ b/src/modules/cross-border/views/ProcurementView.vue @@ -147,8 +147,8 @@ onBeforeUnmount(() => { active = false; ++requestSequence })

商品与预算

- - + + @@ -159,7 +159,7 @@ onBeforeUnmount(() => { active = false; ++requestSequence }) - +
{{ pending ? '确认上次提交结果' : '提交采购订单' }}
diff --git a/src/modules/dashboard/views/DashboardView.vue b/src/modules/dashboard/views/DashboardView.vue index 3f32c2c..84a0d98 100644 --- a/src/modules/dashboard/views/DashboardView.vue +++ b/src/modules/dashboard/views/DashboardView.vue @@ -23,7 +23,7 @@ const primaryActions = computed(() => [

选择业务,快速下单

-

请选择您需要的业务类型,填写信息后提交订单,我们将尽快为您安排。

+
diff --git a/src/modules/first-leg/components/CustomsDocumentsDialog.vue b/src/modules/first-leg/components/CustomsDocumentsDialog.vue index 0e101dc..2e42969 100644 --- a/src/modules/first-leg/components/CustomsDocumentsDialog.vue +++ b/src/modules/first-leg/components/CustomsDocumentsDialog.vue @@ -382,7 +382,7 @@ function clearanceResultStatusLabel(value: MerchantClearanceResult) {
-

海关申报结果

平台完成正式申报后,客户可查看与本订单相关的查验、补充资料和放行结果。

+

海关申报结果

-

订单已取消,不再继续履约。

+

订单已取消

  1. {{ stage.label }}
-

订单提交后开始记录主状态进度。

+

待提交

diff --git a/src/modules/first-leg/components/TransportFactsTable.vue b/src/modules/first-leg/components/TransportFactsTable.vue index 5c6ae83..178c38c 100644 --- a/src/modules/first-leg/components/TransportFactsTable.vue +++ b/src/modules/first-leg/components/TransportFactsTable.vue @@ -21,7 +21,7 @@ function time(value: string | null) { return value ? value.replace('T', ' ') : ' -

暂无实际装载片段的运输节点。预计时间不表示实际发生。

+

暂无运输节点

diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index 75afed4..9fc50c2 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -235,7 +235,7 @@ test('shows one unified progress line and C02 business summaries without detail assert.match(source, /pickingStatusLabel: getFirstLegPickingStatusLabel\(summary\.loadingStatus\)/) assert.match(source, /prop="pickingStatusLabel" label="拣货状态"/) assert.doesNotMatch(source, /label="当前节点"/) - assert.match(source, /尚未分配柜次,后续柜次节点将在这里同步。/) + assert.match(source, /尚未分配柜次/) assert.doesNotMatch(source, /暂无柜次分配信息/) assert.doesNotMatch(source, /summary\.sealNo \|\|/) assert.doesNotMatch(progressSource, /客户确认|差异处理中|派送中/) @@ -397,7 +397,7 @@ test('distills order creation into the confirmed prototype sections with server assert.match(cargoToolbarSource, /isCreatePage && !routeDraftId && canCreateOrder/) assert.match(cargoToolbarSource, /downloadBatchTemplate[\s\S]*下载 Excel 模板/) assert.match(cargoToolbarSource, /openBatchImport[\s\S]*Excel 批量导入/) - assert.match(cargoToolbarSource, /Excel 导入用于一次创建多条订单草稿/) + assert.doesNotMatch(cargoToolbarSource, /Excel 导入用于一次创建多条订单草稿/) assert.match(source, /导入成功的数据只创建草稿,不会直接提交审核/) assert.match(source, /下载正式模板[\s\S]*选择 Excel/) assert.match(source, /仅支持 \.xlsx,文件不超过 5MB、最多 50 行/) @@ -460,7 +460,7 @@ test('matches the prototype two-column create layout and reset action', () => { test('shows an optional LX inbound order number for one-click dropship orders', () => { assert.match(source, /v-if="form\.fulfillmentType === 'ONE_CLICK_DROPSHIP'" label="LX入库单号" prop="lxCode"/) - assert.match(source, /v-model="form\.lxCode"[^>]*placeholder="请输入LX入库单号"/) + assert.match(source, /v-model="form\.lxCode"[^>]*placeholder=""/) assert.doesNotMatch(source, /label="LX入库单号"[^>]*required/) }) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index 3ddba92..b57b896 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -2138,7 +2138,7 @@ async function searchOrders(model: QueryModel) { 显示字段筛选
-

拖动调整顺序,也可使用上下移动按钮。

+
01

客户下单

国内交货与运输信息
普通头程一件代发测量完成后不办理国内库存入库,将直接推送 PDA 合托。 - 用于绑定领星入库单,提交后可在尾程订单、入库单和出库单中查询。 + 卡车自送我司提货快递自提 - + {{ warehouse.name }}
@@ -2280,8 +2280,8 @@ async function searchOrders(model: QueryModel) { 买单退税 整柜散货 - - + +
@@ -2294,17 +2294,17 @@ async function searchOrders(model: QueryModel) {
保存当前地址停用
- 平台暂未维护可用的{{ form.destinationType === 'FBA' ? ' FBA 仓' : '海外仓' }},请联系平台管理员。 + 平台暂未维护可用的{{ form.destinationType === 'FBA' ? ' FBA 仓' : '海外仓' }},请联系平台管理员。
{{ form.destinationType === 'FBA' ? selectedDestinationWarehouse.code : `${selectedDestinationWarehouse.name} · ${selectedDestinationWarehouse.code}` }} · {{ selectedDestinationWarehouse.countryCode }}仓库地址:{{ selectedDestinationWarehouse.province }}{{ selectedDestinationWarehouse.city }} {{ selectedDestinationWarehouse.address }}联系人:{{ selectedDestinationWarehouse.contactName || '-' }} {{ selectedDestinationWarehouse.contactPhone }}
@@ -2315,9 +2315,9 @@ async function searchOrders(model: QueryModel) {
下载 Excel 模板 Excel 批量导入 - Excel 导入用于一次创建多条订单草稿。 +
- 可逐行维护货物明细。 +
添加行删除所选行
@@ -2340,7 +2340,7 @@ async function searchOrders(model: QueryModel) { 同箱同箱同箱{{ item.pieces }}同箱
××
- 添加 SKU删除 + 添加 SKU删除
@@ -2348,7 +2348,7 @@ async function searchOrders(model: QueryModel) {
-

参考运费

根据当前价格表、渠道、目的仓以及货物重量和体积实时试算。

+

参考运费

正在获取实时参考报价
diff --git a/src/modules/first-leg/views/QuickOrderView.vue b/src/modules/first-leg/views/QuickOrderView.vue index 9db4190..03b9e78 100644 --- a/src/modules/first-leg/views/QuickOrderView.vue +++ b/src/modules/first-leg/views/QuickOrderView.vue @@ -422,7 +422,7 @@ onMounted(loadChannels)

客户下单

-

只需输入渠道、目的仓、产品 SKU 和箱数,即可快速填写订单。

+ 当前全局使用旧系统入仓码,每张草稿都需要填写旧系统生成的入仓码。 每一行会直接生成一张独立草稿单,其他明细可进入草稿后继续编辑并提交。
@@ -483,7 +483,7 @@ onMounted(loadChannels)
- +
diff --git a/src/modules/overseas-warehouse/api/transferQuantities.ts b/src/modules/overseas-warehouse/api/transferQuantities.ts deleted file mode 100644 index 1b315a2..0000000 --- a/src/modules/overseas-warehouse/api/transferQuantities.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { apiRequest } from '@/api/http' - -export interface TransferQuantityTotals { - orderCount: number | string - declaredPieceCount: number | string | null - knownDeclaredPieceCount: number | string - unknownDeclaredOrderCount: number | string - receivedPieceCount: number | string | null - knownReceivedPieceCount: number | string - unknownReceivedOrderCount: number | string - declaredCartonCount: number | string - receivedCartonCount: number | string - receivedPalletCount: number | string - availableCartonCount: number | string - shippedCartonCount: number | string - remainingPalletCount: number | string - shippedPalletCount: number | string -} - -/** 客户范围由会话决定,汇总使用本次列表完整筛选。 */ -export function getTransferQuantities(params: Record) { - return apiRequest({ method: 'GET', url: '/merchant/v1/last-leg/warehouse-transfers/quantities', params }) -} diff --git a/src/modules/overseas-warehouse/components/DiscardStatistics.vue b/src/modules/overseas-warehouse/components/DiscardStatistics.vue deleted file mode 100644 index 69e1b70..0000000 --- a/src/modules/overseas-warehouse/components/DiscardStatistics.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - diff --git a/src/modules/overseas-warehouse/components/TransferQuantityPanel.vue b/src/modules/overseas-warehouse/components/TransferQuantityPanel.vue deleted file mode 100644 index e44d8d9..0000000 --- a/src/modules/overseas-warehouse/components/TransferQuantityPanel.vue +++ /dev/null @@ -1,30 +0,0 @@ - - - diff --git a/src/modules/overseas-warehouse/views/ReturnInventoryView.vue b/src/modules/overseas-warehouse/views/ReturnInventoryView.vue index 6148b41..3d0fb9c 100644 --- a/src/modules/overseas-warehouse/views/ReturnInventoryView.vue +++ b/src/modules/overseas-warehouse/views/ReturnInventoryView.vue @@ -285,7 +285,7 @@ onMounted(() => { if (props.detailPage) void Promise.all([loadCartonDetail(), lo
-
{{ item.skuCode }}可用 {{ item.availableQuantity }}
+
{{ item.skuCode }}可用 {{ item.availableQuantity }}