From 67dd844dc27f1f187db57c1e398a5b895b42f7f0 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Tue, 22 Sep 2026 08:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RelabelPalletWork.vue | 9 +++++----
 src/pages/relabel/relabel.vue        | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/RelabelPalletWork.vue b/src/components/RelabelPalletWork.vue
index b058689..bd24a41 100644
--- a/src/components/RelabelPalletWork.vue
+++ b/src/components/RelabelPalletWork.vue
@@ -23,7 +23,8 @@
       <template v-if="isReturnBulk">
         <text class="return-pallet-summary">{{ selectedSource.palletCode }}：{{ wholeSource ? '整托换标' : '部分拆箱' }} {{ quantity || 0 }} 件 → {{ selectedDestination || '目的仓待维护' }}</text>
         <text v-if="wholeSource" class="hint">贴标数量等于本托盘全部 {{ selectedSource.stockPackages }} 件，无需填写拆箱数量；直接新增带目的仓的托盘标签并绑定。</text>
-        <template v-else><input v-model="quantity" type="number" :disabled="busy" :placeholder="`请输入拆箱数量（应为 ${plannedPackages} 件）`" /><text class="hint">贴标数量少于本托盘库存，请按现场实际选择来源托盘并填写拆箱数量；本托盘应拆 {{ plannedPackages }} 件。</text></template>
+        <template v-else-if="allowDisassemble"><input v-model="quantity" type="number" :disabled="busy" :placeholder="`请输入拆箱数量（应为 ${plannedPackages} 件）`" /><text class="hint">贴标数量少于本托盘库存，请按现场实际选择来源托盘并填写拆箱数量；本托盘应拆 {{ plannedPackages }} 件。</text></template>
+        <text v-else class="hint">退货换标按整托绑定，不支持拆箱；托盘仍会展示用于核对。</text>
         <text class="hint">退货换标无需扫描箱唛。</text>
       </template>
       <template v-else><input v-model="quantity" type="number" :disabled="busy" placeholder="输入实际拆出箱数" @input="marks = []" /><text class="hint">选择本批新目的仓</text><view class="line"><button v-for="dest in destinations" :key="dest" :disabled="busy" @tap="selectedDestination = dest; marks = []">{{ selectedDestination === dest ? '✓ ' : '' }}{{ dest }}</button></view><button :disabled="busy" @tap="fillBatch">按箱数填入本批换标箱</button><text class="hint">请核对下面勾选的箱与现场搬动一致；数量不符时不能提交。此处确认的是新目标托盘绑定，不推断旧箱唛位置。</text><view v-for="item in eligibleItems" :key="item.cartonMark" class="line" @tap="toggleMark(item.cartonMark)"><text>{{ marks.includes(item.cartonMark) ? '☑' : '☐' }} {{ item.cartonMark }} → {{ item.fbaCartonMark || item.destinationFbaWarehouseCode }}</text></view><text class="hint">本批确认 {{ marks.length }} 个箱唛 / 拆出 {{ quantity || 0 }} 箱</text></template>
@@ -41,7 +42,7 @@ import { resolvePallet, createRelabelPallet, bindRelabelPallet, findRelabelSourc
 import { warehouseIdempotencyKey, releaseWarehouseKey } from '@/stores/warehouse-work.js'
 export default {
   components: { ScanTargetInput },
-  props: { task: { type: Object, required: true } },
+  props: { task: { type: Object, required: true }, allowDisassemble: { type: Boolean, default: true } },
   emits: ['activate', 'busy', 'saved'],
   data() { return { rebindSelection: null, active: 'source', sourceCode: '', targetCode: '', source: null, target: null, marks: [], busy: false, error: '', message: '', newPallet: null, sourceRows: [], selectedSource: null, quantity: '', selectedDestination: '' } },
   mounted() { this.loadSources() },
@@ -65,7 +66,7 @@ export default {
     isReturnBulk() { return this.task.operationType === 'RETURN_BULK_SKU_LABEL' },
     operableSourceRows() { return this.sourceRows.filter(row => Number(row.movablePackages) > 0) },
     plannedPackages() { return this.eligibleItems.reduce((sum, item) => sum + Number(item.expectedPackages || 0), 0) },
-    wholeSource() { return this.isReturnBulk && this.selectedSource && this.plannedPackages === Number(this.selectedSource.stockPackages || 0) },
+    wholeSource() { return this.isReturnBulk && this.selectedSource && (!this.allowDisassemble || this.plannedPackages === Number(this.selectedSource.stockPackages || 0)) },
     readyToBind() { return this.source && this.target && this.selectedSource && this.samePallet(this.source, this.selectedSource) && !this.samePallet(this.source, this.target) && Number.isSafeInteger(Number(this.quantity)) && Number(this.quantity) > 0 && Number(this.quantity) <= this.selectedSource.movablePackages && this.bindingSelectionValid() }
   },
   methods: {
@@ -124,7 +125,7 @@ export default {
       if (this.isReturnBulk) {
         const items = this.eligibleItems
         this.marks = items.map(item => item.cartonMark)
-        if (items.reduce((sum, item) => sum + Number(item.expectedPackages || 0), 0) === Number(row.stockPackages || 0)) this.quantity = String(row.stockPackages)
+        if (!this.allowDisassemble || items.reduce((sum, item) => sum + Number(item.expectedPackages || 0), 0) === Number(row.stockPackages || 0)) this.quantity = String(row.stockPackages)
         await this.run(async () => { const value = await resolvePallet(row.palletCode); if (this.selectedSource?.positionId === row.positionId) { this.source = value; this.sourceCode = value.palletCode } })
         this.activate(this.quantity ? 'target' : 'source')
         return
diff --git a/src/pages/relabel/relabel.vue b/src/pages/relabel/relabel.vue
index b68298c..0e996a6 100644
--- a/src/pages/relabel/relabel.vue
+++ b/src/pages/relabel/relabel.vue
@@ -28,7 +28,7 @@
 					<view v-if="isReturnBulk" class="item-list section-gap"><view v-for="group in returnBulkSkuGroups" :key="group.key" class="item-card" :class="{ done: group.remaining === 0 }">
 						<view class="row-head"><view><text class="business-code">{{ group.skuCode }}</text><text class="meta-line">FBA 目的仓：{{ group.destinationFbaWarehouseCode || '—' }}</text></view><text class="status-pill">剩余 {{ group.remaining }} 件</text></view>
 						<view class="metric-row"><view class="metric"><strong>{{ group.expectedPackages }}</strong><text>贴标预报</text></view><view class="metric"><strong>{{ group.relabelledPackages }}</strong><text>已贴</text></view></view>
-						<view class="source-allocation"><text class="source-title">来源托盘拆箱数量</text><view v-for="source in group.sources" :key="source.itemId" class="source-row"><text>{{ source.palletCode || '未记录托盘' }}</text><strong>拆箱 {{ source.expectedPackages }} 件</strong></view><view class="source-total"><text>合计拆箱</text><strong>{{ group.expectedPackages }} 件</strong></view></view>
+						<view class="source-allocation"><text class="source-title">来源托盘{{ isReturnBulk ? '换标数量' : '拆箱数量' }}</text><view v-for="source in group.sources" :key="source.itemId" class="source-row"><text>{{ source.palletCode || '未记录托盘' }}</text><strong>{{ isReturnBulk ? '换标' : '拆箱' }} {{ source.expectedPackages }} 件</strong></view><view class="source-total"><text>合计{{ isReturnBulk ? '换标' : '拆箱' }}</text><strong>{{ group.expectedPackages }} 件</strong></view></view>
 						<view v-if="group.remaining > 0"><input v-model="bulkQuantities[group.key]" class="bulk-quantity" type="number" :placeholder="`本次贴标数量（默认剩余 ${group.remaining} 件）`" /><button class="primary bulk-total-button" :disabled="busy || verifiedReturnSkuKey !== group.key || returnSkuCode.trim().toUpperCase() !== group.skuCode.toUpperCase()" @tap="completeBulkSku(group)">{{ busyAction === 'return-bulk-sku' ? '提交中…' : `登记本次贴标（默认 ${group.remaining} 件）` }}</button></view>
 					</view></view>
 					<view v-if="taskTab === 'carton' && !isReturnBulk" class="section-gap"><ScanTargetInput name="quickCarton" v-model="quickCarton" label="仓库唛头" placeholder="扫描或输入箱唛" :active="activeTarget === 'quick-carton'" @activate="activeTarget = 'quick-carton'" @submit="submitCarton" /><button class="primary" :disabled="busy || !quickCarton.trim()" @tap="submitCarton(quickCarton)">确认本箱</button></view>
@@ -52,7 +52,7 @@
 					<view class="section-gap">
 						<!-- Return SKU relabel still requires moving the received carton from the
 						     source pallet to a new pallet carrying the FBA destination. -->
-						<RelabelPalletWork v-if="taskTab === 'carton' || isReturnBulk" ref="palletWork" :key="current.relabelNo" :task="current" @activate="activeTarget = 'pallet-work'" @busy="busy = $event" @saved="reloadCurrent" />
+						<RelabelPalletWork v-if="taskTab === 'carton' || isReturnBulk" ref="palletWork" :key="current.relabelNo" :task="current" :allow-disassemble="!isReturnBulk" @activate="activeTarget = 'pallet-work'" @busy="busy = $event" @saved="reloadCurrent" />
 						<view class="row-head"><text class="card-title">完成照片</text><text class="status-pill">{{ photoFileIds.length }} / 20 张</text></view>
 						<button class="secondary" :disabled="busy || photoFileIds.length >= 20" @tap="choosePhoto">拍照或从相册选择</button>
 						<view class="photo-grid"><view v-for="(fileId,index) in photoFileIds" :key="fileId" class="photo-tile">