From fdf646227eed741b1867d9cfe5c73d51c0e8c0e0 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Wed, 28 Oct 2026 16:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E5=AE=A2=E6=88=B7=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E5=8F=8A=E5=A4=B4=E7=A8=8B=E8=AE=A1=E8=B4=B9=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/cross-border/views/ProcurementView.vue         | 6 +++---
 .../first-leg/components/InboundBillingPanel.test.mjs      | 5 +----
 src/modules/first-leg/components/InboundBillingPanel.vue   | 7 +------
 src/modules/first-leg/views/FirstLegOrdersView.vue         | 3 +--
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/modules/cross-border/views/ProcurementView.vue b/src/modules/cross-border/views/ProcurementView.vue
index 0d010ae..d9e4e5b 100644
--- a/src/modules/cross-border/views/ProcurementView.vue
+++ b/src/modules/cross-border/views/ProcurementView.vue
@@ -10,7 +10,7 @@ import QueryToolbar, { type QueryField, type QueryModel } from '@/components/com
 import type { TableAction } from '@/components/common/tableActions'
 import ProcurementDetailPanel from '../components/ProcurementDetailPanel.vue'
 import { confirmProcurement, createProcurement, getProcurement, getProcurementWorkflow, listProcurements, type ProcurementDetail, type ProcurementSummary, type ProcurementWorkflow } from '../api/procurement'
-import { procurementDirections, directionLabel, regionText, buildProcurementCreate, dateTime, draftBudgetTotal, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
+import { procurementDirections, directionLabel, regionText, buildProcurementCreate, dateTime, emptyProcurementDraft, money, procurementStatuses, statusLabel, statusTone } from '../procurementPresentation'
 import { procurementRequestKey } from '../procurementSubmission'
 
 const props = withDefaults(defineProps<{ createPage?: boolean; detailPage?: boolean }>(), { createPage: false, detailPage: false })
@@ -162,7 +162,7 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
             <el-form-item label="预算单价" required><el-input v-model.trim="form.budgetUnitPrice" inputmode="decimal" maxlength="20" placeholder="0.00" /></el-form-item>
             <el-form-item label="预算币种" required><el-select v-model="form.currency"><el-option label="美元 USD" value="USD" /><el-option label="人民币 CNY" value="CNY" /></el-select></el-form-item>
             <el-form-item class="full" label="商品链接"><el-input v-model.trim="form.productUrl" maxlength="2000" placeholder="https://…" /></el-form-item>
-          </div><p class="procurement-hint">预算合计：<strong>{{ money(draftBudgetTotal(form), form.currency) }}</strong></p>
+          </div>
           <h3>{{ regionText('最终国内收件资料', form.procurementDirection) }}</h3><div class="procurement-form-grid">
             <el-form-item label="收件人" required><el-input v-model.trim="form.contactName" maxlength="128" placeholder="实际收件人姓名" /></el-form-item>
             <el-form-item label="联系电话" required><el-input v-model.trim="form.contactPhone" maxlength="64" type="tel" placeholder="快递可联系的电话" /></el-form-item>
@@ -186,7 +186,7 @@ onBeforeUnmount(() => { active = false; ++requestSequence })
 .procurement-link { padding: 0; border: 0; background: transparent; color: var(--client-action); font: inherit; cursor: pointer; text-align: left; }.procurement-link:hover { text-decoration: underline; }
 .procurement-error { min-height: 160px; display: flex; justify-content: center; align-items: center; gap: 16px; color: #b42318; }.procurement-error span { max-width: 900px; overflow-wrap: anywhere; }
 .procurement-form-grid { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 0 24px; }.procurement-form-grid .full { grid-column: 1 / -1; }.procurement-form-grid :deep(.el-select) { width: 100%; }
-.procurement-create h3 { margin: 22px 0 16px; color: var(--navy); font-size: 14px; }.procurement-hint { margin: 0 0 20px; line-height: 1.8; font-size: 13px; color: var(--muted); }.procurement-hint strong { color: var(--navy); }
+.procurement-create h3 { margin: 22px 0 16px; color: var(--navy); font-size: 14px; }
 .procurement-form-actions { display: flex; justify-content: flex-end; gap: 12px; padding-top: 16px; border-top: 1px solid var(--border); }.submit-error { margin: 12px 0; }
 @media (max-width: 767px) {
   .procurement-form-grid { grid-template-columns: 1fr; }.procurement-heading, .procurement-heading > div { flex-wrap: wrap; }
diff --git a/src/modules/first-leg/components/InboundBillingPanel.test.mjs b/src/modules/first-leg/components/InboundBillingPanel.test.mjs
index 2ce695e..c717f17 100644
--- a/src/modules/first-leg/components/InboundBillingPanel.test.mjs
+++ b/src/modules/first-leg/components/InboundBillingPanel.test.mjs
@@ -68,10 +68,7 @@ test('shows the published merchant inbound, measurement details and customer con
   assert.match(source, /measurementItems/)
   assert.doesNotMatch(source, /调整费用|发送费用|下载照片/)
   assert.doesNotMatch(source, /internalNotes|statusHistory|files/)
-  assert.match(source, /latestFee\.ruleCode/)
-  assert.match(source, /latestFee\.rateCode/)
-  assert.match(source, /latestFee\.chargeRuleVersion/)
-  assert.match(source, /latestFee\.carrierRateVersion/)
+  assert.doesNotMatch(source, /latestFee\.(feeVersion|ruleCode|rateCode|chargeRuleVersion|carrierRateVersion|sentAt)/)
   assert.match(source, /箱规规则/)
   assert.match(source, /getCalculationRuleLabel\(row\.calculationRuleVersion\)/)
 })
diff --git a/src/modules/first-leg/components/InboundBillingPanel.vue b/src/modules/first-leg/components/InboundBillingPanel.vue
index 34d61a7..a40ae51 100644
--- a/src/modules/first-leg/components/InboundBillingPanel.vue
+++ b/src/modules/first-leg/components/InboundBillingPanel.vue
@@ -160,7 +160,7 @@ async function confirmFee() {
       <div class="inbound-result-section fee-result">
         <div class="inbound-section-title">
           <h4>费用结果</h4>
-          <span>{{ props.data.latestFee.feeNo }} · 第 {{ props.data.latestFee.feeVersion }} 版</span>
+          <span>{{ props.data.latestFee.feeNo }}</span>
         </div>
         <dl class="fee-calculation-grid">
           <div><dt>计费方式</dt><dd>{{ getChargeModeLabel(props.data.latestFee.chargeMode) }} · {{ getTaxModeLabel(props.data.latestFee.taxMode) }}</dd></div>
@@ -183,11 +183,9 @@ async function confirmFee() {
         <div class="fee-total">
           <div>
             <span>费用合计</span>
-            <small>{{ props.data.latestFee.ruleCode }} v{{ props.data.latestFee.chargeRuleVersion }} · {{ props.data.latestFee.rateCode }} v{{ props.data.latestFee.carrierRateVersion }}</small>
           </div>
           <strong>{{ formatInboundMoney(props.data.latestFee.totalAmount, props.data.latestFee.currency) }}</strong>
         </div>
-        <p class="fee-sent-time">发布于 {{ formatInboundDateTime(props.data.latestFee.sentAt) }}</p>
       </div>
 
       <div v-if="props.data.inbound.publicRemark" class="inbound-public-remark">
@@ -299,9 +297,7 @@ async function confirmFee() {
 .fee-total { padding: 15px 0 0; }
 .fee-total > div { display: flex; min-width: 0; flex-direction: column; gap: 4px; }
 .fee-total span { color: var(--navy); font-size: 12px; font-weight: 650; }
-.fee-total small, .fee-sent-time { color: var(--muted); font-size: 10px; }
 .fee-total strong { flex: 0 0 auto; color: var(--primary); font-size: 21px; }
-.fee-sent-time { margin: 5px 0 0; text-align: right; }
 .inbound-public-remark { margin-top: 16px; padding: 13px 14px; background: #f2f7f6; }
 .inbound-public-remark strong { color: var(--navy); font-size: 11px; }
 .inbound-public-remark p { margin: 5px 0 0; overflow-wrap: anywhere; color: var(--muted); font-size: 11px; line-height: 1.55; white-space: pre-wrap; }
@@ -339,6 +335,5 @@ async function confirmFee() {
   .inbound-billing-heading { align-items: flex-start; flex-direction: column; }
   .fee-total { align-items: flex-start; flex-direction: column; }
   .fee-total strong { font-size: 19px; }
-  .fee-sent-time { text-align: left; }
 }
 </style>
diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue
index c1349ef..eba409a 100644
--- a/src/modules/first-leg/views/FirstLegOrdersView.vue
+++ b/src/modules/first-leg/views/FirstLegOrdersView.vue
@@ -2387,7 +2387,7 @@ async function searchOrders(model: QueryModel) {
         <div class="order-detail-heading">
           <div class="detail-heading-main">
             <el-button link type="primary" class="detail-back-action" @click="router.push({ name: 'first-leg-orders' })">← 返回列表</el-button>
-            <div><h2>{{ detailOrder.businessSummary.inboundCode || (detailOrder.status === 'CANCELLED' ? (detailOrder.orderNo || '—') : detailOrder.status === 'DRAFT' ? '入仓码提交后生成' : '入仓码待生成') }}</h2><p v-if="detailOrder.status === 'CANCELLED'">订单已取消。</p><p v-else>{{ getFirstLegTransportModeLabel(detailOrder.transportMode) }} · {{ detailOrder.origin || '起运地待更新' }} → {{ detailOrder.destination || '目的地待更新' }}</p></div>
+            <div><h2>{{ detailOrder.businessSummary.inboundCode || (detailOrder.status === 'CANCELLED' ? (detailOrder.orderNo || '—') : detailOrder.status === 'DRAFT' ? '入仓码提交后生成' : '入仓码待生成') }}</h2></div>
           </div>
           <div class="detail-heading-actions"><el-tag :type="getFirstLegStatusTone(detailOrder.status)" effect="light">{{ getFirstLegStatusLabel(detailOrder.status) }}</el-tag><el-button v-if="canEditOrder && canClientEditFirstLegOrder(detailOrder.status)" type="primary" plain :loading="openingEditor" @click="openEdit(detailOrder)"><Pencil :size="16" />编辑草稿</el-button><el-button v-if="canOfferCancellation(detailOrder)" type="danger" plain :loading="cancellingOrderId === detailOrder.id" :disabled="!!cancellingOrderId" @click="cancelOrder(detailOrder)">取消订单</el-button></div>
         </div>
@@ -2800,7 +2800,6 @@ async function searchOrders(model: QueryModel) {
 .detail-heading-main > div { min-width: 0; }
 .detail-back-action, .detail-heading-actions { flex: 0 0 auto; }
 .order-detail-heading h2 { margin: 0; overflow: hidden; color: var(--navy); font-size: 18px; text-overflow: ellipsis; white-space: nowrap; }
-.order-detail-heading p { margin: 3px 0 0; overflow: hidden; color: var(--muted); font-size: 11px; text-overflow: ellipsis; white-space: nowrap; }
 .order-detail-grid { display: grid; grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 0; margin: 0; border-top: 1px solid var(--border); border-left: 1px solid var(--border); }
 .order-detail-grid div { display: grid; min-width: 0; min-height: 34px; grid-template-columns: 78px minmax(0, 1fr); align-items: center; gap: 7px; padding: 3px 8px; border-right: 1px solid var(--border); border-bottom: 1px solid var(--border); }
 .order-detail-grid dt { color: var(--muted); font-size: 10px; white-space: nowrap; }