diff --git a/apps/web-office/src/preferences.ts b/apps/web-office/src/preferences.ts index baf82be0..d6f4281f 100644 --- a/apps/web-office/src/preferences.ts +++ b/apps/web-office/src/preferences.ts @@ -9,5 +9,6 @@ export const overridesPreferences = defineOverridesPreferences({ app: { name: import.meta.env.VITE_APP_TITLE, authPageLayout: 'panel-center', + enablePreferences:true }, }); diff --git a/apps/web-office/src/router/routes/modules/offfice.ts b/apps/web-office/src/router/routes/modules/offfice.ts index d1fc43fa..f8f9695d 100644 --- a/apps/web-office/src/router/routes/modules/offfice.ts +++ b/apps/web-office/src/router/routes/modules/offfice.ts @@ -89,9 +89,9 @@ const routes: RouteRecordRaw[] = [ }, component: () => import('#/views/meeting/edit/index.vue'), meta: { - hideInMenu: true, - hideInTab: true, - activePath: '/meeting/list', + // hideInMenu: true, + // hideInTab: true, + activePath: '/meeting/edit/:id?', icon: 'lucide:area-chart', title: '会议填报', }, diff --git a/apps/web-office/src/views/meeting/edit/index.vue b/apps/web-office/src/views/meeting/edit/index.vue index 3d88eeb0..bab6bbe9 100644 --- a/apps/web-office/src/views/meeting/edit/index.vue +++ b/apps/web-office/src/views/meeting/edit/index.vue @@ -35,7 +35,7 @@ const [SpokenPersonEditModal, spokenPersonEditModalApi] = useVbenModal({ const router = useRouter(); const route = useRoute(); -const id = route.params.id; +const id = ref(route.params.id); let sortable2: any; const showHelpTip = ref(false); @@ -466,10 +466,15 @@ const currData = ref({}); onMounted(async () => { isLoading.value = true; - console.log(id); + + console.log(id.value) + if(id.value === ':id'){ + id.value = '' + } + try { - if (id) { - let data = await Apis.meeting.get_page({ params: { guid: id } }); + if (id.value) { + let data = await Apis.meeting.get_page({ params: { guid: id.value } }); data = data.rows[0]; console.log(data); @@ -522,7 +527,7 @@ onMounted(async () => { let initTime: any; nextTick(() => { // 加载完成之后在绑定拖动事件 - if (id) { + if (id.value) { initTime = setTimeout(() => { rowDrop(); }, 500); diff --git a/apps/web-office/src/views/meeting/list/crud.tsx b/apps/web-office/src/views/meeting/list/crud.tsx index 3d49ebf9..c0f28d22 100644 --- a/apps/web-office/src/views/meeting/list/crud.tsx +++ b/apps/web-office/src/views/meeting/list/crud.tsx @@ -83,6 +83,7 @@ export function getColumns(params: any = {}): VxeGridPropTypes.Columns { if (params.type !== 'taizhang') { columns.unshift({ + field: 'radio', type: 'radio', width: 40, slots: { radio: 'radio_cell' }, diff --git a/apps/web-office/src/views/meeting/list/index.vue b/apps/web-office/src/views/meeting/list/index.vue index 7094a6fa..892f46e8 100644 --- a/apps/web-office/src/views/meeting/list/index.vue +++ b/apps/web-office/src/views/meeting/list/index.vue @@ -106,6 +106,9 @@ function handleExport() { if ($grid) { $grid.exportData({ type: 'xlsx', + columnFilterMethod: ({ column }) => { + return column.type === 'radio' ? false : true; + }, }); message.success('导出成功'); } diff --git a/apps/web-office/src/views/meeting/production-list/crud.tsx b/apps/web-office/src/views/meeting/production-list/crud.tsx index f8aa6ae0..1226c4a0 100644 --- a/apps/web-office/src/views/meeting/production-list/crud.tsx +++ b/apps/web-office/src/views/meeting/production-list/crud.tsx @@ -31,7 +31,7 @@ export function getColumns(params: any = {}): VxeGridPropTypes.Columns { }, }, { - field: 'meetingDate', + field: 'meetingInfo', title: '会议信息', width: 200, slots: { default: 'meetingInfoSlot' }, diff --git a/apps/web-office/src/views/meeting/start/index.vue b/apps/web-office/src/views/meeting/start/index.vue index f8634bf1..7db3cc37 100644 --- a/apps/web-office/src/views/meeting/start/index.vue +++ b/apps/web-office/src/views/meeting/start/index.vue @@ -1,5 +1,5 @@