+
+
([])
const fieldValues = ref({})
const validationErrors = ref({})
const validationSummaryActive = ref(false)
-const mutationBusy = ref<'save' | 'confirm' | null>(null)
+const mutationBusy = ref<'save' | 'confirm' | 'manual-convert' | null>(null)
const canSave = computed(() => Boolean(detail.value?.availability.editable))
const canConfirm = computed(() => Boolean(detail.value?.availability.confirmable))
+const isManualReviewTask = computed(() => (detail.value ? taskHasManualReviewCode(detail.value) : false))
const validationErrorMessages = computed(() => toValidationErrorMessages(validationErrors.value))
watch(
@@ -229,11 +239,7 @@ async function loadTask(taskId: string): Promise {
fetchReservationTaskDetail(taskId),
fetchReservationTaskAudits(taskId),
])
- detail.value = nextDetail
- audits.value = nextAudits.items
- fieldValues.value = buildInitialFieldValues(nextDetail.fields, nextDetail.draft_payload ?? nextDetail.confirmed_payload)
- validationErrors.value = {}
- validationSummaryActive.value = false
+ applyTaskData(nextDetail, nextAudits.items)
} catch (error) {
errorMessage.value = error instanceof Error ? error.message : String(error)
} finally {
@@ -249,6 +255,36 @@ async function confirmTask(): Promise {
await mutateTaskPayload('confirm')
}
+async function submitManualReviewConversion(request: ReservationManualReviewConversionRequest): Promise {
+ if (!detail.value) {
+ return
+ }
+ actionErrorMessage.value = ''
+ notice.value = ''
+ if (request.target_task_type !== 'NEW_BOOKING' && !request.target_order_id) {
+ actionErrorMessage.value = t('task.manualConversion.targetOrderRequired')
+ return
+ }
+
+ mutationBusy.value = 'manual-convert'
+ try {
+ const result = await convertReservationManualReviewTask(detail.value.task_id, request)
+ const [nextDetail, nextAudits] = await Promise.all([
+ fetchReservationTaskDetail(detail.value.task_id),
+ fetchReservationTaskAudits(detail.value.task_id),
+ ])
+ applyTaskData(nextDetail, nextAudits.items)
+ notice.value = t('task.manualConversion.succeeded', {
+ taskType: formatReservationTaskCard(t, result.task_card_type),
+ orderId: result.order_id,
+ })
+ } catch (error) {
+ actionErrorMessage.value = error instanceof Error ? error.message : String(error)
+ } finally {
+ mutationBusy.value = null
+ }
+}
+
async function mutateTaskPayload(action: 'save' | 'confirm'): Promise {
if (!detail.value) {
return
@@ -283,6 +319,30 @@ async function mutateTaskPayload(action: 'save' | 'confirm'): Promise {
}
}
+function applyTaskData(nextDetail: ReservationTaskDetailResult, nextAudits: ReservationTaskAuditLogResult[]): void {
+ detail.value = nextDetail
+ audits.value = nextAudits
+ fieldValues.value = buildInitialFieldValues(nextDetail.fields, nextDetail.draft_payload ?? nextDetail.confirmed_payload)
+ validationErrors.value = {}
+ validationSummaryActive.value = false
+}
+
+function taskHasManualReviewCode(taskDetail: ReservationTaskDetailResult): boolean {
+ const taskCodes = [
+ taskDetail.system_task_type,
+ taskDetail.task_card_type,
+ ...taskDetail.fields.flatMap((field) => [field.result_type, field.task_type, field.task_subtype]),
+ ]
+ return taskCodes.some((code) => {
+ const normalizedCode = normalizeStableCode(code)
+ return ['MANUAL_REVIEW', 'FALLBACK', 'FALLBACK_REVIEW'].includes(normalizedCode)
+ })
+}
+
+function normalizeStableCode(code: string | null | undefined): string {
+ return code?.trim().replace(/[\s-]+/g, '_').toUpperCase() ?? ''
+}
+
function validateBeforeConfirm(taskDetail: ReservationTaskDetailResult): boolean {
const nextErrors = validateReservationFieldValues(taskDetail.fields, fieldValues.value)
validationErrors.value = nextErrors
diff --git a/client/src/i18n/locales/en-US.ts b/client/src/i18n/locales/en-US.ts
index 96287d2..d49aceb 100644
--- a/client/src/i18n/locales/en-US.ts
+++ b/client/src/i18n/locales/en-US.ts
@@ -64,6 +64,10 @@ export default {
subtitle: 'Review Reservation work by order',
keyword: 'Group Code / Confirmation No.',
keywordPlaceholder: 'Group code / confirmation no.',
+ groupCode: 'Group code',
+ groupCodePlaceholder: 'Enter group code',
+ confirmationNumber: 'Confirmation no.',
+ confirmationNumberPlaceholder: 'Enter confirmation no.',
tableTitle: 'Order data',
totalSuffix: 'orders',
viewDetail: 'View detail',
@@ -102,6 +106,7 @@ export default {
keyword: 'Order / email keyword',
keywordPlaceholder: 'Order no. / email keyword',
taskType: 'Task type',
+ taskSubtype: 'Task subtype',
tableTitle: 'Task data',
totalSuffix: 'tasks',
noSourceSubject: 'No source subject',
@@ -158,6 +163,25 @@ export default {
sourceSender: 'Sender',
sourceReceivedAt: 'Received at',
sourceSummaryPending: 'Source email summary fields are pending backend support',
+ manualConversion: {
+ title: 'Manual conversion',
+ description: 'Convert a Fallback / manual review task into a processable reservation task.',
+ targetTaskType: 'Target task type',
+ targetOrder: 'Target order',
+ targetOrderHelp: 'Update or cancel tasks must select a non-deleted order.',
+ targetOrderKeyword: 'Target order search',
+ targetOrderKeywordPlaceholder: 'Group code, confirmation no., or order keyword',
+ searchTargetOrders: 'Search orders',
+ noTargetOrderCandidates: 'Enter a keyword and search for target orders',
+ orderDeletedDisabled: 'Deleted orders cannot be selected',
+ newBookingHint: 'New booking conversion does not require a target order; the backend will reassign by task context.',
+ reason: 'Reason',
+ reasonPlaceholder: 'Optional note for the manual decision',
+ submit: 'Convert task',
+ targetOrderRequired: 'Select a target order',
+ succeeded: 'Manual conversion completed: {taskType}, target order {orderId}',
+ orderId: 'Order ID',
+ },
},
conversation: {
title: 'Email conversation detail',
@@ -291,6 +315,7 @@ export default {
OPERA_EXECUTED: 'OPERA executed',
OPERA_RETRIED: 'OPERA retried',
MANUAL_REVIEW_CREATED: 'Manual review created',
+ MANUAL_REVIEW_CONVERT: 'Manual conversion',
},
operaOperation: {
CREATE_RESERVATION: 'Create reservation',
diff --git a/client/src/i18n/locales/th-TH.ts b/client/src/i18n/locales/th-TH.ts
index 593d8c7..a39a670 100644
--- a/client/src/i18n/locales/th-TH.ts
+++ b/client/src/i18n/locales/th-TH.ts
@@ -64,6 +64,10 @@ export default {
subtitle: 'ดูงานการจองตามออเดอร์',
keyword: 'เลขกรุ๊ป / เลขยืนยัน',
keywordPlaceholder: 'เลขกรุ๊ป / เลขยืนยัน',
+ groupCode: 'เลขกรุ๊ป',
+ groupCodePlaceholder: 'กรอกเลขกรุ๊ป',
+ confirmationNumber: 'เลขยืนยัน',
+ confirmationNumberPlaceholder: 'กรอกเลขยืนยัน',
tableTitle: 'ข้อมูลออเดอร์',
totalSuffix: 'ออเดอร์',
viewDetail: 'ดูรายละเอียด',
@@ -102,6 +106,7 @@ export default {
keyword: 'คำค้นออเดอร์ / อีเมล',
keywordPlaceholder: 'เลขออเดอร์ / คำค้นอีเมล',
taskType: 'ประเภทงาน',
+ taskSubtype: 'ประเภทย่อยของงาน',
tableTitle: 'ข้อมูลงาน',
totalSuffix: 'งาน',
noSourceSubject: 'ไม่มีหัวข้ออีเมลต้นทาง',
@@ -158,6 +163,25 @@ export default {
sourceSender: 'ผู้ส่ง',
sourceReceivedAt: 'เวลารับ',
sourceSummaryPending: 'ข้อมูลสรุปอีเมลต้นทางยังรอหลังบ้านเพิ่มเติม',
+ manualConversion: {
+ title: 'แปลงงานด้วยคน',
+ description: 'แปลงงาน Fallback / งานตรวจสอบด้วยคนให้เป็นงานการจองที่ประมวลผลได้',
+ targetTaskType: 'ประเภทงานปลายทาง',
+ targetOrder: 'ออเดอร์ปลายทาง',
+ targetOrderHelp: 'งานแก้ไขหรือยกเลิกต้องเลือกออเดอร์ที่ยังไม่ถูกลบ',
+ targetOrderKeyword: 'ค้นหาออเดอร์ปลายทาง',
+ targetOrderKeywordPlaceholder: 'เลขกรุ๊ป เลขยืนยัน หรือคำค้นออเดอร์',
+ searchTargetOrders: 'ค้นหาออเดอร์',
+ noTargetOrderCandidates: 'กรอกคำค้นแล้วค้นหาออเดอร์ปลายทาง',
+ orderDeletedDisabled: 'เลือกออเดอร์ที่ถูกลบแล้วไม่ได้',
+ newBookingHint: 'การแปลงเป็นจองใหม่ไม่จำเป็นต้องเลือกออเดอร์ปลายทาง ระบบหลังบ้านจะจัดออเดอร์ตามบริบทงาน',
+ reason: 'เหตุผลการแปลง',
+ reasonPlaceholder: 'ไม่บังคับ ระบุเหตุผลการตัดสินใจ',
+ submit: 'แปลงงาน',
+ targetOrderRequired: 'โปรดเลือกออเดอร์ปลายทาง',
+ succeeded: 'แปลงงานสำเร็จ: {taskType}, ออเดอร์ปลายทาง {orderId}',
+ orderId: 'รหัสออเดอร์',
+ },
},
conversation: {
title: 'รายละเอียดเธรดอีเมล',
@@ -291,6 +315,7 @@ export default {
OPERA_EXECUTED: 'ดำเนินการ OPERA',
OPERA_RETRIED: 'ลอง OPERA ใหม่',
MANUAL_REVIEW_CREATED: 'สร้างงานตรวจสอบด้วยคน',
+ MANUAL_REVIEW_CONVERT: 'แปลงงานด้วยคน',
},
operaOperation: {
CREATE_RESERVATION: 'สร้างการจอง',
diff --git a/client/src/i18n/locales/zh-CN.ts b/client/src/i18n/locales/zh-CN.ts
index f64fe58..1ac763c 100644
--- a/client/src/i18n/locales/zh-CN.ts
+++ b/client/src/i18n/locales/zh-CN.ts
@@ -64,6 +64,10 @@ export default {
subtitle: '按订单查看预订处理入口',
keyword: '团队号 / 确认号',
keywordPlaceholder: '团队号 / 确认号',
+ groupCode: '团队号',
+ groupCodePlaceholder: '输入团队号',
+ confirmationNumber: '确认号',
+ confirmationNumberPlaceholder: '输入确认号',
tableTitle: '订单数据',
totalSuffix: '条订单',
viewDetail: '查看详情',
@@ -102,6 +106,7 @@ export default {
keyword: '订单 / 邮件关键词',
keywordPlaceholder: '订单号 / 邮件关键词',
taskType: '任务类型',
+ taskSubtype: '任务细分',
tableTitle: '任务数据',
totalSuffix: '条任务',
noSourceSubject: '暂无来源主题',
@@ -158,6 +163,25 @@ export default {
sourceSender: '发件人',
sourceReceivedAt: '接收时间',
sourceSummaryPending: '来源邮件摘要字段待后端补充',
+ manualConversion: {
+ title: '人工转换',
+ description: '将人工复核任务转换为可处理的预订任务。',
+ targetTaskType: '目标任务类型',
+ targetOrder: '目标订单',
+ targetOrderHelp: '修改或取消预订必须选择一个未删除订单。',
+ targetOrderKeyword: '目标订单搜索',
+ targetOrderKeywordPlaceholder: '团队号、确认号或订单关键词',
+ searchTargetOrders: '搜索订单',
+ noTargetOrderCandidates: '请输入关键词并搜索目标订单',
+ orderDeletedDisabled: '已删除订单不可选',
+ newBookingHint: '转为新预订时不强制选择目标订单，后端会按当前任务重新归属。',
+ reason: '转换原因',
+ reasonPlaceholder: '可选，说明人工判断依据',
+ submit: '转换任务',
+ targetOrderRequired: '请选择目标订单',
+ succeeded: '人工转换已完成：{taskType}，目标订单 {orderId}',
+ orderId: '订单编号',
+ },
},
conversation: {
title: '邮件会话详情',
@@ -291,6 +315,7 @@ export default {
OPERA_EXECUTED: 'OPERA 执行',
OPERA_RETRIED: 'OPERA 重试',
MANUAL_REVIEW_CREATED: '创建人工复核',
+ MANUAL_REVIEW_CONVERT: '人工转换',
},
operaOperation: {
CREATE_RESERVATION: '创建预订',
diff --git a/client/src/services/reservationService.ts b/client/src/services/reservationService.ts
index ed11e78..403a0a9 100644
--- a/client/src/services/reservationService.ts
+++ b/client/src/services/reservationService.ts
@@ -5,6 +5,8 @@ import {
import { reservationHotelId } from '@/config/reservationConfig'
import { getJson, sendJson } from '@/services/httpClient'
import type {
+ ReservationManualReviewConversionRequest,
+ ReservationManualReviewConversionResult,
ReservationOperaOperationResult,
ReservationOperaSimulationRequest,
ReservationOrderDetailResult,
@@ -78,6 +80,17 @@ export async function confirmReservationTask(
return sendJson(`/api/reservation/tasks/${taskId}/confirm`, 'POST', request)
}
+export async function convertReservationManualReviewTask(
+ taskId: string,
+ request: ReservationManualReviewConversionRequest,
+): Promise {
+ return sendJson(
+ `/api/reservation/tasks/${encodeURIComponent(taskId)}/manual-review-conversions`,
+ 'POST',
+ request,
+ )
+}
+
export async function executeReservationOperaOperation(
taskId: string,
operationId: string,
diff --git a/client/src/tests/reservationService.spec.ts b/client/src/tests/reservationService.spec.ts
index 6217895..d147f03 100644
--- a/client/src/tests/reservationService.spec.ts
+++ b/client/src/tests/reservationService.spec.ts
@@ -1,6 +1,7 @@
import { beforeEach, describe, expect, it, vi } from 'vitest'
import {
+ convertReservationManualReviewTask,
fetchReservationOrderDetail,
fetchReservationOrders,
fetchReservationTaskDetail,
@@ -76,6 +77,31 @@ describe('reservationService real API mode', () => {
expect(result.items[0]?.source_subject).toBe('Booking Request')
})
+ it('passes task subtype and terminal task status filters to the backend', async () => {
+ const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
+ mockJsonResponse({
+ items: [],
+ page: {
+ page_num: 1,
+ page_size: 20,
+ total: 0,
+ },
+ }),
+ )
+
+ await fetchReservationTaskList({
+ task_subtype: 'RATE_CHANGE',
+ task_status: 'FAILED',
+ page_num: 1,
+ page_size: 20,
+ })
+
+ expect(fetchMock).toHaveBeenCalledWith(
+ '/api/reservation/tasks?hotel_id=HOTEL-TEST&task_subtype=RATE_CHANGE&task_status=FAILED&page_num=1&page_size=20',
+ expect.objectContaining({ method: 'GET' }),
+ )
+ })
+
it('fetches the order list from the backend by default', async () => {
const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
mockJsonResponse({
@@ -117,6 +143,70 @@ describe('reservationService real API mode', () => {
expect(result.items[0]?.next_processable_task_id).toBe('10002')
})
+ it('passes order status and business-key filters to the backend', async () => {
+ const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
+ mockJsonResponse({
+ items: [],
+ page: {
+ page_num: 2,
+ page_size: 10,
+ total: 0,
+ },
+ }),
+ )
+
+ await fetchReservationOrders({
+ order_status: 'LOGIC_DELETED',
+ group_code: 'GRP-001',
+ confirmation_number: 'CNF-001',
+ keyword: 'VIP',
+ page_num: 2,
+ page_size: 10,
+ })
+
+ expect(fetchMock).toHaveBeenCalledWith(
+ '/api/reservation/orders?hotel_id=HOTEL-TEST&order_status=LOGIC_DELETED&group_code=GRP-001&confirmation_number=CNF-001&keyword=VIP&page_num=2&page_size=10',
+ expect.objectContaining({ method: 'GET' }),
+ )
+ })
+
+ it('converts a manual review task through the backend endpoint', async () => {
+ const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
+ mockJsonResponse({
+ task_id: '10001',
+ order_id: '20002',
+ original_order_id: '20001',
+ system_task_type: 'UPDATE_BOOKING',
+ task_card_type: 'UPDATE_BOOKING',
+ task_status: 'PENDING_CONFIRM',
+ original_order_logic_deleted: true,
+ }),
+ )
+
+ const result = await convertReservationManualReviewTask('10001', {
+ target_task_type: 'UPDATE_BOOKING',
+ target_order_id: '20002',
+ reason: 'Matched by group code',
+ })
+
+ expect(fetchMock).toHaveBeenCalledWith(
+ '/api/reservation/tasks/10001/manual-review-conversions',
+ expect.objectContaining({
+ method: 'POST',
+ headers: expect.objectContaining({
+ 'Content-Type': 'application/json',
+ }),
+ body: JSON.stringify({
+ target_task_type: 'UPDATE_BOOKING',
+ target_order_id: '20002',
+ reason: 'Matched by group code',
+ }),
+ }),
+ )
+ expect(result.system_task_type).toBe('UPDATE_BOOKING')
+ expect(result.original_order_logic_deleted).toBe(true)
+ })
+
it('fetches order detail from the backend by default', async () => {
const fetchMock = vi.spyOn(globalThis, 'fetch').mockResolvedValue(
mockJsonResponse({
diff --git a/client/src/tests/reservationTaskDetailPanel.spec.ts b/client/src/tests/reservationTaskDetailPanel.spec.ts
index a840b84..c226403 100644
--- a/client/src/tests/reservationTaskDetailPanel.spec.ts
+++ b/client/src/tests/reservationTaskDetailPanel.spec.ts
@@ -6,6 +6,9 @@ import { createMemoryHistory, createRouter } from 'vue-router'
import zhCN from '@/i18n/locales/zh-CN'
import ReservationTaskDetailPanel from '@/components/reservation/ReservationTaskDetailPanel.vue'
import type {
+ ReservationManualReviewConversionResult,
+ ReservationOrderListItem,
+ ReservationOrderListResult,
ReservationTaskAuditLogResult,
ReservationTaskDetailResult,
ReservationTaskFieldResult,
@@ -18,6 +21,8 @@ vi.mock('@/services/reservationService', async (importOriginal) => {
...actual,
fetchReservationTaskDetail: vi.fn(),
fetchReservationTaskAudits: vi.fn(),
+ fetchReservationOrders: vi.fn(),
+ convertReservationManualReviewTask: vi.fn(),
saveReservationTaskDraft: vi.fn(),
confirmReservationTask: vi.fn(),
}
@@ -70,6 +75,50 @@ function createMutationResult(taskStatus = 'PENDING_CONFIRM'): ReservationTaskPa
}
}
+function createManualReviewConversionResult(
+ overrides: Partial = {},
+): ReservationManualReviewConversionResult {
+ return {
+ task_id: '10001',
+ order_id: '20001',
+ original_order_id: '20001',
+ system_task_type: 'NEW_BOOKING',
+ task_card_type: 'NEW_BOOKING',
+ task_status: 'PENDING_CONFIRM',
+ original_order_logic_deleted: false,
+ ...overrides,
+ }
+}
+
+function createOrderCandidate(overrides: Partial = {}): ReservationOrderListItem {
+ return {
+ order_id: '20002',
+ hotel_id: 'HOTEL-TEST',
+ order_status: 'ACTIVE',
+ display_order_key: 'GRP-001',
+ temporary_order_no: null,
+ confirmation_number: 'CNF-001',
+ group_code: 'GRP-001',
+ display_name: 'GRP-001',
+ open_task_count: 1,
+ next_processable_task_id: null,
+ created_at: '2026-07-08T03:00:00Z',
+ updated_at: '2026-07-08T03:10:00Z',
+ ...overrides,
+ }
+}
+
+function createOrderCandidateResult(items: ReservationOrderListItem[]): ReservationOrderListResult {
+ return {
+ items,
+ page: {
+ page_num: 1,
+ page_size: 8,
+ total: items.length,
+ },
+ }
+}
+
function createAudit(auditId: string, action: string): ReservationTaskAuditLogResult {
return {
audit_id: auditId,
@@ -162,6 +211,8 @@ describe('ReservationTaskDetailPanel', () => {
beforeEach(() => {
vi.mocked(service.fetchReservationTaskDetail).mockReset()
vi.mocked(service.fetchReservationTaskAudits).mockReset()
+ vi.mocked(service.fetchReservationOrders).mockReset()
+ vi.mocked(service.convertReservationManualReviewTask).mockReset()
vi.mocked(service.saveReservationTaskDraft).mockReset()
vi.mocked(service.confirmReservationTask).mockReset()
vi.mocked(service.fetchReservationTaskDetail).mockResolvedValue(createTaskDetail())
@@ -169,6 +220,8 @@ describe('ReservationTaskDetailPanel', () => {
task_id: '10001',
items: [],
})
+ vi.mocked(service.fetchReservationOrders).mockResolvedValue(createOrderCandidateResult([]))
+ vi.mocked(service.convertReservationManualReviewTask).mockResolvedValue(createManualReviewConversionResult())
})
it('shows draft save errors instead of leaving an unhandled rejection', async () => {
@@ -335,4 +388,115 @@ describe('ReservationTaskDetailPanel', () => {
expect(wrapper.text()).toContain('查看邮件会话')
expect(wrapper.text()).not.toContain('接口待补')
})
+
+ it('converts a manual review task to a new booking without a target order', async () => {
+ vi.mocked(service.fetchReservationTaskDetail)
+ .mockResolvedValueOnce(
+ createTaskDetail({
+ system_task_type: 'MANUAL_REVIEW',
+ task_card_type: 'MANUAL_REVIEW',
+ }),
+ )
+ .mockResolvedValueOnce(
+ createTaskDetail({
+ system_task_type: 'NEW_BOOKING',
+ task_card_type: 'NEW_BOOKING',
+ }),
+ )
+ vi.mocked(service.fetchReservationTaskAudits)
+ .mockResolvedValueOnce({
+ task_id: '10001',
+ items: [createAudit('audit-1', 'TASK_LOADED')],
+ })
+ .mockResolvedValueOnce({
+ task_id: '10001',
+ items: [createAudit('audit-2', 'MANUAL_REVIEW_CONVERT')],
+ })
+
+ const wrapper = await mountPanel()
+ expect(wrapper.text()).toContain('人工转换')
+
+ await wrapper.find('select[name="manual_target_task_type"]').setValue('NEW_BOOKING')
+ await wrapper.find('textarea[name="manual_conversion_reason"]').setValue('识别为新预订')
+ await findButton(wrapper, '转换任务').trigger('click')
+ await flushPromises()
+
+ expect(service.convertReservationManualReviewTask).toHaveBeenCalledWith('10001', {
+ target_task_type: 'NEW_BOOKING',
+ reason: '识别为新预订',
+ })
+ expect(service.fetchReservationTaskDetail).toHaveBeenCalledTimes(2)
+ expect(service.fetchReservationTaskAudits).toHaveBeenCalledTimes(2)
+ expect(wrapper.text()).toContain('人工转换已完成')
+ expect(wrapper.text()).toContain('人工转换')
+ expect(wrapper.text()).not.toContain('MANUAL_REVIEW_CONVERT')
+ })
+
+ it('requires a non-deleted target order when converting manual review to update booking', async () => {
+ vi.mocked(service.fetchReservationTaskDetail).mockResolvedValue(
+ createTaskDetail({
+ system_task_type: 'MANUAL_REVIEW',
+ task_card_type: 'MANUAL_REVIEW',
+ }),
+ )
+ vi.mocked(service.fetchReservationOrders).mockResolvedValue(
+ createOrderCandidateResult([
+ createOrderCandidate({
+ order_id: '20002',
+ display_order_key: 'GRP-ACTIVE',
+ group_code: 'GRP-ACTIVE',
+ confirmation_number: 'CNF-ACTIVE',
+ order_status: 'ACTIVE',
+ }),
+ createOrderCandidate({
+ order_id: '20003',
+ display_order_key: 'GRP-DELETED',
+ group_code: 'GRP-DELETED',
+ confirmation_number: 'CNF-DELETED',
+ order_status: 'LOGIC_DELETED',
+ }),
+ ]),
+ )
+ vi.mocked(service.convertReservationManualReviewTask).mockResolvedValue(
+ createManualReviewConversionResult({
+ order_id: '20002',
+ original_order_id: '20001',
+ system_task_type: 'UPDATE_BOOKING',
+ task_card_type: 'UPDATE_BOOKING',
+ }),
+ )
+
+ const wrapper = await mountPanel()
+
+ await wrapper.find('select[name="manual_target_task_type"]').setValue('UPDATE_BOOKING')
+ await findButton(wrapper, '转换任务').trigger('click')
+ await flushPromises()
+
+ expect(service.convertReservationManualReviewTask).not.toHaveBeenCalled()
+ expect(wrapper.text()).toContain('请选择目标订单')
+
+ await wrapper.find('input[name="manual_target_order_keyword"]').setValue('GRP')
+ await findButton(wrapper, '搜索订单').trigger('click')
+ await flushPromises()
+
+ expect(service.fetchReservationOrders).toHaveBeenCalledWith(
+ expect.objectContaining({
+ keyword: 'GRP',
+ page_num: 1,
+ page_size: 8,
+ }),
+ )
+ expect(wrapper.text()).toContain('GRP-ACTIVE')
+ expect(wrapper.text()).toContain('GRP-DELETED')
+ expect(wrapper.find('input[value="20003"]').attributes('disabled')).toBeDefined()
+
+ await wrapper.find('input[value="20002"]').setValue()
+ await findButton(wrapper, '转换任务').trigger('click')
+ await flushPromises()
+
+ expect(service.convertReservationManualReviewTask).toHaveBeenCalledWith('10001', {
+ target_task_type: 'UPDATE_BOOKING',
+ target_order_id: '20002',
+ })
+ })
})
diff --git a/client/src/tests/reservationViews.spec.ts b/client/src/tests/reservationViews.spec.ts
index 3fc0500..1eb613b 100644
--- a/client/src/tests/reservationViews.spec.ts
+++ b/client/src/tests/reservationViews.spec.ts
@@ -310,6 +310,29 @@ describe('reservation P0 views', () => {
expect(wrapper.text()).not.toContain('接口待接入')
})
+ it('filters order list with order status and business-key fields', async () => {
+ vi.mocked(service.fetchReservationOrders).mockResolvedValue(createOrderListResult())
+
+ const wrapper = await mountWithPlugins(ReservationOrderListView)
+ await vi.dynamicImportSettled()
+
+ await wrapper.find('select[name="order_status"]').setValue('LOGIC_DELETED')
+ await vi.dynamicImportSettled()
+ await wrapper.find('input[name="group_code"]').setValue('GRP-009')
+ await vi.dynamicImportSettled()
+ await wrapper.find('input[name="confirmation_number"]').setValue('CNF-009')
+ await vi.dynamicImportSettled()
+
+ expect(service.fetchReservationOrders).toHaveBeenLastCalledWith(
+ expect.objectContaining({
+ order_status: 'LOGIC_DELETED',
+ group_code: 'GRP-009',
+ confirmation_number: 'CNF-009',
+ page_num: 1,
+ }),
+ )
+ })
+
it('paginates order list requests with backend page metadata', async () => {
vi.mocked(service.fetchReservationOrders)
.mockResolvedValueOnce(createOrderListResult('GRP-001', { page_num: 1, page_size: 20, total: 41 }))
@@ -363,26 +386,31 @@ describe('reservation P0 views', () => {
.mockResolvedValueOnce(createTaskListResult('GRP-001', 'Booking Request', { page_num: 1, page_size: 20, total: 45 }))
.mockResolvedValueOnce(createTaskListResult('GRP-001', 'Booking Request', { page_num: 1, page_size: 20, total: 45 }))
.mockResolvedValueOnce(createTaskListResult('GRP-001', 'Booking Request', { page_num: 1, page_size: 20, total: 45 }))
+ .mockResolvedValueOnce(createTaskListResult('GRP-001', 'Booking Request', { page_num: 1, page_size: 20, total: 45 }))
.mockResolvedValueOnce(createTaskListResult('GRP-002', 'Booking Update', { page_num: 2, page_size: 20, total: 45 }))
const wrapper = await mountWithPlugins(ReservationTaskListView)
await vi.dynamicImportSettled()
- const selects = wrapper.findAll('select')
expect(wrapper.text()).not.toContain('订单状态筛选待后端接入')
- expect(selects[2]!.attributes('disabled')).toBeUndefined()
+ expect(wrapper.find('select[name="order_status"]').attributes('disabled')).toBeUndefined()
+ expect(wrapper.find('select[name="task_status"]').text()).toContain('执行中')
+ expect(wrapper.find('select[name="task_status"]').text()).toContain('失败')
- await selects[1]!.setValue('READY')
+ await wrapper.find('select[name="task_status"]').setValue('FAILED')
await vi.dynamicImportSettled()
- await selects[2]!.setValue('ENDED')
+ await wrapper.find('select[name="task_subtype"]').setValue('RATE_CHANGE')
await vi.dynamicImportSettled()
- await selects[3]!.setValue('true')
+ await wrapper.find('select[name="order_status"]').setValue('ENDED')
+ await vi.dynamicImportSettled()
+ await wrapper.find('select[name="queue_participation"]').setValue('true')
await vi.dynamicImportSettled()
const taskListCalls = vi.mocked(service.fetchReservationTaskList).mock.calls
const filteredTaskRequest = taskListCalls[taskListCalls.length - 1]?.[0] ?? {}
expect(filteredTaskRequest).toMatchObject({
- task_status: 'READY',
+ task_status: 'FAILED',
+ task_subtype: 'RATE_CHANGE',
order_status: 'ENDED',
queue_participation: true,
page_num: 1,
@@ -393,7 +421,8 @@ describe('reservation P0 views', () => {
expect(service.fetchReservationTaskList).toHaveBeenLastCalledWith(
expect.objectContaining({
- task_status: 'READY',
+ task_status: 'FAILED',
+ task_subtype: 'RATE_CHANGE',
order_status: 'ENDED',
queue_participation: true,
page_num: 2,
diff --git a/client/src/types/reservation.ts b/client/src/types/reservation.ts
index d433a57..7e34e6f 100644
--- a/client/src/types/reservation.ts
+++ b/client/src/types/reservation.ts
@@ -325,6 +325,24 @@ export interface ReservationTaskPayloadMutationResult {
opera_operations: ReservationOperaOperationResult[]
}
+export type ReservationManualReviewTargetTaskType = 'NEW_BOOKING' | 'UPDATE_BOOKING' | 'CANCEL_BOOKING'
+
+export interface ReservationManualReviewConversionRequest {
+ target_task_type: ReservationManualReviewTargetTaskType
+ target_order_id?: string
+ reason?: string
+}
+
+export interface ReservationManualReviewConversionResult {
+ task_id: string
+ order_id: string
+ original_order_id: string
+ system_task_type: string
+ task_card_type: ReservationTaskCardType | string
+ task_status: ReservationTaskStatus | string
+ original_order_logic_deleted: boolean
+}
+
export interface ReservationOperaOperationResult {
operation_id: string
task_id: string
diff --git a/client/src/views/reservation/ReservationOrderListView.vue b/client/src/views/reservation/ReservationOrderListView.vue
index 564e1ac..6746aa3 100644
--- a/client/src/views/reservation/ReservationOrderListView.vue
+++ b/client/src/views/reservation/ReservationOrderListView.vue
@@ -34,14 +34,36 @@
{{ t('workbench.orderStatus') }}
+
+
@@ -192,6 +214,8 @@ let orderListRequestSequence = 0
const filters = reactive
({
keyword: '',
order_status: '',
+ group_code: '',
+ confirmation_number: '',
page_num: 1,
page_size: 20,
})
@@ -232,6 +256,8 @@ async function loadOrders(): Promise {
function resetFilters(): void {
filters.keyword = ''
filters.order_status = ''
+ filters.group_code = ''
+ filters.confirmation_number = ''
filters.page_num = 1
filters.page_size = 20
}
@@ -291,7 +317,7 @@ function formatOrderKey(order: ReservationOrderListItem): string {
.filter-grid {
display: grid;
- grid-template-columns: repeat(2, minmax(0, 1fr));
+ grid-template-columns: repeat(4, minmax(0, 1fr));
gap: 14px;
padding: 18px 20px 0;
}
diff --git a/client/src/views/reservation/ReservationTaskListView.vue b/client/src/views/reservation/ReservationTaskListView.vue
index 50279d6..ab03a1d 100644
--- a/client/src/views/reservation/ReservationTaskListView.vue
+++ b/client/src/views/reservation/ReservationTaskListView.vue
@@ -35,6 +35,7 @@
{{ t('taskList.taskType') }}
+