feat: 合并 admin/manager 重复页 + 公示意向 + 劳务签署
页合并 (admin/manager 共用, route.path 角色感知): - expert: Experts.vue + ExpertNew.vue (list/new/edit/view 一套) - sponsor-orgs: SponsorOrgs.vue - sponsor-people: SponsorPeople.vue + SponsorPersonNew.vue + SponsorPersonDetail.vue - executor-orgs: ExecutorOrgs.vue - executor-people: ExecutorPeople.vue + ExecutorPersonNew.vue + ExecutorPersonDetail.vue - 给 SponsorPeople / ExecutorPeople op 列补上 查看/编辑 按钮 (潜在 bug 修复) - 详情弹窗统一用 el-descriptions 风格 (替代 admin 旧版 ElMessageBox.alert) 后端: - BizSignController + BizSignServiceImpl + PdfService (劳务签署 PDF 流程) - BizPublicityIntentController (公示意向: 支持/执行) - BizPublicitySupportIntent / BizPublicityExecutionIntent ExportVo - BizMeetingAttendee 字段合并 (bank_region 替代 bankProvince/bankCity) - BizExpert 字段合并 (id_card_attachments CSV, bank_region) - Excel 导入模板精简 (开户行 1 列) 前端: - doctor/SignFill + SignContract + SignSuccess (劳务签署 3 页流程) - ImportResultDialog 通用组件 - IdCardUploader 重构 (单 v-model:idCardAttachments, CSV 格式) - AreaCascader 调整 - Login.vue + AdminLayout.vue + PortalShell.vue + Home.vue 适配 DB: 字段合并 (id_card_front/back → id_card_attachments, bank_province/city → bank_region)
This commit is contained in:
郭庆泰
+35
-27
@@ -29,18 +29,20 @@ const routes = [
|
||||
{ path: 'meetings', name: 'admin-meetings', component: () => import('@/views/admin/Meetings.vue'), meta: { title: '会议全览' } },
|
||||
{ path: 'department', name: 'admin-department', component: () => import('@/views/admin/Department.vue'), meta: { title: '科室管理' } },
|
||||
{ path: 'title', name: 'admin-title', component: () => import('@/views/admin/Title.vue'), meta: { title: '职称管理' } },
|
||||
{ path: 'experts', name: 'admin-experts', component: () => import('@/views/admin/Experts.vue'), meta: { title: '专家管理' } },
|
||||
{ path: 'experts/new', name: 'admin-experts-new', component: () => import('@/views/admin/ExpertNew.vue'), meta: { title: '新建专家' } },
|
||||
{ path: 'experts/edit/:id', name: 'admin-experts-edit', component: () => import('@/views/admin/ExpertNew.vue'), meta: { title: '编辑专家' } },
|
||||
{ path: 'experts', name: 'admin-experts', component: () => import('@/views/expert/Experts.vue'), meta: { title: '专家管理' } },
|
||||
{ path: 'experts/new', name: 'admin-experts-new', component: () => import('@/views/expert/ExpertNew.vue'), meta: { title: '新建专家' } },
|
||||
{ path: 'experts/edit/:id', name: 'admin-experts-edit', component: () => import('@/views/expert/ExpertNew.vue'), meta: { title: '编辑专家' } },
|
||||
{ path: 'experts/view/:id', name: 'admin-experts-view', component: () => import('@/views/admin/ExpertDetail.vue'), meta: { title: '专家详情' } },
|
||||
{ path: 'sponsor-orgs', name: 'admin-sponsor-orgs', component: () => import('@/views/admin/SponsorOrgs.vue'), meta: { title: '支持单位管理' } },
|
||||
{ path: 'executor-orgs', name: 'admin-executor-orgs', component: () => import('@/views/admin/ExecutorOrgs.vue'), meta: { title: '服务机构管理' } },
|
||||
{ path: 'sponsor-people', name: 'admin-sponsor-people', component: () => import('@/views/admin/SponsorPeople.vue'), meta: { title: '支持单位下人员' } },
|
||||
{ path: 'sponsor-people/new', name: 'admin-sponsor-people-new', component: () => import('@/views/admin/SponsorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'sponsor-people/edit/:id', name: 'admin-sponsor-people-edit', component: () => import('@/views/admin/SponsorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'executor-people', name: 'admin-executor-people', component: () => import('@/views/admin/ExecutorPeople.vue'), meta: { title: '服务机构下人员' } },
|
||||
{ path: 'executor-people/new', name: 'admin-executor-people-new', component: () => import('@/views/admin/ExecutorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'executor-people/edit/:id', name: 'admin-executor-people-edit', component: () => import('@/views/admin/ExecutorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'sponsor-orgs', name: 'admin-sponsor-orgs', component: () => import('@/views/sponsor-orgs/SponsorOrgs.vue'), meta: { title: '支持单位管理' } },
|
||||
{ path: 'executor-orgs', name: 'admin-executor-orgs', component: () => import('@/views/executor-orgs/ExecutorOrgs.vue'), meta: { title: '服务机构管理' } },
|
||||
{ path: 'sponsor-people', name: 'admin-sponsor-people', component: () => import('@/views/sponsor-people/SponsorPeople.vue'), meta: { title: '支持单位下人员' } },
|
||||
{ path: 'sponsor-people/new', name: 'admin-sponsor-people-new', component: () => import('@/views/sponsor-people/SponsorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'sponsor-people/edit/:id', name: 'admin-sponsor-people-edit', component: () => import('@/views/sponsor-people/SponsorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'sponsor-people/view/:id', name: 'admin-sponsor-people-view', component: () => import('@/views/sponsor-people/SponsorPersonDetail.vue'), meta: { title: '人员详情' } },
|
||||
{ path: 'executor-people', name: 'admin-executor-people', component: () => import('@/views/executor-people/ExecutorPeople.vue'), meta: { title: '服务机构下人员' } },
|
||||
{ path: 'executor-people/new', name: 'admin-executor-people-new', component: () => import('@/views/executor-people/ExecutorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'executor-people/edit/:id', name: 'admin-executor-people-edit', component: () => import('@/views/executor-people/ExecutorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'executor-people/view/:id', name: 'admin-executor-people-view', component: () => import('@/views/executor-people/ExecutorPersonDetail.vue'), meta: { title: '人员详情' } },
|
||||
{ path: 'orgs', name: 'admin-orgs', component: () => import('@/views/admin/Orgs.vue'), meta: { title: '公司管理' } },
|
||||
{ path: 'article', name: 'admin-article', component: () => import('@/views/admin/BizArticleAdmin.vue'), meta: { title: '协议管理' } },
|
||||
{ path: 'article/edit/:id', name: 'admin-article-edit', component: () => import('@/views/admin/BizArticleEdit.vue'), meta: { title: '编辑文章' } },
|
||||
@@ -71,17 +73,20 @@ const routes = [
|
||||
{ path: 'projects/detail/:projectId', name: 'manager-projects-detail', component: () => import('@/views/manager/ManagerProjectDetail.vue'), meta: { title: '项目详情' } },
|
||||
{ path: 'meetings', name: 'manager-meetings', component: () => import('@/views/manager/Meetings.vue'), meta: { title: '会议管理' } },
|
||||
{ path: 'meetings/new', name: 'manager-meetings-new', component: () => import('@/views/manager/MeetingNew.vue'), meta: { title: '新建会议' } },
|
||||
{ path: 'experts', name: 'manager-experts', component: () => import('@/views/manager/Experts.vue'), meta: { title: '专家审核' } },
|
||||
{ path: 'experts/new', name: 'manager-experts-new', component: () => import('@/views/manager/ExpertNew.vue'), meta: { title: '新建专家' } },
|
||||
{ path: 'experts/edit/:id', name: 'manager-experts-edit', component: () => import('@/views/manager/ExpertNew.vue'), meta: { title: '编辑专家' } },
|
||||
{ path: 'sponsor-orgs', name: 'manager-sponsor-orgs', component: () => import('@/views/manager/SponsorOrgs.vue'), meta: { title: '支持单位管理' } },
|
||||
{ path: 'executor-orgs', name: 'manager-executor-orgs', component: () => import('@/views/manager/ExecutorOrgs.vue'), meta: { title: '服务机构管理' } },
|
||||
{ path: 'sponsor-people', name: 'manager-sponsor-people', component: () => import('@/views/manager/SponsorPeople.vue'), meta: { title: '支持单位下人员' } },
|
||||
{ path: 'sponsor-people/new', name: 'manager-sponsor-people-new', component: () => import('@/views/manager/SponsorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'sponsor-people/edit/:id', name: 'manager-sponsor-people-edit', component: () => import('@/views/manager/SponsorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'executor-people', name: 'manager-executor-people', component: () => import('@/views/manager/ExecutorPeople.vue'), meta: { title: '服务机构下人员' } },
|
||||
{ path: 'executor-people/new', name: 'manager-executor-people-new', component: () => import('@/views/manager/ExecutorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'executor-people/edit/:id', name: 'manager-executor-people-edit', component: () => import('@/views/manager/ExecutorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'experts', name: 'manager-experts', component: () => import('@/views/expert/Experts.vue'), meta: { title: '专家审核' } },
|
||||
{ path: 'experts/new', name: 'manager-experts-new', component: () => import('@/views/expert/ExpertNew.vue'), meta: { title: '新建专家' } },
|
||||
{ path: 'experts/edit/:id', name: 'manager-experts-edit', component: () => import('@/views/expert/ExpertNew.vue'), meta: { title: '编辑专家' } },
|
||||
{ path: 'experts/view/:id', name: 'manager-experts-view', component: () => import('@/views/admin/ExpertDetail.vue'), meta: { title: '专家详情' } },
|
||||
{ path: 'sponsor-orgs', name: 'manager-sponsor-orgs', component: () => import('@/views/sponsor-orgs/SponsorOrgs.vue'), meta: { title: '支持单位管理' } },
|
||||
{ path: 'executor-orgs', name: 'manager-executor-orgs', component: () => import('@/views/executor-orgs/ExecutorOrgs.vue'), meta: { title: '服务机构管理' } },
|
||||
{ path: 'sponsor-people', name: 'manager-sponsor-people', component: () => import('@/views/sponsor-people/SponsorPeople.vue'), meta: { title: '支持单位下人员' } },
|
||||
{ path: 'sponsor-people/new', name: 'manager-sponsor-people-new', component: () => import('@/views/sponsor-people/SponsorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'sponsor-people/edit/:id', name: 'manager-sponsor-people-edit', component: () => import('@/views/sponsor-people/SponsorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'sponsor-people/view/:id', name: 'manager-sponsor-people-view', component: () => import('@/views/sponsor-people/SponsorPersonDetail.vue'), meta: { title: '人员详情' } },
|
||||
{ path: 'executor-people', name: 'manager-executor-people', component: () => import('@/views/executor-people/ExecutorPeople.vue'), meta: { title: '服务机构下人员' } },
|
||||
{ path: 'executor-people/new', name: 'manager-executor-people-new', component: () => import('@/views/executor-people/ExecutorPersonNew.vue'), meta: { title: '新建人员' } },
|
||||
{ path: 'executor-people/edit/:id', name: 'manager-executor-people-edit', component: () => import('@/views/executor-people/ExecutorPersonNew.vue'), meta: { title: '编辑人员' } },
|
||||
{ path: 'executor-people/view/:id', name: 'manager-executor-people-view', component: () => import('@/views/executor-people/ExecutorPersonDetail.vue'), meta: { title: '人员详情' } },
|
||||
{ path: 'orgs', name: 'manager-orgs', component: () => import('@/views/manager/Orgs.vue'), meta: { title: '公司管理' } },
|
||||
{ path: 'support-intent', name: 'manager-support-intent', component: () => import('@/views/manager/SupportIntent.vue'), meta: { title: '支持意向' } },
|
||||
{ path: 'exec-intent', name: 'manager-exec-intent', component: () => import('@/views/manager/ExecIntent.vue'), meta: { title: '执行意向' } },
|
||||
@@ -98,7 +103,10 @@ const routes = [
|
||||
{ path: 'submission/new', name: 'doctor-submission-new', component: () => import('@/views/doctor/SubmissionNew.vue'), meta: { title: '新建项目设计投稿' } },
|
||||
{ path: 'submission/detail/:planId', name: 'doctor-submission-detail', component: () => import('@/views/doctor/SubmissionDetail.vue'), meta: { title: '投稿详情' } },
|
||||
{ path: 'submission/edit/:planId', name: 'doctor-submission-edit', component: () => import('@/views/doctor/SubmissionNew.vue'), meta: { title: '修改项目设计投稿' } },
|
||||
{ path: 'account', name: 'doctor-account', component: () => import('@/views/doctor/Account.vue'), meta: { title: '账号信息' } }
|
||||
{ path: 'account', name: 'doctor-account', component: () => import('@/views/doctor/Account.vue'), meta: { title: '账号信息' } },
|
||||
{ path: 'sign-fill', name: 'doctor-sign-fill', component: () => import('@/views/doctor/SignFill.vue'), meta: { title: '填写劳务信息', role: 'doctor', hideMenu: true } },
|
||||
{ path: 'sign-contract', name: 'doctor-sign-contract', component: () => import('@/views/doctor/SignContract.vue'), meta: { title: '签署劳务协议', role: 'doctor', hideMenu: true } },
|
||||
{ path: 'sign-success', name: 'doctor-sign-success', component: () => import('@/views/doctor/SignSuccess.vue'), meta: { title: '签字成功', role: 'doctor', hideMenu: true } }
|
||||
]
|
||||
},
|
||||
{ path: '/executor', component: AdminLayout, meta: { role: 'executor' }, children: [
|
||||
@@ -137,12 +145,12 @@ const router = createRouter({
|
||||
|
||||
router.beforeEach((to, from, next) => {
|
||||
document.title = (to.meta?.title || 'BAHIM') + ' - BAHIM 项目管理系统'
|
||||
const role = to.meta?.role
|
||||
// 公开门户 & 登录/注册 不拦截
|
||||
if (!role) return next()
|
||||
// 公开路由 (无 role meta) 不拦截
|
||||
if (!to.meta?.role) return next()
|
||||
// 需要登录的路由: 未登录跳登录 (带 redirect)
|
||||
const user = JSON.parse(localStorage.getItem('ry_user') || 'null')
|
||||
if (!user) return next({ name: 'login', query: { redirect: to.fullPath } })
|
||||
if (user.role !== role) return next({ name: 'login' })
|
||||
// 已登录: role 不匹配由后端 401 拦截, 不在前端强跳 (避免误判让用户卡死)
|
||||
next()
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user