diff --git a/admin/src/api/order.ts b/admin/src/api/order.ts index 5f368c2a..fbaeba45 100644 --- a/admin/src/api/order.ts +++ b/admin/src/api/order.ts @@ -84,3 +84,18 @@ export function orderExport(params: any) { export function searchPatients(params: any) { return request.get({ url: '/tcm.diagnosis/searchPatient', params }) } + +/** 单条订单操作日志(分页) */ +export function orderActionLogs(params: { order_id: number; page_no?: number; page_size?: number }) { + return request.get({ url: '/order.order/actionLogs', params }) +} + +/** 按管理员统计操作次数(时间范围,未传时默认近 7 天) */ +export function orderActionLogStats(params?: { start_time?: string; end_time?: string; limit?: number }) { + return request.get({ url: '/order.order/actionLogStats', params }) +} + +/** 批量将支付单指派给医助 */ +export function orderBatchAssignAssistant(params: { order_ids: number[]; assistant_id: number }) { + return request.post({ url: '/order.order/assignAssistant', params }) +} diff --git a/admin/src/api/tcm.ts b/admin/src/api/tcm.ts index 93b9a07b..5be2ca1b 100644 --- a/admin/src/api/tcm.ts +++ b/admin/src/api/tcm.ts @@ -388,8 +388,8 @@ export function prescriptionOrderLinkPayOrder(params: { return request.post({ url: '/tcm.prescriptionOrder/linkPayOrder', params }) } -/** 将「已发货」且支付审核通过的订单标记为「已完成」 */ -export function prescriptionOrderComplete(params: { id: number }) { +/** 将「已发货/已签收」且支付审核通过的订单结案(3=已完成 或 7-12 业务状态) */ +export function prescriptionOrderComplete(params: { id: number; fulfillment_status: number }) { return request.post({ url: '/tcm.prescriptionOrder/complete', params }) } diff --git a/admin/src/components/tcm-prescription/index.vue b/admin/src/components/tcm-prescription/index.vue index a420516e..669b0b0e 100644 --- a/admin/src/components/tcm-prescription/index.vue +++ b/admin/src/components/tcm-prescription/index.vue @@ -784,8 +784,8 @@ const formData = reactive({ dose_unit: '剂', usage_days: 7, times_per_day: 2, - usage_instruction: '水煎服,一日二次', - usage_time: '饭前', + usage_instruction: '', + usage_time: '饭后', usage_way: '温水送服', dietary_taboo: [], usage_notes: '', diff --git a/admin/src/views/consumer/prescription/index.vue b/admin/src/views/consumer/prescription/index.vue index b2cc5cde..4fa36ded 100644 --- a/admin/src/views/consumer/prescription/index.vue +++ b/admin/src/views/consumer/prescription/index.vue @@ -38,6 +38,18 @@ 未通过 驳回 +