优化

src/components/RelabelPalletWork.vue

@@ -9,13 +9,14 @@
       <button v-for="binding in currentBindings" :key="binding.mark" class="binding-row" :disabled="busy" @tap="selectRebind(binding)"><text class="binding-mark">{{ binding.mark }}</text><text class="binding-arrow">→</text><text class="binding-pallet">{{ binding.pallet }}</text><text class="binding-action">重新绑定</text></button>
     </view>
     <view v-if="rebindSelection"><text class="hint">正在改绑：{{ rebindSelection.mark }}，当前托盘：{{ rebindSelection.pallet }}</text><button :disabled="busy" @tap="rebindSelection = null; targetCode = ''; target = null">取消改绑</button></view>
+    <template v-if="!allBindingsComplete && !rebindSelection">
     <view v-for="row in operableSourceRows" :key="row.positionId" class="source-row" :class="{ selected: selectedSource?.positionId === row.positionId }" @tap="selectSource(row)">
       <view class="source-identifiers"><view class="source-identifier"><text class="source-caption">托盘号</text><text class="source-code">{{ row.palletCode }}</text></view></view>
       <text class="source-quantity">{{ isReturnBulk ? '件数' : '箱数' }}：{{ row.stockPackages }} · 可拆{{ isReturnBulk ? '件数' : '箱数' }}：{{ row.movablePackages }}</text>
     </view>
     <text v-if="!busy && !operableSourceRows.length" class="hint">当前没有可操作的来源托盘</text>
     <ScanTargetInput v-if="!isReturnBulk" v-model="sourceCode" name="relabel-source" label="实际来源托盘" placeholder="扫描实际来源托盘" :active="active === 'source'" @activate="activate('source')" @submit="confirmSourceScan" />
-    <text v-if="source" class="hint">已确认：{{ source.palletCode }}</text>
+    <text v-if="source" class="hint">来源已确认：{{ source.palletCode }}；尚未拆出，请完成贴标登记、核对拆出数量并扫描目标托盘，绑定成功后才保存拆托明细。</text>
     <view v-if="selectedSource">
       <text v-if="isReturnBulk" class="hint">本次{{ wholeSource ? '整托换标数量' : '拆出件数' }}（可分多个来源托盘，逐批提交）</text>
       <template v-if="isReturnBulk">
@@ -28,9 +29,14 @@
       <template v-else><view class="split-quantity-row"><text>本次拆出箱数</text><input v-model="quantity" type="number" :disabled="busy" placeholder="箱数" @input="marks = []" /><text>箱</text></view></template>
     </view>
     <view class="split-progress"><template v-if="!isReturnBulk"><text>本次需换标拆 <strong>{{ requiredSplitPackages }}</strong> 箱</text><text>已拆 <strong>{{ splitPackages }}</strong> 箱</text></template><button class="create-pallet-button" :disabled="busy || !!newPallet" @tap="createPallet">新增托盘号</button></view>
+    </template>
+    <template v-if="!allBindingsComplete || rebindSelection">
     <ScanTargetInput v-model="targetCode" name="relabel-target" label="目标托盘" placeholder="扫描同目的仓目标托盘或新托盘号" :active="active === 'target'" @activate="activate('target')" @submit="confirmTargetAndBind" />
+    <button :disabled="busy || !targetCode.trim()" @tap="confirmTargetAndBind">{{ rebindSelection ? '确认改绑目标托盘' : '确认绑定目标托盘' }}</button>
+    <text v-if="labelBlockReason" class="hint">{{ labelBlockReason }}</text>
     <text v-if="target" class="hint">已识别目标：{{ target.palletCode }}，尚未绑定成功</text>
     <view v-if="newPallet" class="hint"><text>托盘 {{ newPallet.palletCode }} 待绑定</text><button @tap="printPallet">查看 / 打印托盘标签</button></view>
+    </template>
     <text v-if="message" class="hint">{{ message }}</text><text v-if="error" class="error">{{ error }}</text>
   </view>
 </template>
@@ -45,6 +51,11 @@ export default {
   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() },
   computed: {
+    allBindingsComplete() {
+      const required = (this.task.items || []).filter(item => Number(item.expectedPackages || 0) > 0 && (item.returnCartonId || ['CARTON_LABEL', 'CARTON_AND_SKU', 'RETURN_BULK_SKU_LABEL'].includes(item.operationType)))
+      const bound = new Set(this.currentBindings.map(binding => binding.mark))
+      return required.length > 0 && required.every(item => bound.has(item.cartonMark))
+    },
     requiredSplitPackages() { return (this.task.items || []).filter(item => ['CARTON_LABEL', 'CARTON_AND_SKU'].includes(item.operationType)).reduce((sum, item) => sum + Number(item.expectedPackages || 0), 0) },
     splitPackages() { const bound = new Set(this.currentBindings.map(binding => binding.mark)); return (this.task.items || []).filter(item => ['CARTON_LABEL', 'CARTON_AND_SKU'].includes(item.operationType) && bound.has(item.cartonMark)).reduce((sum, item) => sum + Number(item.expectedPackages || 0), 0) },
     currentBindings() {
@@ -65,6 +76,13 @@ 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) },
+    labelBlockReason() {
+      const pending = this.sourceItems().filter(item => Number(item.relabelledPackages || 0) < Number(item.expectedPackages || 1))
+      if (!pending.length) return ''
+      const missingSku = pending.some(item => item.operationType === 'CARTON_AND_SKU' && Number(item.skuProcessedPackages || 0) < Number(item.expectedPackages || 1))
+      if (missingSku) return '本托盘还有未完成的 SKU 贴标登记。混合换标须完成箱唛和 SKU 两项，请返回 SKU 页签处理后再确认绑定。'
+      return '本托盘还有未完成的换标明细，请先完成贴标登记，再确认目标托盘绑定。'
+    },
     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() }
   },
@@ -157,13 +175,14 @@ export default {
       await this.resolve('source')
       if (this.error || !this.source) return
       const source = this.source; this.source = null
-      if (await this.confirmBindingChoice(`是否绑定来源托盘 ${source.palletCode}？`)) this.source = source
+      if (await this.confirmBindingChoice(`是否绑定来源托盘 ${source.palletCode}？`)) { this.source = source; this.activate('target') }
     },
     showBindingMessage(title, content) { uni.showModal({ title, content, showCancel: false, confirmText: '知道了' }) },
     async confirmTargetAndBind() {
       if (this.busy) return
       if (this.rebindSelection) return this.submitRebind()
       if (!this.isReturnBulk && this.selectedSource && this.samePallet(this.source, this.selectedSource)) {
+        if (!this.completedItems().length && this.labelBlockReason) { this.error = this.labelBlockReason; this.showBindingMessage('尚未绑定', this.error); return }
         this.selectedDestination = this.completedItems()[0]?.destinationFbaWarehouseCode || ''
         this.marks = []
         this.fillBatch()