diff --git a/admin/src/api/doctor.ts b/admin/src/api/doctor.ts index c05892d0..b92149dc 100644 --- a/admin/src/api/doctor.ts +++ b/admin/src/api/doctor.ts @@ -66,6 +66,11 @@ export function appointmentLists(params: any) { return request.get({ url: '/doctor.appointment/lists', params }) } +/** 后台编辑挂号（预约日期/时段/类型/状态/备注/医助） */ +export function appointmentAdminEdit(params: any) { + return request.post({ url: '/doctor.appointment/edit', params }) +} + // 获取挂号详情 export function appointmentDetail(params: any) { return request.get({ url: '/doctor.appointment/detail', params }) diff --git a/admin/src/api/stats.ts b/admin/src/api/stats.ts index d428f63d..d4819327 100644 --- a/admin/src/api/stats.ts +++ b/admin/src/api/stats.ts @@ -110,6 +110,13 @@ const COMMISSION_SETTLEMENT_TIMEOUT_MS = 120000 /** 提成结算业绩（独立于业绩看板 yejiStats） */ export function commissionSettlementOverview(params: { settlement_month: string + /** 与 tcm.prescriptionOrder/lists 同源：create_time between */ + start_time?: string + end_time?: string + /** 默认 3=履约完成，与列表 fulfillment_status 一致 */ + fulfillment_status?: number + /** 传 1 时仅统计 is_system_auto=1；显式时段下默认不传（含手动） */ + require_system_auto_prescription?: 0 | 1 dept_ids?: number[] | string channel_code?: string }) { @@ -127,14 +134,21 @@ export function commissionSettlementChannelOptions() { return request.get({ url: '/stats.commissionSettlement/channelOptions' }) } -/** 提成核对：订单明细分页 bucket: 空|current|deferred */ +/** 提成核对：订单明细分页 bucket: 空|current|deferred；appt_channel_value 可与 assistant_id/doctor_id 组合（0=未匹配挂号渠道） */ export function commissionSettlementOrderLines(params: { settlement_month: string + start_time?: string + end_time?: string + fulfillment_status?: number + require_system_auto_prescription?: 0 | 1 dept_ids?: number[] | string channel_code?: string page?: number page_size?: number bucket?: string + assistant_id?: number + doctor_id?: number + appt_channel_value?: number }) { return request.get( { url: '/stats.commissionSettlement/orderLines', params, timeout: COMMISSION_SETTLEMENT_TIMEOUT_MS }, @@ -160,3 +174,8 @@ export function commissionSettlementConfirmFinalize(params: Record) { ignoreCancelToken: true } ) } + +/** 撤回「确定本期业绩」：清除顺延结转，状态变为可再次核对/确定 */ +export function commissionSettlementConfirmRevoke(params: Record) { + return request.post({ url: '/stats.commissionSettlement/confirmRevoke', params }) +} diff --git a/admin/src/api/tcm.ts b/admin/src/api/tcm.ts index 47ef6cf6..a8231c40 100644 --- a/admin/src/api/tcm.ts +++ b/admin/src/api/tcm.ts @@ -363,6 +363,11 @@ export function prescriptionOrderLists(params: any) { return request.get({ url: '/tcm.prescriptionOrder/lists', params }) } +/** 处方业务订单导出（export=1 预估条数，export=2 下载 Excel） */ +export function prescriptionOrderExport(params: any) { + return request.get({ url: '/tcm.prescriptionOrder/export', params }) +} + /** * 诊单下可关联的支付单（已支付 zyt_order；已占用且未撤回的会排除；编辑时传 prescription_order_id 保留当前单已选）。 * 服务端仅返回创建时间在 2026-04-20（含）之后的支付单；编辑时本单已关联的旧单仍会出现在列表中。 diff --git a/admin/src/components/export-data/index.vue b/admin/src/components/export-data/index.vue index 237ec43f..3dc578b4 100644 --- a/admin/src/components/export-data/index.vue +++ b/admin/src/components/export-data/index.vue @@ -13,6 +13,7 @@ 导出
+

{{ props.exportHint }}

预计导出{{ exportData.count }}条数据， 共{{ exportData.sum_page }}页，每页{{ @@ -79,6 +80,11 @@ const props = defineProps({ fetchFun: { type: Function, required: true + }, + /** 可选：导出弹窗内提示文案（如说明与列表筛选一致） */ + exportHint: { + type: String, + default: '' } }) const popupRef = shallowRef>() diff --git a/admin/src/views/consumer/prescription/guahao.vue b/admin/src/views/consumer/prescription/guahao.vue new file mode 100644 index 00000000..3fda27f4 --- /dev/null +++ b/admin/src/views/consumer/prescription/guahao.vue @@ -0,0 +1,397 @@ + + + diff --git a/admin/src/views/consumer/prescription/index.vue b/admin/src/views/consumer/prescription/index.vue index 99817b09..81a9c14f 100644 --- a/admin/src/views/consumer/prescription/index.vue +++ b/admin/src/views/consumer/prescription/index.vue @@ -548,12 +548,20 @@ - + - + diff --git a/admin/src/views/consumer/prescription/order_list.vue b/admin/src/views/consumer/prescription/order_list.vue index 76e2ea4d..4abc7a76 100644 --- a/admin/src/views/consumer/prescription/order_list.vue +++ b/admin/src/views/consumer/prescription/order_list.vue @@ -266,6 +266,14 @@ 查询 重置 + @@ -426,7 +434,37 @@ - + + + + +