From f26c12b5b5f08fd7296a30b11e69f99516dc9cda Mon Sep 17 00:00:00 2001 From: liuyihe <2513762445@qq.com> Date: Thu, 5 Nov 2026 16:03:12 +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 --- .../first-leg/components/CustomsDocumentsDialog.vue | 2 +- .../first-leg/components/InboundBillingPanel.test.mjs | 3 ++- src/modules/first-leg/components/InboundBillingPanel.vue | 8 ++------ src/modules/first-leg/components/OrderProgressPanel.vue | 1 - src/modules/first-leg/views/FirstLegOrdersView.test.mjs | 6 +++--- src/modules/first-leg/views/FirstLegOrdersView.vue | 8 ++++---- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/modules/first-leg/components/CustomsDocumentsDialog.vue b/src/modules/first-leg/components/CustomsDocumentsDialog.vue index a36f9bf..9331da7 100644 --- a/src/modules/first-leg/components/CustomsDocumentsDialog.vue +++ b/src/modules/first-leg/components/CustomsDocumentsDialog.vue @@ -279,7 +279,7 @@ async function confirmReceipt() { if (!documents.length) return let confirmedCount = 0 try { - await ElMessageBox.confirm(`确认已核对 ${documents.length} 份报关行回执吗？确认后平台会把确认结果发送给报关行执行。`, '确认报关行回执', { type: 'warning' }) + await ElMessageBox.confirm('确认报关行回执吗？确认后平台会把确认结果发送给报关行执行。', '确认报关行回执', { type: 'warning' }) mutating.value = true for (const document of documents) { await confirmMerchantCustomsReceipt(document) diff --git a/src/modules/first-leg/components/InboundBillingPanel.test.mjs b/src/modules/first-leg/components/InboundBillingPanel.test.mjs index a188670..23967d4 100644 --- a/src/modules/first-leg/components/InboundBillingPanel.test.mjs +++ b/src/modules/first-leg/components/InboundBillingPanel.test.mjs @@ -56,7 +56,8 @@ test('supports a standalone dialog and keeps the unpushed billing-weight state v }) test('shows the published merchant inbound, measurement details and customer confirmation entry', () => { - for (const label of ['入仓码', '平台收货仓', '实际毛重', '实测体积', '换算与精度', '最终计费量', '单价', '基础费用', '附加费用', '费用合计', '平台备注']) { + assert.doesNotMatch(source, /平台备注|inbound\.publicRemark/) + for (const label of ['入仓码', '平台收货仓', '实际毛重', '实测体积', '换算与精度', '最终计费量', '单价', '基础费用', '附加费用', '费用合计']) { assert.ok(source.includes(label), `missing label: ${label}`) } assert.match(source, /formatInboundMoney\(props\.data\.latestFee\.totalAmount/) diff --git a/src/modules/first-leg/components/InboundBillingPanel.vue b/src/modules/first-leg/components/InboundBillingPanel.vue index fdc3b12..6c231c1 100644 --- a/src/modules/first-leg/components/InboundBillingPanel.vue +++ b/src/modules/first-leg/components/InboundBillingPanel.vue @@ -113,7 +113,7 @@ async function confirmFee() {
-

测量数据

后台推送
+

测量数据

实际箱数
{{ formatInboundNumber(props.data.inbound.summary.totalPackageCount, 0) }}
实际毛重
{{ formatInboundMeasure(props.data.inbound.summary.actualGrossWeightKg, 'kg') }}
@@ -139,7 +139,7 @@ async function confirmFee() {

费用结果

- {{ props.data.latestFee.feeNo }} +
计费方式
{{ getChargeModeLabel(props.data.latestFee.chargeMode, props.data.latestFee.actualWeightKg, props.data.latestFee.actualVolumeCbm, props.data.latestFee.convertedQuantity) }} · {{ getTaxModeLabel(props.data.latestFee.taxMode) }}
@@ -167,10 +167,6 @@ async function confirmFee() {
-
- 平台备注 -

{{ props.data.inbound.publicRemark }}

-
diff --git a/src/modules/first-leg/components/OrderProgressPanel.vue b/src/modules/first-leg/components/OrderProgressPanel.vue index b7802d5..d6e2adb 100644 --- a/src/modules/first-leg/components/OrderProgressPanel.vue +++ b/src/modules/first-leg/components/OrderProgressPanel.vue @@ -22,7 +22,6 @@ function stageState(index: number) {

履约进度

- 订单主节点与关联柜次统一展示
diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs index d4430c4..027ba7e 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs +++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs @@ -226,7 +226,7 @@ test('shows one unified progress line and C02 business summaries without detail assert.match(source, /label: '后续履约', value: orderProgressLabel\(store\.orderProgress\[order\.id\]\)/) assert.doesNotMatch(source, /待海外同步/) assert.match(progressSource, /FIRST_LEG_PROGRESS_STAGES/) - assert.match(progressSource, /订单主节点与关联柜次统一展示/) + assert.doesNotMatch(progressSource, /订单主节点与关联柜次统一展示/) assert.match(progressSource, /履约进度/) assert.doesNotMatch(progressSource, /进度记录|el-timeline|timeline/) assert.doesNotMatch(source, /

报关回执<\/h3>/) @@ -312,7 +312,7 @@ test('requires an enabled platform receiving warehouse in the order form', () => assert.match(editorShellSource, /first-leg-editor-dialog \.el-dialog__body\) \{[^}]*min-height: 0;[^}]*overflow-y: auto;[^}]*overscroll-behavior: contain/) assert.match(editorShellSource, /first-leg-editor-dialog \.el-dialog__footer\) \{[^}]*border-top: 1px solid var\(--border\);[^}]*background: #fff/) assert.match(source, /detailOrder\.receivingWarehouseSnapshot\?\.name/) - assert.match(source, /detailOrder\.receivingWarehouseSnapshot\.code/) + assert.doesNotMatch(source, /detailOrder\.receivingWarehouseSnapshot\.code/) assert.match(source, /loadSelectedWarehouse\(detailedOrder\.receivingWarehouseId\)/) }) @@ -549,7 +549,7 @@ test('shows fulfillment courier information as read-only client detail', () => { assert.match(source, /履约快递信息/) assert.match(source, /detailOrder\.expressCompanyName/) assert.match(source, /detailOrder\.trackingNumber/) - assert.match(source, /快递公司由平台维护/) + assert.doesNotMatch(source, /快递公司由平台维护/) assert.doesNotMatch(source, /v-model="form\.expressCompanyName"/) }) diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue index eba409a..77d8e04 100644 --- a/src/modules/first-leg/views/FirstLegOrdersView.vue +++ b/src/modules/first-leg/views/FirstLegOrdersView.vue @@ -2401,8 +2401,8 @@ async function searchOrders(model: QueryModel) {
发货方式
{{ pickupMethodLabels[detailOrder.pickupMethod] }}
预约提货时间
{{ detailOrder.pickupMethod === 'PICKUP' && detailOrder.requestedPickupAt ? formatDateTime(detailOrder.requestedPickupAt) : '-' }}
报关方式
{{ taxModeLabels[detailOrder.taxMode] }}
-
运输渠道
{{ detailOrder.channelName || detailOrder.channelCode || '-' }}{{ detailOrder.channelCode }}
-
国内收货仓
{{ detailOrder.receivingWarehouseSnapshot?.name || detailOrder.receivingWarehouseName || '—' }}{{ detailOrder.receivingWarehouseSnapshot.code || '—' }} · {{ detailOrder.receivingWarehouseSnapshot.province }}{{ detailOrder.receivingWarehouseSnapshot.city }}{{ detailOrder.receivingWarehouseSnapshot.address }}
+
运输渠道
{{ detailOrder.channelName || detailOrder.channelCode || '-' }}
+
国内收货仓
{{ detailOrder.receivingWarehouseSnapshot?.name || detailOrder.receivingWarehouseName || '—' }}
收货要求
{{ displayValue(detailOrder.receivingTime) }}
目的仓类型
{{ destinationTypeLabels[detailOrder.destinationType] }}
目的国家 / 仓库
{{ detailOrder.destinationCountryCode || '-' }} · {{ detailOrder.destinationWarehouseName || '-' }}
@@ -2417,7 +2417,7 @@ async function searchOrders(model: QueryModel) {

收发货信息

发货方
{{ detailOrder.shipperPartySnapshot?.name || detailOrder.shipper || '未提供' }}{{ detailOrder.shipperPartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.shipperPartySnapshot.phone || '未填写电话' }} · {{ detailOrder.shipperPartySnapshot.email || '未填写邮箱' }}
{{ detailOrder.shipperPartySnapshot.countryRegion }} {{ detailOrder.shipperPartySnapshot.province }} {{ detailOrder.shipperPartySnapshot.city }} {{ detailOrder.shipperPartySnapshot.address }} {{ detailOrder.shipperPartySnapshot.postalCode }}
-
收货方
{{ detailOrder.consigneePartySnapshot?.name || detailOrder.consignee || detailOrder.destinationWarehouseName || '未提供' }}{{ detailOrder.consigneePartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.consigneePartySnapshot.phone || '未填写电话' }} · {{ detailOrder.consigneePartySnapshot.email || '未填写邮箱' }}
{{ detailOrder.consigneePartySnapshot.countryRegion }} {{ detailOrder.consigneePartySnapshot.province }} {{ detailOrder.consigneePartySnapshot.city }} {{ detailOrder.consigneePartySnapshot.address }} {{ detailOrder.consigneePartySnapshot.postalCode }}平台目的仓地址以最终履约安排为准
+
收货方
{{ detailOrder.consigneePartySnapshot?.name || detailOrder.consignee || detailOrder.destinationWarehouseName || '未提供' }}{{ detailOrder.consigneePartySnapshot.contactName || '未填写联系人' }} · {{ detailOrder.consigneePartySnapshot.phone || '未填写电话' }} · {{ detailOrder.consigneePartySnapshot.email || '未填写邮箱' }}
{{ detailOrder.consigneePartySnapshot.countryRegion }} {{ detailOrder.consigneePartySnapshot.province }} {{ detailOrder.consigneePartySnapshot.city }} {{ detailOrder.consigneePartySnapshot.address }} {{ detailOrder.consigneePartySnapshot.postalCode }}
客户备注

{{ detailOrder.customerRemark }}

@@ -2445,7 +2445,7 @@ async function searchOrders(model: QueryModel) {

履约快递信息

快递公司
{{ detailOrder.expressCompanyName || (detailOrder.status === 'CANCELLED' ? '—' : '待平台补充') }}
快递单号
{{ detailOrder.trackingNumber || (detailOrder.status === 'CANCELLED' ? '—' : '待平台补充') }}
-
暂无快递信息快递自提可在下单或编辑草稿时选填快递单号，快递公司由平台维护。
+
暂无快递信息

货物明细