优化

tests/warehouse-workflows.test.mjs

@@ -109,25 +109,28 @@ test('relabel list opens a row directly in execution and completion returns to t
 	assert.match(page, /async openExecution\(item\)/)
 	assert.match(page, /relabelExecute&task=\$\{encodeURIComponent\(item\.relabelNo\)\}/)
 	assert.match(page, /当前账号正在执行 \$\{active\.relabelNo\}/)
-	assert.match(page, /v-if="stage === 'execute' && showCurrent" class="detail-toolbar"[\s\S]*@tap="closeCurrent">\u2039 返回列表<\/button>/)
+	assert.match(page, /v-if="showCurrent" class="detail-toolbar"[\s\S]*@tap="closeCurrent">\u2039 返回列表<\/button>/)
 	assert.match(page, /closeCurrent\(\) \{ this\.current = null;[\s\S]*this\.taskCode = '' \}/)
 	assert.match(page, /updateWarehouseWork\('relabel', \{ currentNo: '', photoFileIds: \[\], photoNames: \[\], remark: '' \}\)/)
 	assert.match(page, /if \(completed\) this\.goToClaimList\(\)/)
 	assert.match(page, /goToClaimList\(\) \{ this\.taskCode = ''; uni\.redirectTo\(\{ url: '\/pages\/relabel\/relabel\?op=relabelReceive' \}\) \}/)
 })
 
-test('relabel review is a read-only list and completed execution details stay hidden', async () => {
+test('relabel review opens a pending task as customer-confirmation read-only detail', async () => {
 	const page = await read('../src/pages/relabel/relabel.vue')
 	const body = page.match(/showCurrent\(\) \{([^\n]+)\},/)[1]
 	const visible = new Function(body)
 	const context = { stage: 'execute', entryTaskNo: '', current: { relabelNo: 'RL-1', taskStatus: 'PROCESSING' }, candidates: [{ relabelNo: 'RL-1', taskStatus: 'PROCESSING', claimedByCurrentOperator: true }] }
 	assert.equal(visible.call(context), true, 'detail without ownership field must use server candidate ownership')
 	assert.equal(visible.call({ ...context, candidates: [] }), false)
-	assert.equal(visible.call({ ...context, stage: 'review' }), false)
+	assert.equal(visible.call({ ...context, stage: 'review', current: { ...context.current, taskStatus: 'WAIT_REVIEW' } }), true)
 	assert.equal(visible.call({ ...context, current: { ...context.current, taskStatus: 'WAIT_REVIEW' } }), false)
-	assert.match(page, /stageSubtitle\(\) \{ return this\.stage === 'review' \? '仅展示当前仓库已完成现场换标并等待复核的单据'/)
-	const reviewList = page.slice(page.indexOf('<view v-else class="task-list">'), page.indexOf('<view v-if="showCurrent"'))
-	assert.doesNotMatch(reviewList, /@tap|详情/)
+	assert.match(page, /stageSubtitle\(\) \{ return this\.stage === 'review' \? '仅展示当前仓库已完成现场换标并等待客户或平台处理的单据'/)
+	assert.match(page, /<view v-else class="task-list">[\s\S]*@tap="openReview\(item\)"/)
+	assert.match(page, /查看并复核/)
+	assert.match(page, /async openReview\(item\)/)
+	assert.match(page, /现场换标已经完成。请客户在客户工作台核对完工结果并确认/)
+	assert.doesNotMatch(page, /@tap="review\('APPROVE'\)"/)
 	assert.match(page, /<button v-if="stage !== 'review'" class="link-button"[^>]*@tap="bootstrap"/)
 	assert.match(page, /if \(this\.stage === 'execute'\) this\.startScanner\(\)/)
 	const bootstrapBody = page.match(/async bootstrap\(\) \{([^\n]+)\},/)[1]
@@ -139,6 +142,16 @@ test('relabel review is a read-only list and completed execution details stay hi
 	assert.deepEqual(opened, ['RL-1'], 'workbench execution entry must stay on the processing-task list')
 })
 
+test('returned relabel tasks are highlighted, sorted first, and still obey the single active task lock', async () => {
+	const page = await read('../src/pages/relabel/relabel.vue')
+	assert.match(page, /item\.reviewDecision === 'REWORK'[\s\S]*退回重做[\s\S]*优先处理/)
+	assert.match(page, /退回备注：\{\{ item\.reviewRemark \}\}/)
+	assert.match(page, /\.sort\(\(left, right\) => Number\(right\.reviewDecision === 'REWORK'\) - Number\(left\.reviewDecision === 'REWORK'\)/)
+	assert.match(page, /const active = this\.candidates\.find\(\(candidate\) => candidate\.taskStatus === 'PROCESSING' && candidate\.claimedByCurrentOperator === true\)/)
+	assert.match(page, /if \(active && active\.relabelNo !== item\.relabelNo\) return this\.promptActiveTask\(active\)/)
+	assert.match(page, /AVAILABLE: '待认领'/)
+})
+
 test('warehouse drafts are isolated by operator and warehouse and retain retry keys until success', () => {
 	const values = new Map()
 	globalThis.uni = {