优化

pages/tasks/tasks.vue

@@ -26,6 +26,7 @@
 	import PortalHeader from '@/components/PortalHeader.vue'
 	import { listLoadingOrders } from '@/api/pda-loading.js'
 	import { session, requireSession } from '@/stores/session.js'
+	import { clearPickingDraft } from '@/stores/picking.js'
 	import { isOnline, watchNetwork } from '@/utils/network.js'
 
 	export default {
@@ -36,13 +37,19 @@
 		onUnload() { if (this._stopNetwork) this._stopNetwork(); clearTimeout(this._toastTimer) },
 		methods: {
 			statusLabel(status) { return status === 'IN_PROGRESS' ? '拣货中' : '待领取' },
-			isTaskReady(task) { return Boolean(task.taskId && task.loadingPlanId && task.containerBookingId && task.cabinetNo && task.currentContainerNo && task.warehouseId && task.version !== null && task.version !== undefined && Number.isInteger(Number(task.version)) && task.assignmentVersion !== null && task.assignmentVersion !== undefined && Number.isInteger(Number(task.assignmentVersion)) && ['UNASSIGNED', 'IN_PROGRESS'].includes(task.workflowStatus)) },
+			isMergedTask(task) { return task?.recordStatus === 'MERGED' || Boolean(task?.mergedIntoContainerBookingId) },
+			clearMergedTaskDraft(task) {
+				const operatorId = session.currentUser?.id || session.currentUser?.userId || session.currentUser?.accountId
+				clearPickingDraft({ operatorId, taskId: task.taskId, loadingPlanId: task.loadingPlanId, containerBookingId: task.containerBookingId, warehouseId: task.warehouseId })
+			},
+			isTaskReady(task) { return Boolean(task.recordStatus === 'ACTIVE' && !task.mergedIntoContainerBookingId && task.taskId && task.loadingPlanId && task.containerBookingId && task.cabinetNo && task.currentContainerNo && task.warehouseId && task.version !== null && task.version !== undefined && Number.isInteger(Number(task.version)) && task.assignmentVersion !== null && task.assignmentVersion !== undefined && Number.isInteger(Number(task.assignmentVersion)) && ['UNASSIGNED', 'IN_PROGRESS'].includes(task.workflowStatus)) },
 			async loadTasks() {
 				if (!isOnline()) { this.error = '当前网络不可用，请联网后刷新'; return }
 				this.loading = true; this.error = ''; this.notice = ''
 				try {
 					const result = await listLoadingOrders({ page: 1, size: 50 })
 					const records = result.records || []
+					records.filter((task) => this.isMergedTask(task)).forEach((task) => this.clearMergedTaskDraft(task))
 					this.tasks = records.filter((task) => this.isTaskReady(task))
 					if (records.length > this.tasks.length) this.notice = '部分任务尚未完成服务端就绪校验，本机已隐藏，请稍后刷新'
 				} catch (error) {