diff --git a/apps/web-office/src/hooks/useRender.ts b/apps/web-office/src/hooks/useRender.ts index 86ac09db..ca05bb90 100644 --- a/apps/web-office/src/hooks/useRender.ts +++ b/apps/web-office/src/hooks/useRender.ts @@ -59,10 +59,13 @@ export const useRender = { // if (params?.maxLine && params?.maxLine > 0) { // classArr.push(`line-clamp-${params?.maxLine}`); // } + return h( EllipsisText, { class: classArr.join(' '), line: params?.maxLine || 6 }, - text, + { + default: () => text, + }, ); } return ''; diff --git a/apps/web-office/src/router/routes/core.ts b/apps/web-office/src/router/routes/core.ts index 8a241d1c..51937b12 100644 --- a/apps/web-office/src/router/routes/core.ts +++ b/apps/web-office/src/router/routes/core.ts @@ -104,7 +104,7 @@ const coreRoutes: RouteRecordRaw[] = [ hideInMenu: true, hideInTab: true, icon: 'lucide:area-chart', - title: '供热公司网络生产会议系统-会议查询篇', + title: '热力公司会议管理系统', }, }, { diff --git a/apps/web-office/src/router/routes/modules/offfice.ts b/apps/web-office/src/router/routes/modules/offfice.ts index 05ff0dcb..c20cd654 100644 --- a/apps/web-office/src/router/routes/modules/offfice.ts +++ b/apps/web-office/src/router/routes/modules/offfice.ts @@ -86,6 +86,15 @@ const routes: RouteRecordRaw[] = [ title: '会议填报', }, }, + { + name: 'MeetingProuctionList', + path: '/meeting/production/list', + component: () => import('#/views/meeting/production-list/index.vue'), + meta: { + icon: 'lucide:area-chart', + title: '生产会议', + }, + }, { name: 'MeetingList', path: '/meeting/list', diff --git a/apps/web-office/src/views/bussiness-trip/list/index.vue b/apps/web-office/src/views/bussiness-trip/list/index.vue index 1ee48f04..c78199d1 100644 --- a/apps/web-office/src/views/bussiness-trip/list/index.vue +++ b/apps/web-office/src/views/bussiness-trip/list/index.vue @@ -121,7 +121,7 @@ const searchForm = ref({ name: 'a-date-picker', vModel: 'value', allowClear: true, - format: 'YYYY-MM-DD', + format: 'YYYY-M-D', valueFormat: 'YYYY-MM-DD', }, autoSearchTrigger: 'enter', @@ -134,7 +134,7 @@ const searchForm = ref({ name: 'a-date-picker', vModel: 'value', allowClear: true, - format: 'YYYY-MM-DD', + format: 'YYYY-M-D', valueFormat: 'YYYY-MM-DD', }, autoSearchTrigger: 'enter', diff --git a/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue b/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue index b312417b..0e4ee657 100644 --- a/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue +++ b/apps/web-office/src/views/canteen/collect/collect-detail-modal.vue @@ -1,21 +1,19 @@