From 78f31fb9a352db48b9be17b09a0b275481e04025 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Mon, 14 Sep 2026 10:22:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E6=B5=B7=E5=A4=96?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=89=8D=E7=AB=AF=E8=B4=A8=E9=87=8F=E9=97=A8?=
 =?UTF-8?q?=E7=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/WarehouseTransferReviewDialog.vue           | 2 +-
 src/modules/overseas-warehouse/pages/OutboundsView.vue     | 2 +-
 .../overseas-warehouse/pages/phase5Behavior.test.ts        | 2 +-
 .../overseas-warehouse/pages/prototypeContract.test.ts     | 7 ++++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue b/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue
index 65d4e6b0..8ea9fcbe 100644
--- a/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue
+++ b/src/modules/overseas-warehouse/components/WarehouseTransferReviewDialog.vue
@@ -62,7 +62,7 @@ watch(() => props.modelValue, (value) => { if (value) { form.decision = 'APPROVE
       <template v-if="detail.needRelabel"><h3>换标绑定明细</h3><DataTable :data="detail.relabelBindings" :columns="bindingColumns" :show-pagination="false" row-key="customerCartonMark" empty-text="暂无换标绑定明细" /></template>
       <template v-if="detail.pallets?.length"><h3>PDA 打托实测</h3><DataTable :data="detail.pallets" :columns="palletColumns" :show-pagination="false" row-key="id" empty-text="暂无打托数据" /></template>
       <el-form-item label="审核结论" required><el-radio-group v-model="form.decision"><el-radio-button value="APPROVE"><CheckCircle2 :size="15" />审核通过</el-radio-button><el-radio-button value="REJECT"><XCircle :size="15" />驳回</el-radio-button></el-radio-group></el-form-item>
-      <el-form-item :label="form.decision === 'REJECT' ? '驳回原因' : '审核备注'" :required="form.decision === 'REJECT'"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit /></el-form-item>
+      <el-form-item :label="form.decision === 'REJECT' ? '驳回原因' : '审核备注'" :required="form.decision === 'REJECT'"><el-input v-model="form.remark" type="textarea" :rows="3" maxlength="1000" show-word-limit placeholder="请输入审核备注（选填）" /></el-form-item>
     </el-form>
   </AppDialog>
 </template>
diff --git a/src/modules/overseas-warehouse/pages/OutboundsView.vue b/src/modules/overseas-warehouse/pages/OutboundsView.vue
index b19e95a3..4d45daae 100644
--- a/src/modules/overseas-warehouse/pages/OutboundsView.vue
+++ b/src/modules/overseas-warehouse/pages/OutboundsView.vue
@@ -18,7 +18,7 @@ import { cancelOutbound, createOneClickDropshipOutbound, createReturnOutbound, l
 import { type InventoryBalanceDto, type InventoryPositionDto } from '../api/inventory'
 import { formatOverseasDateTime } from '../lastMilePresentation'
 import { overseasWarehousePermissions as permission } from '../permissions'
-import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam/api/platformIam'
+import { listPlatformTenants, type PlatformTenantResource } from '@/modules/iam'
 import { listPlatformWarehouses, type PlatformWarehouseSummaryResource } from '@/modules/warehouses'
 import { getReturnCarton, listReturnCartons, listReturnStock, type ReturnCartonDetail, type ReturnCartonRow, type ReturnStockRow } from '../api/returnInventory'
 
diff --git a/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts b/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts
index 67d8730a..802af7d6 100644
--- a/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts
+++ b/src/modules/overseas-warehouse/pages/phase5Behavior.test.ts
@@ -20,7 +20,7 @@ describe('phase-five outbound, delivery, exception and visit behavior', () => {
     expect(detail).toContain('getOutbound(outboundNo.value)')
     expect(detail).toContain('cancelOutbound(outboundNo.value, reason)')
     expect(detail).not.toContain('customerId')
-    expect(list).toContain('createOneClickDropshipOutbound(selectedCustomerId.value')
+    expect(list).toContain("createOneClickDropshipOutbound([...customerIds][0] || ''")
     expectOperationColumnFirst('OutboundsView.vue')
   })
 
diff --git a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
index 53fb654f..f669c673 100644
--- a/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
+++ b/src/modules/overseas-warehouse/pages/prototypeContract.test.ts
@@ -349,9 +349,10 @@ describe('overseas warehouse first-batch prototype contract', () => {
     expect(value).toContain('aria-label="尾程订单状态"')
     expect(value).toContain('<el-radio-button value="全部">全部</el-radio-button>')
     expect(value).toContain('<el-radio-button value="待分配">待分配</el-radio-button>')
-    expect(value.indexOf("label: '入库单号'")).toBeLessThan(value.indexOf("label: '出库单号'"))
-    expect(value.indexOf("label: '出库单号'")).toBeLessThan(value.indexOf("label: '派送单号'"))
-    expect(value.indexOf("label: '派送单号'")).toBeLessThan(value.indexOf("label: '换标单号'"))
+    const columns = value.slice(value.indexOf('const columns:'), value.indexOf('const selectedContainerIds'))
+    expect(columns.indexOf("label: '入库单号'")).toBeLessThan(columns.indexOf("label: '出库单号'"))
+    expect(columns.indexOf("label: '出库单号'")).toBeLessThan(columns.indexOf("label: '派送单号'"))
+    expect(columns.indexOf("label: '派送单号'")).toBeLessThan(columns.indexOf("label: '换标单号'"))
     expect(value).not.toMatch(/router\.push\([^)]*(outbound|dispatch)/)
   })