fix: complete October 22 workflow feedback and request failure recovery

pages/picking/picking.vue

@@ -129,7 +129,7 @@
 									<text class="evidence-count" :class="{ complete: evidenceEntries(slot.type).length }">{{ evidenceEntries(slot.type).length ? `已拍 ${evidenceEntries(slot.type).length} 张` : '待拍摄' }}</text>
 								</view>
 							</view>
-							<button class="evidence-btn evidence-add-btn" :disabled="evidenceReadOnly" @tap="chooseEvidence(slot)">{{ evidenceUploadLabel(slot.type) }}</button>
+							<button class="evidence-btn evidence-add-btn" :disabled="evidenceReadOnly || evidenceUploading" @tap="chooseEvidence(slot)">{{ evidenceUploadLabel(slot.type) }}</button>
 						</view>
 						<view v-if="evidenceEntries(slot.type).length" class="evidence-photo-grid">
 							<view v-for="photo in evidenceEntries(slot.type)" :key="photo.id || photo.fileId || photo.localPath" class="evidence-photo-item">
@@ -143,18 +143,18 @@
 							{{ evidenceUploadState(slot.type) }}
 						</text>
 						<text v-else-if="hasPendingLocalEvidence(slot.type)" class="evidence-upload-state pending">
-							{{ slot.type === 'SEAL' ? '请填写封签号，保存后上传' : '照片待自动上传' }}
+							{{ slot.type === 'SEAL' ? '请填写封签号，保存后上传' : '照片未保存，请重新拍照上传' }}
 						</text>
-						<button v-if="evidenceQueueEntry(slot.type)?.status === 'FAILED'" class="evidence-retry-btn" @tap="retryEvidence(slot.type)">重试上传</button>
 					</view>
 				</view>
 				<view class="seal-row">
 					<input v-model="sealNo" :disabled="evidenceReadOnly" class="seal-input" placeholder="输入封签号（必填）" maxlength="64" />
-					<button class="evidence-btn seal-btn" :disabled="evidenceReadOnly || sealSaving || !sealReadyToSave" @tap="saveSealNo">{{ sealSaving ? '上传中…' : '保存并上传' }}</button>
+					<button class="evidence-btn seal-btn" :disabled="evidenceReadOnly || evidenceUploading || sealSaving || !sealReadyToSave" @tap="saveSealNo">{{ sealSaving ? '上传中…' : '保存并上传' }}</button>
 				</view>
 				<view v-if="remoteError" class="remote-error-row"><text class="remote-error" role="alert">{{ remoteError }}</text><button class="evidence-retry-btn" :disabled="remoteLoading" @tap="refreshTask">刷新任务</button></view>
 				<text v-if="evidenceReadOnly" class="version-hint" role="status">{{ loadingCompletionState.label }}</text>
-				<button v-else class="loading-complete-btn" :disabled="submitting || !loadingStageReady || pickingVersion === null || !evidenceComplete" @tap="completeLoadingTask">确认装柜完成</button>
+				<button v-else class="loading-complete-btn" :disabled="submitting || evidenceUploading || !loadingStageReady || pickingVersion === null || !evidenceComplete" @tap="completeLoadingTask">确认装柜完成</button>
+				<button v-if="evidenceReadOnly && loadingCompletionState.phase !== 'COMPLETED'" class="evidence-retry-btn" :disabled="remoteLoading || submitting" @tap="refreshTask">刷新完成状态</button>
 				<view v-if="pickingVersion === null" class="remote-error-row">
 					<text class="version-hint" role="status">状态尚未同步，请刷新重试</text>
 					<button class="evidence-retry-btn" :disabled="remoteLoading" @tap="refreshTask">刷新任务</button>
@@ -340,12 +340,11 @@
 	import { ITEM_STATUS, classifyScan, createItemStates, getPickSummary, isSealedPalletItem, submitStates, summarizeInventoryResources, remainingPhysicalCartons } from '@/utils/picking-state.js'
 	import { SKIP_REASONS, INCOMPLETE_REASONS } from '@/data/demo-data.js'
 	import { session, requireSession } from '@/stores/session.js'
-	import { clearLoadingCompletionAttempt, clearPickingDraft, getPickingSession, restoreLoadingCompletionAttempt, restorePickingSession, saveLoadingCompletionAttempt, savePickingSession } from '@/stores/picking.js'
+	import { clearPickingDraft, getPickingSession, restorePickingSession, savePickingSession } from '@/stores/picking.js'
 	import { navigateBackOr } from '@/utils/navigation.js'
 	import { startScanBroadcast } from '@/utils/scan-broadcast.js'
 	import { playErrorSound, playSuccessSound } from '@/utils/audio-feedback.js'
 	import { claimContainerPickingTask, completeContainerPickingTask, downloadEvidencePreview, EVIDENCE_SLOTS, getContainerPickingTask, getEvidence, getEvidencePreviewUrl, getPickingInventorySnapshot, isRemoteReady, listLoadingOrders, normalizePickingTask, partialContainerItem, pickContainerItem, pickContainerPallet, skipContainerItem, submitContainerPickingBatch, uploadEvidenceFile, voidEvidence } from '@/api/pda-loading.js'
-	import { createEvidenceUploadQueue } from '@/utils/evidence-upload-queue.js'
 	import { isOnline } from '@/utils/network.js'
 	import { stableOperationId } from '@/utils/idempotency.js'
 	import { stableTaskOperationIdentity } from '@/utils/task-identity.js'
@@ -391,7 +390,7 @@
 				selectedIncompleteReason: '',
 				completionSummary: { picked: 0, partial: 0, skipped: 0, autoSkipped: 0 },
 				evidenceSlots: EVIDENCE_SLOTS,
-				evidenceFiles: {}, evidenceDrafts: {}, evidencePreviewCache: {}, evidenceQueueItems: [], evidenceQueue: null, evidenceContextId: 0, evidenceIdentity: null, cameraPicking: false, evidencePreviewOpening: false, evidencePreviewReturning: false, sealNo: '', sealSaving: false, pickingVersion: null, remotePick: null,
+				evidenceFiles: {}, evidenceDrafts: {}, evidencePreviewCache: {}, evidenceQueueItems: [], evidenceUploading: false, evidenceContextId: 0, evidenceIdentity: null, cameraPicking: false, evidencePreviewOpening: false, evidencePreviewReturning: false, sealNo: '', sealSaving: false, pickingVersion: null, remotePick: null,
 				remoteTaskId: null, assignmentVersion: null, submitId: '',
 				taskRequestId: 0,
 				remoteError: '', remoteLoading: false, submitting: false,
@@ -837,10 +836,7 @@
 				this.evidenceQueueItems = []
 				this.sealNo = ''
 				this.sealSaving = false
-				this.evidenceQueue = createEvidenceUploadQueue({
-					upload: (item, onProgress) => uploadEvidenceFile(item.taskId, item.warehouseId, item, item.localPath, onProgress),
-					onChange: (items) => { if (this.evidenceContextId === contextId) this.evidenceQueueItems = items }
-				})
+				this.evidenceUploading = false
 			},
 			normalizeScanHistory(entries) {
 				if (!Array.isArray(entries)) return []
@@ -1254,7 +1250,6 @@
 					if (seal?.sealNo) this.sealNo = seal.sealNo
 					await this.loadEvidencePreviews(contextId, identity)
 					if (!this.isEvidenceContextActive(contextId, identity)) return
-					await this.flushPendingEvidence()
 				} catch (error) {
 					if (!this.isEvidenceContextActive(contextId, identity)) return
 					this.remoteError = error.network ? '网络失败，装柜证据未加载，请刷新重试' : this.remoteFailureMessage(error, '装柜证据加载失败')
@@ -1334,48 +1329,31 @@
 				if (seal?.sealNo) this.sealNo = seal.sealNo
 				this.removeDraftPhoto(type, localPath)
 			},
-			async queueEvidenceUpload(type, path, sealNo = null) {
-				if (!this.evidenceIdentity?.taskId || !this.evidenceIdentity?.warehouseId || !isRemoteReady(this.evidenceIdentity.taskId)) { this.showToast('当前任务仓库尚未同步，证据保留本地', 'warning'); return }
-				const contextId = this.evidenceContextId
-				const identity = { ...this.evidenceIdentity }
-				const queue = this.evidenceQueue
-				const active = [...this.validEvidenceEntries(type)].reverse()[0]
-				const expectedVersion = active?.version ?? 0
-				const operationId = stableOperationId('evidence-upload', `${identity.taskId}|${identity.warehouseId}`, { evidenceType: type, expectedVersion, localPath: path, sealNo: sealNo || '' })
-				const entry = queue.add({ taskId: identity.taskId, warehouseId: identity.warehouseId, evidenceType: type, expectedVersion, sealNo: sealNo || null, remark: null, operationId, localPath: path })
-				this.debugSubmit('evidence.queue.start', { evidenceType: type, queueId: entry.id, evidenceIdentity: identity })
-				await queue.flush()
-				if (!this.isEvidenceContextActive(contextId, identity) || queue !== this.evidenceQueue) return
-				const latest = queue.snapshot().find((item) => item.id === entry.id)
-				this.debugSubmit('evidence.queue.result', { evidenceType: type, queueId: entry.id, status: latest?.status || 'missing', fileId: latest?.result?.fileId || null, error: latest?.error || '' })
-				if (latest?.status !== 'SUCCEEDED') { this.remoteError = latest?.error || '文件上传失败'; return }
-				this.applyEvidenceResponse(latest.result, type, path, identity)
-				this.showToast(type === 'SEAL' ? '带锁码照上传成功，封签号已保存' : '照片已上传并保存', 'success')
-			},
-			async flushPendingEvidence() {
-				if (!this.evidenceIdentity?.taskId || !this.evidenceIdentity?.warehouseId) return
-				const pending = this.evidenceSlots.flatMap((slot) => this.evidenceEntries(slot.type).filter((entry) => !entry.id && entry.localPath).map((entry) => ({ type: slot.type, path: entry.localPath })))
-				for (const item of pending) {
-					if (!this.evidenceIdentity?.taskId || !this.evidenceIdentity?.warehouseId) return
-					if (item.type === 'SEAL' && !String(this.sealNo || '').trim()) continue
-					await this.queueEvidenceUpload(item.type, item.path, item.type === 'SEAL' ? this.sealNo : null)
-				}
-			},
-			async retryEvidence(type) {
-				if (!this.requireEvidenceCapture()) return
-				const item = this.evidenceQueueEntry(type)
-				const contextId = this.evidenceContextId
-				const identity = { ...this.evidenceIdentity }
-				const queue = this.evidenceQueue
-				if (!item || !queue.retry(item.id)) return
-				this.remoteError = ''
-				await queue.flush()
-				if (!this.isEvidenceContextActive(contextId, identity) || queue !== this.evidenceQueue) return
-				const latest = queue.latest(type)
-				if (latest?.status !== 'SUCCEEDED') { this.remoteError = latest?.error || '文件上传失败'; return }
-				this.applyEvidenceResponse(latest.result, type, item.localPath, identity)
-				this.showToast(type === 'SEAL' ? '带锁码照上传成功，封签号已保存' : '照片重试上传成功', 'success')
-			},
+            async queueEvidenceUpload(type, path, sealNo = null) {
+                if (this.evidenceUploading || this.evidenceReadOnly) return
+                if (!this.evidenceIdentity?.taskId || !this.evidenceIdentity?.warehouseId || !isRemoteReady(this.evidenceIdentity.taskId)) { this.showToast('当前任务仓库尚未同步，请刷新后重新操作', 'warning'); return }
+                const contextId = this.evidenceContextId
+                const identity = { ...this.evidenceIdentity }
+                const current = [...this.validEvidenceEntries(type)].reverse()[0]
+                const entry = { id: `${Date.now()}-${Math.random()}`, evidenceType: type, status: 'UPLOADING', progress: 0, error: '' }
+                this.evidenceQueueItems = [...this.evidenceQueueItems.filter(item => item.evidenceType !== type), entry]
+                this.evidenceUploading = true
+                this.remoteError = ''
+                try {
+                    const result = await uploadEvidenceFile(identity.taskId, identity.warehouseId, {
+                        evidenceType: type, expectedVersion: current?.version ?? 0, sealNo,
+                        operationId: `evidence-${Date.now()}-${Math.random().toString(36).slice(2)}`
+                    }, path, progress => { if (this.isEvidenceContextActive(contextId, identity)) entry.progress = progress })
+                    if (!this.isEvidenceContextActive(contextId, identity)) return
+                    entry.status = 'SUCCEEDED'
+                    this.applyEvidenceResponse(result, type, path, identity)
+                    this.showToast(type === 'SEAL' ? '带锁码照上传成功，封签号已保存' : '照片已上传并保存', 'success')
+                } catch (error) {
+                    if (!this.isEvidenceContextActive(contextId, identity)) return
+                    entry.status = 'FAILED'; entry.error = this.remoteFailureMessage(error, '照片上传失败，请重新操作')
+                    this.remoteError = entry.error
+                } finally { if (this.isEvidenceContextActive(contextId, identity)) { this.evidenceUploading = false; this.evidenceQueueItems = this.evidenceQueueItems.map(item => ({ ...item })) } }
+            },
 			async saveSealNo() {
 				if (this.sealSaving) return
 				if (!String(this.sealNo || '').trim()) { this.showToast('请输入封签号', 'warning'); return }
@@ -1411,18 +1389,18 @@
 				}
 			},
 			async completeLoadingTask() {
-				if (!this.requireEvidenceStage()) return
+				if (this.evidenceUploading || !this.requireEvidenceStage()) return
 				if (!this.evidenceIdentity?.taskId || !this.evidenceIdentity?.warehouseId || !isRemoteReady(this.evidenceIdentity.taskId)) { this.showToast('装柜任务或仓库尚未同步，请刷新后重试', 'warning'); return }
 				if (this.pickingVersion === null) { this.showToast(VERSION_SYNC_MESSAGE, 'warning'); return }
 				if (!this.evidenceComplete) { this.showToast('五类有效照片和封签号均为必填', 'warning'); return }
 				const contextId = this.evidenceContextId
 				const identity = { ...this.evidenceIdentity }
 				const serverAttempt = this.remotePick?.completionCommand
-				const savedAttempt = restoreLoadingCompletionAttempt(this.draftIdentity()) || (serverAttempt?.operationId ? {
+				const savedAttempt = serverAttempt?.status === 'FAILED' && serverAttempt.operationId ? {
 					operationId: serverAttempt.operationId,
 					expectedTaskVersion: serverAttempt.expectedTaskVersion,
 					remark: serverAttempt.remark || 'PDA确认装柜完成'
-				} : null)
+				} : null
 				const expectedTaskVersion = savedAttempt?.expectedTaskVersion ?? Number(this.pickingVersion)
 				const completionIdentity = this.draftIdentity()
 				const operationIdentity = stableTaskOperationIdentity(completionIdentity)
@@ -1433,8 +1411,10 @@
 					containerBookingId: completionIdentity.containerBookingId
 				})
 				const completionAttempt = { operationId, expectedTaskVersion, remark: savedAttempt?.remark || 'PDA确认装柜完成' }
-				saveLoadingCompletionAttempt(this.draftIdentity(), completionAttempt)
+				const submission = {}
+				this._submissionOwner = submission
 				this.submitting = true
+				this.remoteError = ''
 				const started = Date.now()
 				let accepted = false
 				try {
@@ -1479,11 +1459,10 @@
 						return
 					}
 					if (phase !== COMPLETION_PHASE.COMPLETED) {
-						this.remoteError = phase === COMPLETION_PHASE.FAILED ? '装柜完成失败，可使用原操作重试完成' : '提交结果待确认，请刷新任务'
+						this.remoteError = phase === COMPLETION_PHASE.FAILED ? '装柜完成失败，请重新操作' : '提交结果待确认，请刷新任务'
 						this.showToast(phase === COMPLETION_PHASE.FAILED ? '装柜完成失败' : '提交结果待确认', 'warning')
 						return
 					}
-					clearLoadingCompletionAttempt(this.draftIdentity())
 					this.remoteError = ''
 					this.showToast('装柜已完成', 'success')
 				} catch (error) {
@@ -1495,9 +1474,8 @@
 						return
 					}
 					if (shouldReconcileCompletion(error)) {
-						this.remoteError = '提交结果待确认，请返回任务列表刷新'
+						this.remoteError = '提交结果待确认，请刷新任务后重新操作'
 						this.showToast('提交结果待确认', 'warning')
-						navigateBackOr('/pages/tasks/tasks')
 						return
 					}
 					if (this.isTaskConflict(error)) {
@@ -1509,7 +1487,7 @@
 					this.showToast('装柜完成失败', 'error')
 				}
 				finally {
-					if (this.isEvidenceContextActive(contextId, identity)) this.submitting = false
+					if (this._submissionOwner === submission) { this.submitting = false; this._submissionOwner = null }
 				}
 			},
 			async pickScannedBox(item, boxCode) {
@@ -1635,6 +1613,8 @@
 					itemId, itemVersion: item.version, taskVersion: this.pickingVersion, ...payload
 				})
 				const common = { warehouseId: this.currentBox.warehouseId, version: Number(item.version || 0), operationId }
+				const submission = {}
+				this._submissionOwner = submission
 				this.submitting = true
 				this.remoteError = ''
 				try {
@@ -1653,7 +1633,7 @@
 					}
 					return false
 				} finally {
-					this.submitting = false
+					if (this._submissionOwner === submission) { this.submitting = false; this._submissionOwner = null }
 				}
 			},
 			applyImmediateTaskResult(result) {
@@ -1747,6 +1727,8 @@
 					return
 				}
 				if (remoteRequired) {
+					const submission = {}
+					this._submissionOwner = submission
 					this.submitting = true
 					try {
 						if (!this.remoteTaskId) throw new Error('尚未进入服务端拣货任务，请联网刷新后重试')
@@ -1802,7 +1784,7 @@
 						this.remoteError = error.network ? '网络失败，拣货完成未提交，请重试' : this.remoteFailureMessage(error, '拣货完成失败')
 						this.showToast('拣货完成未提交，请查看错误提示', 'error')
 						return
-					} finally { this.submitting = false }
+					} finally { if (this._submissionOwner === submission) { this.submitting = false; this._submissionOwner = null } }
 				}
 				const result = submitStates(this.currentBox.items, this.itemStates)
 				this.itemStates = result.states