From fec7295a0491feaa852e6be0033613e6db9fe103 Mon Sep 17 00:00:00 2001
From: liuyihe <2513762445@qq.com>
Date: Wed, 14 Oct 2026 12:14:46 +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/components/LocalPackingAcceptance.vue   | 6 ------
 src/components/ReturnBoxMergeWork.vue       | 2 +-
 src/pages/return-receipt/return-receipt.vue | 4 +---
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 src/components/LocalPackingAcceptance.vue

diff --git a/src/components/LocalPackingAcceptance.vue b/src/components/LocalPackingAcceptance.vue
deleted file mode 100644
index cbead0c..0000000
--- a/src/components/LocalPackingAcceptance.vue
+++ /dev/null
@@ -1,6 +0,0 @@
-<template><view class="work-card"><text>本地合箱接口验收</text><textarea aria-label="验收请求 JSON" v-model="request" style="height:160px;width:100%;border:1px solid #aaa"/><button @tap="run">执行 PDA 验收请求</button><text id="acceptance-result" style="white-space:pre-wrap;user-select:text">{{ result }}</text></view></template>
-<script>
-import { overseasRequest } from '@/api/overseas.js'
-export default {data(){return {request:'',result:''}},methods:{async run(){this.result='执行中';try{const input=JSON.parse(this.request);const results=[];for(const item of Array.isArray(input)?input:[input])results.push(await overseasRequest(item.method||'GET',item.path,item.data));this.result=JSON.stringify(results,null,2)}catch(e){this.result=JSON.stringify({error:e.message,code:e.code},null,2)}}}}
-</script>
-
diff --git a/src/components/ReturnBoxMergeWork.vue b/src/components/ReturnBoxMergeWork.vue
index 2013627..80227cb 100644
--- a/src/components/ReturnBoxMergeWork.vue
+++ b/src/components/ReturnBoxMergeWork.vue
@@ -15,7 +15,7 @@
           <text class="business-code">{{ box.cartonMark }} · {{ box.participation === 'FULL' ? '整箱' : box.participation === 'PARTIAL' ? '部分' : '计划来源' }}</text>
           <text class="meta-line">来源退货单：{{ box.sourceReturnNo || '—' }}</text>
           <text v-for="item in box.items || []" :key="item.skuCode" class="meta-line">{{ item.skuCode }} · {{ item.quantity }} 件</text>
-          <text v-for="item in box.originalItems || []" :key="'original-' + item.skuCode" class="meta-line">{{ item.skuCode }} · 原有 {{ item.quantity }} 件 · 计划后剩余 {{ target?.cartonMark === box.cartonMark ? item.quantity : Math.max(0, item.quantity - (box.items || []).filter(row => row.skuCode === item.skuCode).reduce((sum, row) => sum + row.quantity, 0)) }} 件</text>
+          <text v-for="item in box.originalItems || []" :key="'original-' + item.skuCode" class="meta-line">{{ item.skuCode }} · 原有 {{ item.quantity }} 件 · 计划后剩余 {{ target?.cartonMark === box.cartonMark ? item.quantity : Math.max(0, item.quantity - (box.items || []).filter(row => row.skuCode === item.skuCode).reduce((sum, row) => sum + Number(row.quantity), 0)) }} 件</text>
           <text class="hint">{{ target?.cartonMark === box.cartonMark ? '目标箱 · 保留原有库存' : sources.some(source => source.cartonMark === box.cartonMark) ? '已扫描确认' : '待扫描' }}</text>
         </view>
       </view>
diff --git a/src/pages/return-receipt/return-receipt.vue b/src/pages/return-receipt/return-receipt.vue
index 378e19b..49d2336 100644
--- a/src/pages/return-receipt/return-receipt.vue
+++ b/src/pages/return-receipt/return-receipt.vue
@@ -2,7 +2,6 @@
 	<view v-if="user" class="page-shell portal-page work-page">
 		<PortalHeader title="退货入库" :user="user" fallback-url="/pages/module/module?key=inbound" />
 		<scroll-view class="work-scroll" scroll-y><view class="portal-content work-content">
-			<LocalPackingAcceptance />
 			<view v-if="!current && !result && !receiptBatch" class="work-card">
 				<text class="card-title">扫描 SKU 69 码</text>
 				<ScanTargetInput name="lookup" v-model="lookupCode" label="SKU 69 码" placeholder="扫描商品 69 码，自动带出退货单号" :active="activeTarget === 'lookup'" @activate="activeTarget = 'lookup'" @submit="lookup" />
@@ -63,7 +62,6 @@
 
 <script>
 	import PortalHeader from '@/components/PortalHeader.vue'
-	import LocalPackingAcceptance from '@/components/LocalPackingAcceptance.vue'
 	import ScanTargetInput from '@/components/ScanTargetInput.vue'
 	import { checkReturnPallet, confirmReturnReceipt, createReturnPallet, downloadReturnPalletPhoto, findReturnSkuCandidates, manuallyCompleteReturnReceipt, startReturnReceipt, uploadReturnPalletPhoto } from '@/api/return-receipt.js'
 	import { session, requireSession } from '@/stores/session.js'
@@ -72,7 +70,7 @@
 	import { playErrorSound, playSuccessSound } from '@/utils/audio-feedback.js'
 
 	export default {
-		components: { PortalHeader, ScanTargetInput, LocalPackingAcceptance },
+		components: { PortalHeader, ScanTargetInput },
 		data() { return { user: session.currentUser, current: null, candidates: null, result: null, selectedSku: '', palletCheck: null, newPalletHtml: '', unitType: 'PALLET', unitCode: '', boxRows: [{ items: {}, length: '', width: '', height: '', weight: '', originalPackaging: true, confirmed: false }], palletLength: '', palletWidth: '', palletHeight: '', palletWeight: '', unitOptions: [{ value: 'PALLET', label: '托盘' }, { value: 'BOX', label: '箱子' }, { value: 'PARCEL', label: '包裹' }], photoFileIds: [], photoNames: [], photoUrls: {}, activeTarget: 'lookup', busy: false, error: null } },
 		computed: {
 			receiptBatch() { return warehouseWork.returnReceipt.pendingBatch },