diff --git a/apps/web-antd/src/views/business/order/register/api/index.ts b/apps/web-antd/src/views/business/order/register/api/index.ts index a1b3c2f3..89a9b404 100644 --- a/apps/web-antd/src/views/business/order/register/api/index.ts +++ b/apps/web-antd/src/views/business/order/register/api/index.ts @@ -14,6 +14,8 @@ export interface RegisterOrderItem { doctor_info?: { name: string; depart?: { name: string } }; user_patient?: { name: string }; store?: { name: string }; + salesperson_id?: number; + salesperson?: { id: number; nick_name: string; avatar?: string }; prescription?: { id: number; prescription_no: string }[]; } diff --git a/apps/web-antd/src/views/business/order/register/config/table.ts b/apps/web-antd/src/views/business/order/register/config/table.ts index d874c9c3..98e1491e 100644 --- a/apps/web-antd/src/views/business/order/register/config/table.ts +++ b/apps/web-antd/src/views/business/order/register/config/table.ts @@ -16,8 +16,9 @@ export const gridOptions: VxeGridProps = { { field: 'doctor_info.depart.name', title: '科室' }, { field: 'user_patient.name', title: '就诊人名称' }, { field: 'store.name', title: '开方诊所' }, + { field: 'salesperson', title: '推广员', slots: { default: 'salesperson' } }, { field: 'type', title: '挂号类型', slots: { default: 'type' } }, - { field: 'prescription', title: '处方', slots: { default: 'prescription'} }, + { field: 'prescription', title: '处方', width: 240, slots: { default: 'prescription'} }, { field: 'price', title: '挂号价格', width: 110, slots: { default: 'price' } }, { field: 'is_pay', title: '是否支付', width: 100, slots: { default: 'is_pay' } }, { field: 'status', title: '状态', slots: { default: 'status' } }, diff --git a/apps/web-antd/src/views/business/order/register/index.vue b/apps/web-antd/src/views/business/order/register/index.vue index 8f36f6d0..2d825eea 100644 --- a/apps/web-antd/src/views/business/order/register/index.vue +++ b/apps/web-antd/src/views/business/order/register/index.vue @@ -4,14 +4,13 @@ import type { VxeGridListeners } from '#/adapter/vxe-table'; import { nextTick, onMounted, ref } from 'vue'; import { useRoute } from 'vue-router'; -import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui'; +import { Page, useVbenModal } from '@vben/common-ui'; -import { Button, message, Modal as AntdModal, Tag } from 'ant-design-vue'; +import { Button, Image, message, Modal as AntdModal, Tag } from 'ant-design-vue'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { TableAction } from '#/components/table-action'; import { simulatePayApi } from '#/views/business/order/api/order-ops'; -import OrderTraceDrawer from '#/views/business/order/components/order-trace-drawer.vue'; import PrescriptionDetail from '#/views/doctor/doctor-reception/components/PrescriptionDetail.vue'; import { formOptions } from './config/search'; @@ -56,26 +55,13 @@ const [PrescriptionDetailModal, PrescriptionDetailModalApi] = useVbenModal({ connectedComponent: PrescriptionDetail, }); -const [TraceDrawer, traceDrawerApi] = useVbenDrawer({ - connectedComponent: OrderTraceDrawer, -}); - function openPrescriptionDetail(id: number) { PrescriptionDetailModalApi.setData({ - values: { id }, + values: id, }); PrescriptionDetailModalApi.open(); } -function openOrderTrace(row: Record) { - traceDrawerApi.setData({ - scene: 'register', - order_id: row.id, - order_no: row.order_no, - }); - traceDrawerApi.open(); -} - function handleSimulatePay(row: Record) { AntdModal.confirm({ title: '模拟支付', @@ -102,7 +88,6 @@ function formatRegisterPrice(price: unknown) {