diff --git a/apps/web-office/src/api/index.ts b/apps/web-office/src/api/index.ts index 9482b698..aa460ec7 100644 --- a/apps/web-office/src/api/index.ts +++ b/apps/web-office/src/api/index.ts @@ -281,6 +281,9 @@ export default { /** 协同办公/督查督办/执行反馈 执行反馈已办查询 */ get_pageDone: (data?: QueryOptions) => http.get('/app/feedback/pageDone', data), + /** 协同办公/督查督办/立项发起 立项删除 */ + post_deletes: (data?: BodyOptions) => + http.post('/app/feedback/deletes', data), }, file: { /** 协同办公/文件上传/下载 多文件上传 */ diff --git a/apps/web-office/src/hooks/useRender.ts b/apps/web-office/src/hooks/useRender.ts index 1ce3dad3..86ac09db 100644 --- a/apps/web-office/src/hooks/useRender.ts +++ b/apps/web-office/src/hooks/useRender.ts @@ -1,8 +1,9 @@ import { h } from 'vue'; +import { EllipsisText } from '@vben/common-ui'; + import { Button, Tag } from 'ant-design-vue'; // import { Icon } from '@/components/Icon'; -import { Tooltip } from 'ant-design-vue'; import dayjs from 'dayjs'; import { DictTag } from '#/components/dict-tag'; @@ -55,16 +56,13 @@ export const useRender = { if (text) { params = params || {}; const classArr: string[] = params.class || []; - if (params?.maxLine && params?.maxLine > 0) { - classArr.push(`line-clamp-${params?.maxLine}`); - } + // if (params?.maxLine && params?.maxLine > 0) { + // classArr.push(`line-clamp-${params?.maxLine}`); + // } return h( - Tooltip, - { trigger: 'hover' }, - { - trigger: () => h('span', { class: classArr.join(' ') }, text), - default: () => text, - }, + EllipsisText, + { class: classArr.join(' '), line: params?.maxLine || 6 }, + text, ); } return ''; @@ -113,7 +111,6 @@ export const useRender = { * @returns 字典标签 */ renderDict: (text: string, dictType: string, params?: any) => { - debugger; if (!dictType && !params.options) { console.warn('请传入字典类型'); return ''; diff --git a/apps/web-office/src/views/duty/standing-book/index.vue b/apps/web-office/src/views/duty/standing-book/index.vue index 53961748..047b0df9 100644 --- a/apps/web-office/src/views/duty/standing-book/index.vue +++ b/apps/web-office/src/views/duty/standing-book/index.vue @@ -1,75 +1,19 @@ - - + + diff --git a/apps/web-office/src/views/meeting/edit/index.vue b/apps/web-office/src/views/meeting/edit/index.vue index cfa7cb0a..32aafb60 100644 --- a/apps/web-office/src/views/meeting/edit/index.vue +++ b/apps/web-office/src/views/meeting/edit/index.vue @@ -1,26 +1,27 @@