diff --git a/apps/web-antd/src/views/report/member/data.ts b/apps/web-antd/src/views/report/member/data.ts index 4785536..5f1c4f3 100644 --- a/apps/web-antd/src/views/report/member/data.ts +++ b/apps/web-antd/src/views/report/member/data.ts @@ -148,12 +148,10 @@ export function useStaffGridColumns(): VxeTableGridOptions { field: 'content', title: '进展记录', - type: 'html', showOverflow: false, align: 'left', - className: 'rich-text-comment-content-table', - // headerAlign: 'center', minWidth: 600, + slots: { default: 'contentDefault' }, }, { field: 'updateTime', diff --git a/apps/web-antd/src/views/report/member/modules/staff.vue b/apps/web-antd/src/views/report/member/modules/staff.vue index f0eb4c2..b145180 100644 --- a/apps/web-antd/src/views/report/member/modules/staff.vue +++ b/apps/web-antd/src/views/report/member/modules/staff.vue @@ -7,6 +7,7 @@ import dayjs from 'dayjs'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { exportStaff, getProgressByStaffPage } from '#/api/report/progress'; +import { ShadowContainer } from '#/components/shadow-container'; import { useStaffGridColumns, useStaffGridFormSchema } from '../data'; @@ -149,5 +150,13 @@ const [Grid, gridApi] = useVbenVxeGrid({ diff --git a/apps/web-antd/src/views/report/progress/modules/project.vue b/apps/web-antd/src/views/report/progress/modules/project.vue index cd19c86..91d8438 100644 --- a/apps/web-antd/src/views/report/progress/modules/project.vue +++ b/apps/web-antd/src/views/report/progress/modules/project.vue @@ -155,9 +155,7 @@ const [Grid, gridApi] = useVbenVxeGrid({