From d07d08c7e0d6efe6b03e011eef8a78acf8a74d57 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Fri, 4 Sep 2026 12:14:17 +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

---
 src/modules/first-leg/views/FirstLegOrdersView.test.mjs | 8 ++++++++
 src/modules/first-leg/views/FirstLegOrdersView.vue      | 8 +++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
index 99b3632..351c9c9 100644
--- a/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
+++ b/src/modules/first-leg/views/FirstLegOrdersView.test.mjs
@@ -493,6 +493,7 @@ test('loads merchant inbound billing as an isolated read-only detail section', (
   assert.match(source, /error instanceof ApiError && error\.code === 'A0404'/)
   assert.match(source, /error\.message \|\| unavailableMessage/)
   assert.match(source, /order\.status === 'DRAFT'/)
+  assert.match(source, /feeConfirmationOpen\.value[\s\S]*\? '未推送计费重'[\s\S]*: '订单提交后可查看入库结果'/)
   assert.match(source, /订单提交后可查看入库结果/)
   assert.doesNotMatch(source, /confirmMerchantInbound|adjustMerchantInbound|sendMerchantInbound/)
 })
@@ -511,6 +512,13 @@ test('opens billing-weight confirmation independently from order details', () =>
   assert.match(source, /unavailable-message="未推送计费重"/)
 })
 
+test('shows the standalone billing-weight entry at every order node', () => {
+  const templateSource = source.slice(source.indexOf('<template>'), source.lastIndexOf('</template>'))
+  const entries = templateSource.match(/<el-button link type="primary" @click="openFeeConfirmation\([^)]*\)">确认计费重<\/el-button>/g) ?? []
+  assert.equal(entries.length, 2)
+  assert.doesNotMatch(templateSource, /v-if="[^"]*status === 'WAIT_SPLIT'[^"]*"[^>]*>确认计费重/)
+})
+
 test('discards stale inbound billing responses when billing views close or the user changes orders', () => {
   assert.match(source, /let inboundBillingRequestSequence = 0/)
   assert.match(source, /const sequence = \+\+inboundBillingRequestSequence/)
diff --git a/src/modules/first-leg/views/FirstLegOrdersView.vue b/src/modules/first-leg/views/FirstLegOrdersView.vue
index 02b1f9d..8037391 100644
--- a/src/modules/first-leg/views/FirstLegOrdersView.vue
+++ b/src/modules/first-leg/views/FirstLegOrdersView.vue
@@ -1259,7 +1259,9 @@ async function loadInboundBilling(order: FirstLegOrder, unavailableMessage = '
 
   if (order.status === 'DRAFT') {
     inboundBillingUnavailable.value = true
-    inboundBillingUnavailableMessage.value = '订单提交后可查看入库结果'
+    inboundBillingUnavailableMessage.value = feeConfirmationOpen.value
+      ? '未推送计费重'
+      : '订单提交后可查看入库结果'
     return
   }
 
@@ -1798,7 +1800,7 @@ async function searchOrders(model: QueryModel) {
           <template #actions="{ row }">
             <div class="order-row-actions">
               <el-button link type="primary" @click="openDetail(row as FirstLegOrder)"><Eye :size="15" />详情</el-button>
-              <el-button v-if="(row as FirstLegOrder).status === 'WAIT_SPLIT'" link type="primary" @click="openFeeConfirmation(row as FirstLegOrder)">确认计费重</el-button>
+              <el-button link type="primary" @click="openFeeConfirmation(row as FirstLegOrder)">确认计费重</el-button>
               <el-button v-if="canEditOrder && canClientEditFirstLegOrder((row as FirstLegOrder).status)" link type="primary" :loading="openingEditor" @click="openEdit(row as FirstLegOrder)"><Pencil :size="15" />编辑</el-button>
               <el-button v-if="eligibleCustomsDetail(row as FirstLegOrder)" link type="primary" @click="openCustomsDocuments(row as FirstLegOrder)"><FileText :size="15" />报关资料</el-button>
             </div>
@@ -1864,7 +1866,7 @@ async function searchOrders(model: QueryModel) {
             <span>更新于 {{ formatDateTime(order.updatedAt) }}</span>
             <div>
               <el-button link type="primary" @click="openDetail(order)"><Eye :size="15" />详情</el-button>
-              <el-button v-if="order.status === 'WAIT_SPLIT'" link type="primary" @click="openFeeConfirmation(order)">确认计费重</el-button>
+              <el-button link type="primary" @click="openFeeConfirmation(order)">确认计费重</el-button>
               <el-button v-if="canEditOrder && canClientEditFirstLegOrder(order.status)" link type="primary" :loading="openingEditor" @click="openEdit(order)"><Pencil :size="15" />编辑</el-button>
               <el-button v-if="eligibleCustomsDetail(order)" link type="primary" @click="openCustomsDocuments(order)"><FileText :size="15" />报关资料</el-button>
             </div>