feat(项目管理): 招标字段/负责人/导出/下拉/登录短信 完整链路

后端 (ruoyi-business)
- BizProject: +is_bid_project, +execOrgNames(GROUP_CONCAT派生), +leadUserName
- BizProjectMapper.xml: 上述字段全部贯通 selectFields/insert/update, 列表加 exec_org_names 子查询 + lead_user_name JOIN
- BizSysUserQueryMapper (新): 干净查 sys_user by role_type, 避开 @DataScope 切面污染, 用于项目负责人下拉
- BizOrgMapper.selectExecutorOrgOptions (新): JOIN sys_user (parent_user_id IS NULL) 限定 MAIN 账号, 排除同公司普通员工子账号
- BizOrgController: +/business/org/executorOptions 端点
- BizExecutionIntentController: +exportSignupExperts 端点 (POST /business/executionIntent/export)
- BizSignupExpertExportVo (新): 中文列头 Excel 导出 VO (专家姓名/科室/医院/职称/报名时间/手机号)
- BizProjectAssign / SponsorAssign 重命名 + Service 实现调整
- 删除 sql/ 下所有迁移脚本 (按用户要求不再保存 SQL 文件)

前端 (ry-vue3)
- api/system.js: +listExecutorOrgs 走新接口, listExecutor/listSupporters/listManagers 保持 listByRole 兼容
- views/manager/Projects.vue: 执行方下拉改 label=u.orgName / value=u.userId, 数据源走 listExecutorOrgs
  +execOrgNames 列展示 +导出报名专家 dropdown 项 +is_bid_project 表单字段
- views/manager/ProjectsNew.vue + ManagerProjectDetail.vue: +is_bid_project 表单/展示
- views/auth/Login.vue: +手机号验证码登录 tab (复用 SysSmsService, dev 模式 10 开头手机号固定码 1234)
- 路由/布局/角色视角多页面整理 (SponsorOrgs/People/SponsorPersonNew 等)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
郭庆泰
2026-08-17 00:34:13 +08:00
co-authored by Claude
parent ccfd03a6eb
commit e099211cbd
70 changed files with 1378 additions and 1505 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ export function sponsorAssignProject(data) {
}
/**
* 赞助方批量分配 (多个项目同一个监察员 + 同一份说明)
* 支持方批量分配 (多个项目同一个监察员 + 同一份说明)
* body: [{projectId, monitorUserId, assignDesc, assignPoints}, ...]
*/
export function sponsorAssignBatch(data) {
+20 -4
View File
@@ -11,12 +11,28 @@ export function listRole(query) {
return request({ url: '/system/role/list', method: 'get', params: query })
}
// 按角色查询用户列表 (绕开 sys_user:list 权限)
// 用法: listByRole({ roleType: 'executor', userName: 'exe' })
// 按 sys_user.role_type 查用户列表 (走 /business/project/listByRole, 不走 system:user:list 权限)
// 用法: listByRole({ roleType: 'manager', userName: 'm' })
export function listByRole(query) {
return request({ url: '/business/executor/list', method: 'get', params: query })
return request({ url: '/business/project/listByRole', method: 'get', params: query })
}
// 兼容旧名
// 兼容旧名 (项目分配弹窗已不再使用, 保留避免破坏其它 import)
export const listExecutor = (query) => listByRole({ roleType: 'executor', ...query })
export const listSupporters = (query) => listByRole({ roleType: 'sponsor', ...query })
// 合规管理员 (sys_user.role_type='manager', 选项目负责人用)
export const listManagers = (query) => listByRole({ roleType: 'manager', ...query })
// 支持方下拉选项 (JOIN biz_org + sys_user): 返回 [{ userId, orgName, userName }, ...]
// 用于 manager 项目分配弹窗按公司名搜索 + 选公司
export function listSponsorOrgs(query) {
return request({ url: '/business/org/sponsorOptions', method: 'get', params: query })
}
// 执行方下拉选项 (JOIN biz_org + sys_user, 仅 MAIN 账号): 返回 [{ userId, orgName, userName }, ...]
// 用于 manager 项目分配弹窗按公司名搜索 + 选执行单位
// 关键: 后端 SQL 已限定 parent_user_id IS NULL, 自动排除同公司的普通员工子账号
// 业务上 label=orgName / value=MAIN user_id, 直接写 biz_project_assign.exec_user_id
export function listExecutorOrgs(query) {
return request({ url: '/business/org/executorOptions', method: 'get', params: query })
}
+257
View File
@@ -0,0 +1,257 @@
<template>
<div class="portal-shell">
<!-- ========== 顶部导航 ========== -->
<header class="top-nav" :class="topNavClass">
<a class="logo" title="返回首页" @click.prevent="goHome">
<div class="logo-icon"></div>
<div class="logo-text">
<span class="logo-title">北京整合医学学会</span>
<span class="logo-subtitle">Beijing Association of Holistic Integrative Medicine</span>
</div>
</a>
<ul class="nav-list">
<li class="nav-item"><a class="nav-link" :class="{ active: activeNav === 'home' }" @click.prevent="goHome">年度项目规划</a></li>
<li class="nav-item"><a class="nav-link" :class="{ active: activeNav === 'publicity' }" @click.prevent="goPublicity">项目公示</a></li>
</ul>
<div class="top-tools">
<template v-if="!loggedIn">
<span class="login-btn" @click="goLogin">登录</span>
</template>
<template v-else>
<el-dropdown trigger="click" @command="onUserCmd">
<a class="user-link" @click.prevent>
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
<path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2"/>
<circle cx="12" cy="7" r="4"/>
</svg>
<span>{{ userName }}</span>
</a>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item command="account">我的主页</el-dropdown-item>
<el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
</div>
</header>
<!-- ========== 主体 slot ========== -->
<main class="portal-main">
<slot />
</main>
<!-- ========== 底部 ========== -->
<footer class="footer">
<div class="container">
<div class="footer-main">
<div class="footer-brand">
<div class="brand-row">
<div class="footer-logo-icon"></div>
<div>
<div class="footer-brand-name">北京整合医学学会</div>
<div class="footer-brand-en">Beijing Association of Holistic Integrative Medicine</div>
</div>
</div>
<p class="footer-desc">依托"健康中国2030"战略,整合医学资源,推动健康科普与公益事业,助力全民健康素养提升,共建共享健康中国</p>
</div>
<div class="footer-col">
<h4>快速导航</h4>
<a @click.prevent="goHome">首页</a>
<a @click.prevent="goHome">年度项目规划</a>
<a @click.prevent="goPublicity">项目公示</a>
</div>
<div class="footer-col">
<h4>学会项目</h4>
<a>百姓巡常行</a>
<a>专病联盟暨全国专家智库</a>
<a>乡村幸福安康</a>
<a>临床科研资助计划</a>
</div>
<div class="footer-col">
<h4>联系方式</h4>
<p>电话: 010-82089470</p>
<p>邮箱: contactus@bahim.org.cn</p>
<p>地址: 北京市海淀区知春路1号学院国际大厦908-2</p>
<p>邮编: 100083</p>
</div>
<div class="footer-qr">
<div class="qr-image">
<svg width="52" height="52" viewBox="0 0 24 24" fill="currentColor">
<path d="M3 11h8V3H3v8zm2-6h4v4H5V5zm8-2v8h8V3h-8zm6 6h-4V5h4v4zM3 21h8v-8H3v8zm2-6h4v4H5v-4zm13-2h-2v2h2v-2zm-2 2h-2v2h2v-2zm2 2h-2v2h2v-2zm2-2h-2v2h2v-2zm-2-2h-2v2h2v-2zm-2-2h-2v2h2v-2zm-2-2h-2v2h2v-2zm-2-2h-2v2h2v-2zm0 0h-2v2h2v-2z"/>
</svg>
</div>
<div class="qr-label">公众号二维码</div>
</div>
</div>
<div class="footer-bottom">
<span>© 北京整合医学学会 BAHIM</span>
<span>京ICP备2020035479号-1 &nbsp;&nbsp; 京公网安备11010802034820</span>
</div>
</div>
</footer>
</div>
</template>
<script setup>
import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
import { useRouter } from 'vue-router'
import { useUserStore } from '@/store/user'
import { logout as logoutApi } from '@/api/auth'
defineProps({
activeNav: { type: String, default: '' } // 'home' | 'publicity' | ''
})
const router = useRouter()
const userStore = useUserStore()
const isScrolled = ref(false)
const topNavClass = computed(() => isScrolled.value ? 'is-scrolled' : '')
const loggedIn = computed(() => !!userStore.token)
const userName = computed(() => userStore.user?.userName || '用户')
function handleScroll() { isScrolled.value = window.scrollY > 10 }
function goHome() { isScrolled.value = false; router.push('/portal/home') }
function goPublicity() { router.push('/publicity') }
function goLogin() { router.push('/login') }
async function goLogout() {
try { await logoutApi() } catch {}
userStore.logout()
router.replace('/login')
}
async function onUserCmd(cmd) {
if (cmd === 'logout') return goLogout()
if (cmd === 'account') {
const r = (userStore.user?.role || '')
const map = { admin: '/leader/home', leader: '/leader/home', manager: '/manager/workbench', doctor: '/doctor/home', executor: '/executor/meetings', sponsor: '/sponsor/home' }
router.push(map[r] || '/leader/home')
}
}
onMounted(() => window.addEventListener('scroll', handleScroll, { passive: true }))
onBeforeUnmount(() => window.removeEventListener('scroll', handleScroll))
</script>
<style scoped>
/* ========== 基础 ========== */
* { margin: 0; padding: 0; box-sizing: border-box; }
.portal-shell {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
color: #1f2937;
background: #f5f6f8;
min-width: 1354px;
line-height: 1.6;
}
a { color: inherit; text-decoration: none; }
/* ========== 顶部导航 ========== */
.top-nav {
position: sticky; top: 0; z-index: 1000;
height: 72px; padding: 0 60px;
background: var(--brand-primary);
border-bottom: 1px solid rgba(255, 255, 255, 0.08);
display: flex; align-items: center;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.15);
transition: box-shadow 0.3s;
}
.top-nav.is-scrolled { box-shadow: 0 4px 20px rgba(0, 0, 0, 0.25); }
.logo { display: flex; align-items: center; gap: 12px; }
.logo-icon {
width: 36px; height: 36px;
background: #fff; color: var(--brand-primary);
display: flex; align-items: center; justify-content: center;
font-size: 18px; font-weight: 600;
}
.logo-text { display: flex; flex-direction: column; line-height: 1.2; }
.logo-title { font-size: 16px; font-weight: 600; color: #fff; letter-spacing: 0.5px; }
.logo-subtitle { font-size: 11px; color: rgba(255, 255, 255, 0.6); margin-top: 2px; letter-spacing: 0.3px; }
.nav-list {
flex: 1; display: flex; align-items: center; justify-content: center;
gap: 36px; list-style: none;
}
.nav-item { position: relative; height: 72px; display: flex; align-items: center; }
.nav-link {
font-size: 15px; font-weight: 500; color: rgba(255, 255, 255, 0.85);
cursor: pointer; transition: color 0.25s; position: relative;
height: 72px; display: flex; align-items: center;
}
.nav-link::after {
content: ''; position: absolute; left: 50%; bottom: 0;
width: 0; height: 2px; background: #fff;
transform: translateX(-50%); transition: width 0.3s ease;
}
.nav-item:hover .nav-link, .nav-link.active { color: #fff; }
.nav-item:hover .nav-link::after, .nav-link.active::after { width: 100%; }
.top-tools { display: flex; align-items: center; gap: 16px; }
.login-btn {
padding: 7px 20px; background: #fff; color: var(--brand-primary);
font-size: 13px; font-weight: 500;
cursor: pointer; transition: background 0.2s; letter-spacing: 1px;
}
.login-btn:hover { background: #f3f4f6; }
.user-link {
display: flex; align-items: center; gap: 6px;
padding: 6px 10px;
color: rgba(255, 255, 255, 0.85);
font-size: 13px; cursor: pointer;
transition: background 0.2s, color 0.2s;
}
.user-link:hover { background: rgba(255, 255, 255, 0.1); color: #fff; }
/* ========== 主体容器 ========== */
.portal-main { min-height: calc(100vh - 72px - 350px); } /* 给 footer 留位 */
.container { max-width: 1354px; margin: 0 auto; padding: 0 60px; }
/* ========== 底部 ========== */
.footer { background: var(--brand-primary-darker); color: rgba(255, 255, 255, 0.65); padding: 48px 0 0; }
.footer-main { display: grid; grid-template-columns: 1.4fr 1fr 1fr 1.2fr auto; gap: 48px; padding-bottom: 36px; }
.footer-brand .brand-row { display: flex; align-items: center; gap: 12px; margin-bottom: 16px; }
.footer-logo-icon {
width: 36px; height: 36px;
background: #fff; color: var(--brand-primary);
display: flex; align-items: center; justify-content: center;
font-size: 18px; font-weight: 600; flex-shrink: 0;
}
.footer-brand-name { font-size: 16px; font-weight: 600; color: #fff; letter-spacing: 1px; }
.footer-brand-en { font-size: 10px; color: rgba(255, 255, 255, 0.4); letter-spacing: 0.5px; margin-top: 2px; }
.footer-desc { font-size: 13px; line-height: 1.9; color: rgba(255, 255, 255, 0.55); }
.footer-col h4 {
font-size: 14px; font-weight: 600; color: #fff;
letter-spacing: 1px; margin-bottom: 16px; padding-bottom: 10px;
position: relative;
}
.footer-col h4::after {
content: ''; position: absolute; left: 0; bottom: 0;
width: 24px; height: 2px; background: #93c5fd;
}
.footer-col a, .footer-col p {
display: block; font-size: 13px; color: rgba(255, 255, 255, 0.6);
line-height: 2.1; transition: color 0.2s;
}
.footer-col a { cursor: pointer; }
.footer-col a:hover { color: #fff; }
.footer-qr { text-align: center; }
.qr-image {
width: 100px; height: 100px;
background: #fff;
display: flex; align-items: center; justify-content: center;
color: #1f2937;
}
.qr-label { font-size: 12px; color: rgba(255, 255, 255, 0.5); margin-top: 10px; }
.footer-bottom {
border-top: 1px solid rgba(255, 255, 255, 0.12);
padding: 18px 0;
display: flex; justify-content: space-between;
font-size: 12px; color: rgba(255, 255, 255, 0.4);
}
@media (max-width: 900px) {
.top-nav { padding: 0 24px; }
.container { padding: 0 24px; }
}
</style>
+1 -1
View File
@@ -62,7 +62,7 @@ const router = useRouter()
const store = useUserStore()
const role = computed(() => route.meta?.role || store.role)
const ROLE_LABEL = { leader: '项目负责人', manager: '合规人员', admin: '后台管理员', doctor: '评审专家', executor: '执行人', sponsor: '赞助方' }
const ROLE_LABEL = { leader: '项目负责人', manager: '合规人员', admin: '后台管理员', doctor: '评审专家', executor: '执行人', sponsor: '支持方' }
const roleLabel = computed(() => ROLE_LABEL[role.value] || '工作台')
const MENU = {
+1 -1
View File
@@ -12,7 +12,7 @@ const routes = [
{ path: 'invitation/:annId', name: 'invitation', component: () => import('@/views/portal/Invitation.vue'), meta: { title: '邀请函详情' } },
{ path: 'register-expert', name: 'register-expert', component: () => import('@/views/auth/RegisterExpert.vue'), meta: { title: '专家注册' } },
{ path: 'register-executor', name: 'register-executor', component: () => import('@/views/auth/RegisterExecutor.vue'), meta: { title: '执行单位(供应商)注册' } },
{ path: 'register-sponsor', name: 'register-sponsor', component: () => import('@/views/auth/RegisterSponsor.vue'), meta: { title: '赞助方注册' } },
{ path: 'register-sponsor', name: 'register-sponsor', component: () => import('@/views/auth/RegisterSponsor.vue'), meta: { title: '支持方注册' } },
{ path: 'login', name: 'login', component: () => import('@/views/auth/Login.vue'), meta: { title: '登录' } },
{ path: 'article/:type', name: 'portal-article', component: () => import('@/views/portal/ArticleView.vue'), meta: { title: '协议' } },
{ path: 'special-plan/:id', name: 'portal-special-plan', component: () => import('@/views/portal/SpecialPlanDetail.vue'), meta: { title: '专项计划详情' } }
+1 -1
View File
@@ -50,7 +50,7 @@ const store = useUserStore()
const tab = ref('profile')
const loading = ref(false)
const profile = ref({})
const ROLE_LABEL = { admin: '后台管理员', leader: '项目负责人', manager: '合规人员', doctor: '评审专家', executor: '执行人', sponsor: '赞助方' }
const ROLE_LABEL = { admin: '后台管理员', leader: '项目负责人', manager: '合规人员', doctor: '评审专家', executor: '执行人', sponsor: '支持方' }
const roleLabel = computed(() => ROLE_LABEL[store.role] || store.role || '后台管理员')
const form = reactive({ nickName: '', phonenumber: '', email: '' })
+5 -2
View File
@@ -137,7 +137,10 @@ function reset() {
async function onToggleStatus(row) {
const disabled = isDisabled(row)
const newStatus = disabled ? '正常' : '禁用'
// sys_user.status 是 CHAR(1), 只能写 '0'/'1' (禁用='1', 启用='0')
// 必须带 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只更新 biz_person (而 biz_person.status 已删除)
const newStatus = disabled ? '0' : '1'
const label = disabled ? '启用' : '禁用'
try {
await ElMessageBox.confirm(
@@ -147,7 +150,7 @@ async function onToggleStatus(row) {
)
} catch { return }
try {
await bizUpdate('person', { personId: row.personId, status: newStatus })
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success('已' + label)
load()
} catch (e) { ElMessage.error(e?.msg || '操作失败') }
+5 -5
View File
@@ -3,7 +3,7 @@
角色: 🟦 后台 公司管理 (admin/orgs)
重构说明 (2026-08-15):
biz_support_unit / biz_execution_unit / biz_service_org 三表合并为 biz_org
通过 org_type 区分 sponsor(赞助) / execution(执行方)
通过 org_type 区分 sponsor(支持) / execution(执行方)
biz_service_org 整体删除
接口: bizList('org', q) / bizUpdate
-->
@@ -14,7 +14,7 @@
<el-form inline :model="q" class="filter-form">
<el-form-item label="公司类型">
<el-select v-model="q.orgType" placeholder="全部" clearable style="width:140px">
<el-option label="赞助方" value="sponsor" />
<el-option label="支持方" value="sponsor" />
<el-option label="执行方" value="executor" />
</el-select>
</el-form-item>
@@ -50,7 +50,7 @@
<el-table-column label="公司类型" width="100" align="center">
<template #default="{ row }">
<el-tag :type="row.orgType === 'sponsor' ? 'success' : 'primary'" disable-transitions>
{{ row.orgType === 'sponsor' ? '赞助方' : '执行方' }}
{{ row.orgType === 'sponsor' ? '支持方' : '执行方' }}
</el-tag>
</template>
</el-table-column>
@@ -95,7 +95,7 @@
<el-form :model="form" label-width="120px" :rules="rules" ref="formRef">
<el-form-item label="公司类型" prop="orgType">
<el-radio-group v-model="form.orgType">
<el-radio value="sponsor">赞助</el-radio>
<el-radio value="sponsor">支持</el-radio>
<el-radio value="executor">执行方</el-radio>
</el-radio-group>
</el-form-item>
@@ -219,7 +219,7 @@ function onEdit(row) {
function onView(row) {
// 只读查看用 ElMessageBox 弹窗即可, 这里简单 alert 一下
ElMessageBox.alert(
`类型: ${row.orgType === 'sponsor' ? '赞助方' : '执行方'}\n` +
`类型: ${row.orgType === 'sponsor' ? '支持方' : '执行方'}\n` +
`名称: ${row.orgName}\n` +
`地址: ${row.address || '-'}\n` +
`税号: ${row.taxNo || '-'}\n` +
+1 -1
View File
@@ -47,7 +47,7 @@ import { ElMessage } from 'element-plus'
const ROLE_LABEL = {
admin: '后台管理员', leader: '项目负责人', manager: '合规人员',
doctor: '评审专家', executor: '执行人', sponsor: '赞助方'
doctor: '评审专家', executor: '执行人', sponsor: '支持方'
}
// 卡片展示的角色 (隐藏 admin / leader)
const VISIBLE_ROLES = ['manager', 'doctor', 'executor', 'sponsor']
+1 -1
View File
@@ -198,7 +198,7 @@ function onPeople(row) {
}
function onView(row) {
ElMessageBox.alert(
`类型: 赞助\n` +
`类型: 支持\n` +
`名称: ${row.orgName}\n` +
`地址: ${row.address || '-'}\n` +
`税号: ${row.taxNo || '-'}\n` +
+5 -2
View File
@@ -138,7 +138,10 @@ function reset() {
async function onToggleStatus(row) {
const disabled = isDisabled(row)
const newStatus = disabled ? '正常' : '禁用'
// sys_user.status 是 CHAR(1), 只能写 '0'/'1' (禁用='1', 启用='0')
// 必须带 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只更新 biz_person (而 biz_person.status 已删除)
const newStatus = disabled ? '0' : '1'
const label = disabled ? '启用' : '禁用'
try {
await ElMessageBox.confirm(
@@ -148,7 +151,7 @@ async function onToggleStatus(row) {
)
} catch { return }
try {
await bizUpdate('person', { personId: row.personId, status: newStatus })
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success('已' + label)
load()
} catch (e) { ElMessage.error(e?.msg || '操作失败') }
+1 -1
View File
@@ -30,7 +30,7 @@
<el-input v-model="form.position" placeholder="职务" maxlength="50" />
</el-form-item>
<el-form-item label="角色">
<span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(赞助方人员固定)</span></span>
<span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(支持方人员固定)</span></span>
</el-form-item>
</el-form>
</el-card>
+1 -1
View File
@@ -98,7 +98,7 @@ import { ElMessage } from 'element-plus'
const ROLE_LABEL = {
admin: '后台管理员', leader: '项目负责人', manager: '合规人员',
doctor: '评审专家', executor: '执行人', sponsor: '赞助方'
doctor: '评审专家', executor: '执行人', sponsor: '支持方'
}
const roleOptions = Object.entries(ROLE_LABEL).map(([value, label]) => ({ value, label }))
+2 -2
View File
@@ -53,7 +53,7 @@ const roleStats = ref([])
const ROLE_LABEL = {
admin: '后台管理员', leader: '项目负责人', manager: '合规人员',
doctor: '评审专家', executor: '执行人', sponsor: '赞助方'
doctor: '评审专家', executor: '执行人', sponsor: '支持方'
}
async function load() {
@@ -125,7 +125,7 @@ onMounted(load)
background-clip: text;
}
.hint-text { font-size: 12px; color: #ff4d4f; margin: 12px 0 20px; text-align: center; }
.hint-text { font-size: 12px; color: #8c8c8c; margin: 12px 0 20px; text-align: center; }
.section {
background: #fff;
+1 -1
View File
@@ -213,7 +213,7 @@ const userTypes = [
{ value: 'manager', name: '项目经理', desc: '项目管理、方案审核、过程监督' },
{ value: 'doctor', name: '评审专家', desc: '项目评审、评分反馈、查看任务' },
{ value: 'executor', name: '执行单位', desc: '会议组织、人员安排、劳务结算' },
{ value: 'sponsor', name: '支持单位 / 赞助方', desc: '支持函管理、人员管理、合作记录' },
{ value: 'sponsor', name: '支持单位', desc: '支持函管理、人员管理、合作记录' },
]
async function loadCaptcha() {
+11 -7
View File
@@ -1,7 +1,7 @@
<template>
<div class="page-wrap">
<div class="page-card">
<div class="page-title">新执行单位(供应商)注册</div>
<PortalShell>
<div class="page-wrap">
<div class="page-card">
<el-steps :active="step" finish-status="success" simple class="steps">
<el-step title="基本信息" />
@@ -12,7 +12,7 @@
<!-- ============ Step 0: 基本信息 ( proto 供应商注册.html) ============ -->
<!-- TODO: 后续如要做 sponsor 也用同样模板, 拆出 BizOrgRegisterVO 公共组件 -->
<template v-if="step === 0">
<el-form ref="formRef" :model="form" :rules="rules" label-width="110px" label-position="right">
<el-form ref="formRef" :model="form" :rules="rules" label-width="130px" label-position="right">
<el-form-item label="用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入登录用户名(4-20位字母数字)" maxlength="20" />
</el-form-item>
@@ -81,8 +81,9 @@
<div class="login-link">
已有账号? <a href="javascript:void(0)" @click="$router.push('/login')">立即登录</a>
</div>
</div>
</div>
</div>
</PortalShell>
</template>
<script setup>
@@ -90,6 +91,7 @@ import { reactive, ref, onUnmounted } from 'vue'
import { ElMessage } from 'element-plus'
import request from '@/utils/request'
import { registerExecutor } from '@/api/public'
import PortalShell from '@/components/PortalShell.vue'
import { useAsyncLock } from '@/utils/useAsyncLock'
const { locked: smsLocked, run: sendSmsOnce } = useAsyncLock()
@@ -182,7 +184,8 @@ async function onSubmit() {
ElMessage.success('注册成功')
step.value = 1
} catch (e) {
ElMessage.error(e?.msg || '注册失败')
// 错误提示已由 utils/request.js 拦截器统一弹 (ElMessage.error), 这里只 log
console.warn('registerExecutor failed', e?.message || e)
} finally {
submitting.value = false
}
@@ -192,6 +195,7 @@ onUnmounted(() => { if (smsTimer) clearInterval(smsTimer) })
</script>
<style scoped>
.page-card { max-width: 1200px; margin: 0 auto; }
.steps { max-width: 720px; margin: 24px auto 0; }
.step-body { max-width: 640px; margin: 32px auto 0; }
.sms-row { display: flex; gap: 12px; width: 100%; }
@@ -200,6 +204,6 @@ onUnmounted(() => { if (smsTimer) clearInterval(smsTimer) })
.agreement-content { line-height: 1.8; color: #606266; }
.agreement-content p { margin-bottom: 12px; }
.login-link { text-align: center; margin-top: 16px; font-size: 14px; color: #606266; }
.login-link a { color: #1890ff; text-decoration: none; margin-left: 4px; }
.login-link a { color: var(--brand-primary); text-decoration: none; margin-left: 4px; }
.login-link a:hover { text-decoration: underline; }
</style>
+84 -84
View File
@@ -1,86 +1,85 @@
<template>
<div class="page-wrap">
<div class="page-card">
<div class="page-title">专家注册</div>
<PortalShell>
<div class="page-wrap">
<div class="page-card">
<!-- Stepper (原型: 1 基本信息 2 注册成功) -->
<div class="stepper">
<div class="step">
<div class="step-circle" :class="{ active: step === 0, done: step > 0 }">1</div>
<div class="step-label" :class="{ active: step === 0, done: step > 0 }">基本信息</div>
</div>
<div class="step-line" :class="{ done: step > 0 }"></div>
<div class="step">
<div class="step-circle" :class="{ active: step === 1 }">2</div>
<div class="step-label" :class="{ active: step === 1 }">注册成功</div>
<el-steps :active="step" finish-status="success" simple class="steps">
<el-step title="基本信息" />
<el-step title="注册成功" />
</el-steps>
<div class="step-body">
<!-- 表单 (原型 1:1 : 11 个字段) -->
<el-form v-if="step === 0" :model="form" :rules="rules" ref="formRef" label-width="130px" label-position="right">
<el-form-item label="姓名" prop="realName">
<el-input v-model="form.realName" placeholder="请输入您的真实姓名" />
</el-form-item>
<el-form-item label="工作单位" prop="workUnit">
<el-input v-model="form.workUnit" placeholder="请输入工作单位(医院全称)" />
</el-form-item>
<el-form-item label="科室" prop="department">
<DoctorDeptSelect v-model="form.department" placeholder="请输入所在科室" />
</el-form-item>
<el-form-item label="职称" prop="doctorTitle">
<DoctorTitleSelect v-model="form.doctorTitle" placeholder="请输入职称" />
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
<el-form-item label="短信验证码" prop="code">
<div class="sms-row">
<el-input v-model="form.code" placeholder="请输入收到的验证码" maxlength="6" />
<el-button class="sms-btn" :disabled="smsLocked || smsCountdown > 0 || !form.phone" @click="sendCode">
{{ smsLocked ? '发送中...' : smsCountdown > 0 ? `${smsCountdown}s 后重新获取` : '获取验证码' }}
</el-button>
</div>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" show-password placeholder="请输入登录密码(6-20位)" />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="form.confirmPassword" type="password" show-password placeholder="请再次输入登录密码" />
</el-form-item>
<el-form-item label="执业证书/证明">
<OssImageUploader v-model="form.licenseCertUrl" dir="ry8080/cert/license/" placeholder="+" />
</el-form-item>
<el-form-item label="职称证明">
<OssImageUploader v-model="form.titleCertUrl" dir="ry8080/cert/title/" placeholder="+" />
</el-form-item>
<el-form-item>
<el-checkbox v-model="agreed">我已阅读并同意
<a href="#/article/agreement" target="_blank">用户协议</a>
<a href="#/article/privacy" target="_blank">隐私政策</a>
</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" :disabled="!agreed" @click="onSubmit" :loading="submitting" style="width: 100%;">同意协议并注册</el-button>
</el-form-item>
</el-form>
<!-- 注册成功 -->
<div v-else class="success-page">
<el-result icon="success" title="注册成功" sub-title="请等待管理员审核,审核通过后即可登录">
<template #extra>
<el-button type="primary" @click="$router.push('/login')">前往登录</el-button>
</template>
</el-result>
</div>
</div>
<!-- 表单 (原型 1:1 : 11 个字段) -->
<el-form v-if="step === 0" :model="form" :rules="rules" ref="formRef" label-width="100px" style="max-width:760px;margin:24px auto;">
<el-form-item label="姓名" prop="realName">
<el-input v-model="form.realName" placeholder="请输入您的真实姓名" />
</el-form-item>
<el-form-item label="工作单位" prop="workUnit">
<el-input v-model="form.workUnit" placeholder="请输入工作单位(医院全称)" />
</el-form-item>
<el-form-item label="科室" prop="department">
<DoctorDeptSelect v-model="form.department" placeholder="请输入所在科室" />
</el-form-item>
<el-form-item label="职称" prop="doctorTitle">
<DoctorTitleSelect v-model="form.doctorTitle" placeholder="请输入职称" />
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
<el-form-item label="短信验证码" prop="code">
<div class="sms-row">
<el-input v-model="form.code" placeholder="请输入收到的验证码" maxlength="6" />
<el-button :disabled="smsLocked || smsCountdown > 0 || !form.phone" @click="sendCode">
{{ smsLocked ? '发送中...' : smsCountdown > 0 ? `${smsCountdown}s 后重新获取` : '获取验证码' }}
</el-button>
</div>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" show-password placeholder="请输入登录密码(6-20位)" />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="form.confirmPassword" type="password" show-password placeholder="请再次输入登录密码" />
</el-form-item>
<el-form-item label="执业证书/证明">
<OssImageUploader v-model="form.licenseCertUrl" dir="ry8080/cert/license/" placeholder="+" />
</el-form-item>
<el-form-item label="职称证明">
<OssImageUploader v-model="form.titleCertUrl" dir="ry8080/cert/title/" placeholder="+" />
</el-form-item>
<el-form-item>
<el-checkbox v-model="agreed">我已阅读并同意
<a href="#/article/agreement" target="_blank">用户协议</a>
<a href="#/article/privacy" target="_blank">隐私政策</a>
</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" :disabled="!agreed" @click="onSubmit" :loading="submitting" style="width: 100%;">同意协议并注册</el-button>
</el-form-item>
</el-form>
<!-- 注册成功 -->
<div v-else class="success-page">
<el-result icon="success" title="注册成功" sub-title="请等待管理员审核,审核通过后即可登录">
<template #extra>
<el-button type="primary" @click="$router.push('/login')">前往登录</el-button>
</template>
</el-result>
<div class="login-link">
已有账号? <a href="javascript:void(0)" @click="$router.push('/login')">立即登录</a>
</div>
</div>
</div>
</div>
</PortalShell>
</template>
<script setup>
import { reactive, ref } from 'vue'
import { reactive, ref, onUnmounted } from 'vue'
import { useRouter } from 'vue-router'
import { ElMessage } from 'element-plus'
import { registerExpert } from '@/api/public'
@@ -88,6 +87,7 @@ import request from '@/utils/request'
import DoctorDeptSelect from '@/components/DoctorDeptSelect.vue'
import DoctorTitleSelect from '@/components/DoctorTitleSelect.vue'
import OssImageUploader from '@/components/OssImageUploader.vue'
import PortalShell from '@/components/PortalShell.vue'
import { useAsyncLock } from '@/utils/useAsyncLock'
const { locked: smsLocked, run: sendSmsOnce } = useAsyncLock()
@@ -171,27 +171,27 @@ async function onSubmit() {
ElMessage.success('注册成功')
step.value = 1
} catch (e) {
ElMessage.error(e?.msg || '注册失败')
// 错误提示已由 utils/request.js 拦截器统一弹 (ElMessage.error), 这里只 log
console.warn('registerExpert failed', e?.message || e)
} finally {
submitting.value = false
}
}
onUnmounted(() => { if (smsTimer) clearInterval(smsTimer) })
</script>
<style scoped>
.stepper { display: flex; align-items: center; justify-content: center; margin: 24px 0 8px; }
.step { display: flex; align-items: center; gap: 8px; }
.step-circle { width: 28px; height: 28px; border-radius: 50%; background: #fff; border: 1px solid #d9d9d9; color: #909399; display: flex; align-items: center; justify-content: center; font-size: 14px; font-weight: 500; }
.step-circle.active { background: #1890ff; border-color: #1890ff; color: #fff; }
.step-circle.done { background: #52c41a; border-color: #52c41a; color: #fff; }
.step-label { font-size: 14px; color: #909399; }
.step-label.active { color: #1890ff; font-weight: 500; }
.step-label.done { color: #52c41a; }
.step-line { width: 80px; height: 1px; background: #d9d9d9; margin: 0 12px; }
.step-line.done { background: #52c41a; }
.page-card { max-width: 1200px; margin: 0 auto; }
.steps { max-width: 720px; margin: 24px auto 0; }
.step-body { max-width: 640px; margin: 32px auto 0; }
.sms-row { display: flex; gap: 12px; width: 100%; }
.sms-row .el-input { flex: 1; }
.sms-btn { flex-shrink: 0; }
.agreement-content { line-height: 1.8; color: #606266; }
.agreement-content p { margin-bottom: 12px; }
.login-link { text-align: center; margin-top: 16px; font-size: 14px; color: #606266; }
.login-link a { color: var(--brand-primary); text-decoration: none; margin-left: 4px; }
.login-link a:hover { text-decoration: underline; }
.success-page { padding: 60px 0; text-align: center; }
</style>
+188 -22
View File
@@ -1,42 +1,208 @@
<template>
<div class="page-wrap">
<div class="page-card">
<div class="page-title">赞助方注册</div>
<PortalShell>
<div class="page-wrap">
<div class="page-card">
<el-steps :active="step" finish-status="success" simple class="steps">
<el-step title="账号信息" /><el-step title="单位信息" />
<el-step title="基本信息" />
<el-step title="注册成功" />
</el-steps>
<div class="step-body">
<!-- ============ Step 0: 基本信息 (字段与 register-executor 完全一致, orgType 不同) ============ -->
<template v-if="step === 0">
<el-form :model="form" label-width="100px"><el-form-item label="用户名"><el-input v-model="form.username" /></el-form-item><el-form-item label="密码"><el-input v-model="form.password" type="password" /></el-form-item></el-form>
<el-form ref="formRef" :model="form" :rules="rules" label-width="130px" label-position="right">
<el-form-item label="用户名" prop="username">
<el-input v-model="form.username" placeholder="请输入登录用户名(4-20位字母数字)" maxlength="20" />
</el-form-item>
<el-form-item label="企业名称" prop="unitName">
<el-input v-model="form.unitName" placeholder="请输入企业全称" maxlength="200" />
</el-form-item>
<el-form-item label="企业性质" prop="businessNature">
<el-select v-model="form.businessNature" placeholder="请选择企业性质" style="width:100%">
<el-option label="私营" value="私营" />
<el-option label="国营" value="国营" />
<el-option label="中外合资" value="中外合资" />
<el-option label="外资" value="外资" />
<el-option label="其他" value="其他" />
</el-select>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" />
</el-form-item>
<el-form-item label="短信验证码" prop="smsCode">
<div class="sms-row">
<el-input v-model="form.smsCode" placeholder="请输入收到的验证码" maxlength="6" />
<el-button class="sms-btn" :disabled="smsLocked || smsCountdown > 0 || !form.phone" @click="sendSms">
{{ smsLocked ? '发送中...' : smsCountdown > 0 ? `${smsCountdown}s 后重试` : '获取验证码' }}
</el-button>
</div>
</el-form-item>
<el-form-item label="登录密码" prop="password">
<el-input v-model="form.password" type="password" show-password placeholder="请输入登录密码(6-20位)" />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="form.confirmPassword" type="password" show-password placeholder="请再次输入登录密码" />
</el-form-item>
<el-form-item>
<el-checkbox v-model="agreed">我已阅读并同意
<a href="#/article/agreement" target="_blank">用户协议</a>
<a href="#/article/privacy" target="_blank">隐私政策</a>
</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" :disabled="!agreed" :loading="submitting" @click="onSubmit" style="width:100%;">
同意协议并注册
</el-button>
</el-form-item>
</el-form>
</template>
<!-- ============ Step 1: 注册成功 ============ -->
<template v-else>
<el-form :model="form" label-width="100px"><el-form-item label="单位名称"><el-input v-model="form.unitName" /></el-form-item><el-form-item label="联系人"><el-input v-model="form.contact" /></el-form-item><el-form-item label="联系电话"><el-input v-model="form.phone" /></el-form-item><el-form-item label="赞助意向"><el-input v-model="form.intent" type="textarea" /></el-form-item><el-form-item><el-checkbox v-model="agreed">我已阅读并同意 <a href="#/article/agreement" target="_blank">《用户协议》</a> 和 <a href="#/article/privacy" target="_blank">隐私政策</a></el-checkbox></el-form-item></el-form>
<el-result icon="success" title="注册成功" sub-title="我们会在 3 个工作日内完成审核">
<template #extra>
<el-button type="primary" @click="$router.push('/login')">前往登录</el-button>
</template>
</el-result>
</template>
</div>
<div style="text-align:center;margin-top:16px">
<el-button @click="prev" :disabled="step === 0">上一步</el-button>
<el-button type="primary" @click="next" v-if="step < 2">下一步</el-button>
<el-button @click="$router.push('/login')" v-else>去登录</el-button>
<div class="login-link">
已有账号? <a href="javascript:void(0)" @click="$router.push('/login')">立即登录</a>
</div>
</div>
</div>
</div>
</PortalShell>
</template>
<script setup>
import { reactive, ref } from 'vue'
import { registerSponsor } from '@/api/public'
import { reactive, ref, onUnmounted } from 'vue'
import { ElMessage } from 'element-plus'
import request from '@/utils/request'
import { registerSponsor } from '@/api/public'
import PortalShell from '@/components/PortalShell.vue'
import { useAsyncLock } from '@/utils/useAsyncLock'
const { locked: smsLocked, run: sendSmsOnce } = useAsyncLock()
const step = ref(0)
const form = reactive({ username: '', password: '', unitName: '', contact: '', phone: '', intent: '' })
const formRef = ref()
const submitting = ref(false)
const agreed = ref(false)
const prev = () => step.value = Math.max(0, step.value - 1)
const next = async () => {
if (step.value === 1) {
if (!agreed.value) return ElMessage.warning('请先阅读并同意用户协议和隐私政策')
try { await registerSponsor(form); ElMessage.success('已提交') } catch { /* demo */ }
step.value = 2
const form = reactive({
username: '',
unitName: '',
businessNature: '',
phone: '',
smsCode: '',
password: '',
confirmPassword: ''
})
const rules = {
username: [
{ required: true, message: '请输入登录用户名', trigger: 'blur' },
{ min: 4, max: 20, message: '用户名长度 4-20 位', trigger: 'blur' },
{ pattern: /^[A-Za-z0-9_]+$/, message: '只能包含字母/数字/下划线', trigger: 'blur' }
],
unitName: [{ required: true, message: '请输入企业名称', trigger: 'blur' }],
businessNature: [{ required: true, message: '请选择企业性质', trigger: 'change' }],
phone: [
{ required: true, message: '请输入手机号码', trigger: 'blur' },
{ pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
],
smsCode: [{ required: true, message: '请输入短信验证码', trigger: 'blur' }],
password: [
{ required: true, message: '请输入登录密码', trigger: 'blur' },
{ min: 6, max: 20, message: '密码长度 6-20 位', trigger: 'blur' }
],
confirmPassword: [
{ required: true, message: '请再次输入登录密码', trigger: 'blur' },
{
validator: (rule, value, cb) => {
if (value !== form.password) cb(new Error('两次密码输入不一致'))
else cb()
},
trigger: 'blur'
}
]
}
// ===== 短信验证码 =====
const smsCountdown = ref(0)
let smsTimer = null
const smsUuid = ref('')
async function sendSms() {
if (!/^1\d{10}$/.test(form.phone)) {
return ElMessage.warning('请先输入正确的手机号')
}
await sendSmsOnce(async () => {
try {
const resp = await request({
url: '/business/auth/registerSendSms',
method: 'post',
data: { phone: form.phone }
})
smsUuid.value = resp?.data || ''
ElMessage.success('验证码已发送')
smsCountdown.value = 60
smsTimer = setInterval(() => {
smsCountdown.value--
if (smsCountdown.value <= 0) {
clearInterval(smsTimer)
smsTimer = null
}
}, 1000)
} catch (e) {
ElMessage.warning(e?.msg || '验证码发送失败')
}
})
}
// ===== 提交 =====
async function onSubmit() {
try {
await formRef.value.validate()
} catch {
return
}
step.value++
submitting.value = true
try {
await registerSponsor({ ...form, uuid: smsUuid.value })
ElMessage.success('注册成功')
step.value = 1
} catch (e) {
// 错误提示已由 utils/request.js 拦截器统一弹 (ElMessage.error), 这里只 log
console.warn('registerSponsor failed', e?.message || e)
} finally {
submitting.value = false
}
}
onUnmounted(() => { if (smsTimer) clearInterval(smsTimer) })
</script>
<style scoped>.steps { max-width: 560px; margin: 16px auto; } .step-body { max-width: 560px; margin: 16px auto; }</style>
<style scoped>
.page-card { max-width: 1200px; margin: 0 auto; }
.steps { max-width: 720px; margin: 24px auto 0; }
.step-body { max-width: 640px; margin: 32px auto 0; }
.sms-row { display: flex; gap: 12px; width: 100%; }
.sms-row .el-input { flex: 1; }
.sms-btn { flex-shrink: 0; }
.agreement-content { line-height: 1.8; color: #606266; }
.agreement-content p { margin-bottom: 12px; }
.login-link { text-align: center; margin-top: 16px; font-size: 14px; color: #606266; }
.login-link a { color: var(--brand-primary); text-decoration: none; margin-left: 4px; }
.login-link a:hover { text-decoration: underline; }
</style>
+1 -1
View File
@@ -45,7 +45,7 @@
<el-descriptions-item label="项目编号">{{ detail.projectNo }}</el-descriptions-item>
<el-descriptions-item label="项目形式">{{ detail.projectForm || '-' }}</el-descriptions-item>
<el-descriptions-item label="项目名称" :span="2">{{ detail.projectName }}</el-descriptions-item>
<el-descriptions-item label="赞助方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="支持方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="总场次">{{ detail.totalSessions || 0 }}</el-descriptions-item>
<el-descriptions-item label="已执行">{{ detail.doneSessions || 0 }}</el-descriptions-item>
<el-descriptions-item label="未执行">{{ detail.todoSessions || 0 }}</el-descriptions-item>
+38 -2
View File
@@ -34,7 +34,13 @@
</el-form-item>
<el-form-item label="所属公司" prop="orgName">
<el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
<el-input v-model="form.orgName" :readonly="!!myOrg" placeholder="请输入所属公司" maxlength="200">
<template #append v-if="myOrg">
<el-tooltip content="主账号公司, 注册时已自动关联" placement="top">
<el-icon><Lock /></el-icon>
</el-tooltip>
</template>
</el-input>
</el-form-item>
<el-form-item label="部门" prop="department">
@@ -72,15 +78,21 @@ import { ref, reactive, computed, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { bizGet, bizAdd, bizUpdate } from '@/api/public'
import { ElMessage } from 'element-plus'
import request from '@/utils/request'
import { useUserStore } from '@/store/user'
import { Lock } from '@element-plus/icons-vue'
const route = useRoute()
const router = useRouter()
const userStore = useUserStore()
const isEdit = computed(() => !!route.params.id)
const personId = computed(() => route.params.id || null)
const formRef = ref()
const saving = ref(false)
// 主账号关联的公司 (注册时建, 按 user_id 反查)
const myOrg = ref(null)
const form = reactive({
userName: '',
name: '',
@@ -146,7 +158,31 @@ function goHome() {
router.push('/executor/overview')
}
onMounted(loadDetail)
// 加载主账号关联的公司 (注册时建, 按 user_id + orgType 反查, 一用户一类型一公司)
async function loadMyOrg() {
const uid = userStore.user?.userId
if (!uid) return
try {
const res = await request({
url: '/business/org/list',
method: 'get',
params: { userId: uid, orgType: 'executor', pageNum: 1, pageSize: 1 }
})
const rows = (res?.data?.rows) || res?.rows || []
if (rows.length) {
myOrg.value = rows[0]
// 默认带出, 提交时也直接发这个 orgId (不再依赖 orgName 字符串匹配)
form.orgName = rows[0].orgName || ''
}
} catch (e) {
console.warn('loadMyOrg:', e?.msg)
}
}
onMounted(() => {
if (isEdit.value) loadDetail()
else loadMyOrg() // 新建时默认带出主账号公司
})
</script>
<style scoped>
+5 -2
View File
@@ -131,8 +131,11 @@ function onView(row) { view.value = row; viewOpen.value = true }
async function onToggleStatus(row, action) {
try {
await ElMessageBox.confirm(`确定${action}${row.name}」吗?`, action, { type: 'warning' })
const newStatus = action === '禁用' ? '禁用' : '正常'
await bizUpdate('person', { personId: row.personId, status: newStatus })
// sys_user.status 是 CHAR(1), 只能写 '0'/'1' (禁用='1', 启用='0')
// 必须带 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只更新 biz_person (而 biz_person.status 已删除)
const newStatus = action === '禁用' ? '1' : '0'
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success(`${action}成功`)
loadList()
} catch (e) { if (e !== 'cancel') ElMessage.error(e?.msg || `${action}失败`) }
+1 -1
View File
@@ -124,7 +124,7 @@
<el-descriptions-item label="项目编号">{{ detail.projectNo }}</el-descriptions-item>
<el-descriptions-item label="项目形式">{{ detail.projectForm }}</el-descriptions-item>
<el-descriptions-item label="项目名称" :span="2">{{ detail.projectName }}</el-descriptions-item>
<el-descriptions-item label="赞助方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="支持方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="总场次/总期数">{{ detail.totalSessions }}/{{ detail.totalPeriods }}</el-descriptions-item>
<el-descriptions-item label="已执行">{{ detail.doneSessions || 0 }}</el-descriptions-item>
<el-descriptions-item label="未执行">{{ detail.todoSessions || 0 }}</el-descriptions-item>
+1 -1
View File
@@ -8,7 +8,7 @@
是否结题 / 项目开始时间 / 项目结束时间 / 操作
操作列 (top 352, left): 查看 / 项目评价 / 分配
提示:
- 支持方管理员分配时只能分配监察员赞助领导方可分配执行人员
- 支持方管理员分配时只能分配监察员支持领导方可分配执行人员
- 项目评价: 4 维度评分标准与供应商系统一致
-->
<div class="leader-projects">
+5 -2
View File
@@ -137,7 +137,10 @@ function reset() {
async function onToggleStatus(row) {
const disabled = isDisabled(row)
const newStatus = disabled ? '正常' : '禁用'
// sys_user.status 是 CHAR(1), 只能写 '0'/'1' (禁用='1', 启用='0')
// 必须带 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只更新 biz_person (而 biz_person.status 已删除)
const newStatus = disabled ? '0' : '1'
const label = disabled ? '启用' : '禁用'
try {
await ElMessageBox.confirm(
@@ -147,7 +150,7 @@ async function onToggleStatus(row) {
)
} catch { return }
try {
await bizUpdate('person', { personId: row.personId, status: newStatus })
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success('已' + label)
load()
} catch (e) { ElMessage.error(e?.msg || '操作失败') }
@@ -5,54 +5,61 @@
首页 / 项目管理 / <span class="current">项目详情</span>
</div>
<!-- ================= 1. 项目信息 (11 字段, 一列竖排) ================= -->
<el-form v-if="row && row.projectId" label-position="left" class="info-form">
<el-form-item label="项目编号">
<span class="info-value">{{ row.projectNo || '-' }}</span>
</el-form-item>
<el-form-item label="项目名称">
<span class="info-value">{{ row.projectName || '-' }}</span>
</el-form-item>
<el-form-item label="总场次/总期数">
<span class="info-value">{{ row.totalSessions || 0 }}</span>
</el-form-item>
<el-form-item label="总金额">
<span class="info-value money">¥ {{ fmtMoney(row.totalAmount) }}</span>
</el-form-item>
<el-form-item label="管理费及税金">
<span class="info-value money">¥ {{ fmtMoney(row.manageFee) }}</span>
</el-form-item>
<el-form-item label="项目开始时间">
<span class="info-value">{{ fmtDate(row.startTime) }}</span>
</el-form-item>
<el-form-item label="项目结束时间">
<span class="info-value">{{ fmtDate(row.endTime) }}</span>
</el-form-item>
<el-form-item label="赞助公司">
<span class="info-value">{{ row.sponsorAdminUserName || '-' }}</span>
</el-form-item>
<el-form-item label="项目形式">
<span class="info-value">{{ row.projectForm || '-' }}</span>
</el-form-item>
<el-form-item label="项目评价">
<a class="op-link" href="javascript:void(0)" @click="openScoreDialog">{{ fmtScore(row.ratingScore) }}</a>
</el-form-item>
<!-- ================= 1. 项目信息 (11 字段, 两列) ================= -->
<div class="new-card-title">项目信息</div>
<el-form v-if="row && row.projectId" label-width="120px" class="info-form">
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="项目编号"><span class="info-value">{{ row.projectNo || '-' }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="项目名称"><span class="info-value">{{ row.projectName || '-' }}</span></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="总场次/总期数"><span class="info-value">{{ row.totalSessions || 0 }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="总金额"><span class="info-value money">¥ {{ fmtMoney(row.totalAmount) }}</span></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="管理费及税金"><span class="info-value money">¥ {{ fmtMoney(row.manageFee) }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="项目形式"><span class="info-value">{{ row.projectForm || '-' }}</span></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="项目开始时间"><span class="info-value">{{ fmtDate(row.startTime) }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="项目结束时间"><span class="info-value">{{ fmtDate(row.endTime) }}</span></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="是否招标项目"><span class="info-value">{{ row.isBidProject === 'Y' ? '是' : '否' }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="项目负责人"><span class="info-value">{{ row.leadUserName || row.sponsorAdminUserName || '-' }}</span></el-form-item></el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12"><el-form-item label="支持公司"><span class="info-value">{{ row.sponsorAdminUserName || '-' }}</span></el-form-item></el-col>
<el-col :span="12"><el-form-item label="项目评价"><a class="op-link" href="javascript:void(0)" @click="openScoreDialog">{{ fmtScore(row.ratingScore) }}</a></el-form-item></el-col>
</el-row>
</el-form>
<!-- ================= 2. 角色劳务设置 ================= -->
<div class="section-title">角色劳务设置</div>
<p class="hint-red">*角色劳务设置针对该项目所有会议生效</p>
<el-table :data="form.roleRows" border>
<el-table-column prop="role" label="角色" width="120" />
<el-table-column label="劳务金额" align="right">
<template #default="{ row }">¥ {{ fmtMoney(row.amount) }}</template>
</el-table-column>
<el-table-column label="操作" width="80" align="center">
<template #default="{ $index }">
<el-button link type="danger" :disabled="form.roleRows.length<=1" @click="removeRoleRowAt($index)">删除</el-button>
</template>
</el-table-column>
</el-table>
<table class="info-table role-labor-table">
<colgroup>
<col style="width:120px">
<col style="width:180px">
<col style="width:80px">
</colgroup>
<thead>
<tr>
<th>角色</th>
<th style="text-align:right">劳务金额</th>
<th style="text-align:center">操作</th>
</tr>
</thead>
<tbody>
<tr v-for="(r, idx) in form.roleRows" :key="idx">
<td>{{ r.role || '-' }}</td>
<td style="text-align:right">¥ {{ fmtMoney(r.amount) }}</td>
<td style="text-align:center">
<el-button link type="danger" :disabled="form.roleRows.length<=1" @click="removeRoleRowAt(idx)">删除</el-button>
</td>
</tr>
</tbody>
</table>
<div style="margin-top:8px">
<el-button link type="primary" @click="addRoleRow">+ 增加角色</el-button>
</div>
@@ -402,6 +409,13 @@ onMounted(async () => {
.info-form :deep(.el-form-item__label) {
font-size: 14px; color: #595959; width: 130px; padding-right: 16px;
}
/* 章节标题 (与编辑页 ProjectsNew.vue 保持一致) */
.new-card-title {
font-size: 14px; font-weight: 600; color: #262626;
margin: 16px 0 12px; padding-left: 8px;
border-left: 3px solid var(--brand-primary); line-height: 1;
}
.new-card-title:first-child { margin-top: 0; }
.info-value { font-size: 15px; color: #1a1a1a; font-weight: 500; }
.info-value.money {
font-family: ui-monospace, "Courier New", monospace;
@@ -425,6 +439,11 @@ onMounted(async () => {
/* 角色劳务表格 */
.info-table { width: 100%; border-collapse: collapse; font-size: 13px; }
.role-labor-table { width: auto; border: 1px solid #ebeef5; } /* 角色劳务表格按内容紧凑显示, 不撑满卡片 */
.role-labor-table th,
.role-labor-table td { border-right: 1px solid #ebeef5; }
.role-labor-table th:last-child,
.role-labor-table td:last-child { border-right: none; }
.info-table th { background: #fafafa; padding: 10px 12px; text-align: left; color: #1a1a1a; font-weight: 600; border-bottom: 1px solid #f0f0f0; white-space: nowrap; }
.info-table td { padding: 10px 12px; border-bottom: 1px solid #f5f5f5; color: #595959; vertical-align: middle; }
+3 -3
View File
@@ -11,7 +11,7 @@
<el-form inline :model="q" class="filter-form">
<el-form-item label="公司类型">
<el-select v-model="q.orgType" placeholder="全部" clearable style="width:140px">
<el-option label="赞助方" value="sponsor" />
<el-option label="支持方" value="sponsor" />
<el-option label="执行方" value="executor" />
</el-select>
</el-form-item>
@@ -40,7 +40,7 @@
<el-table-column label="类型" width="100" align="center">
<template #default="{ row }">
<el-tag :type="row.orgType === 'sponsor' ? 'success' : 'primary'" disable-transitions>
{{ row.orgType === 'sponsor' ? '赞助方' : '执行方' }}
{{ row.orgType === 'sponsor' ? '支持方' : '执行方' }}
</el-tag>
</template>
</el-table-column>
@@ -71,7 +71,7 @@
<el-descriptions :column="1" border>
<el-descriptions-item label="公司类型">
<el-tag :type="currentRow.orgType === 'sponsor' ? 'success' : 'primary'">
{{ currentRow.orgType === 'sponsor' ? '赞助方' : '执行方' }}
{{ currentRow.orgType === 'sponsor' ? '支持方' : '执行方' }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="公司名称">{{ currentRow.orgName }}</el-descriptions-item>
+73 -47
View File
@@ -3,7 +3,7 @@
<div class="breadcrumb">首页 / 项目管理</div>
<el-form inline :model="q" class="filter-form">
<el-form-item label="赞助方负责人:"><el-input v-model="q.sponsorAdminUserName" placeholder="输入账号/昵称" clearable /></el-form-item>
<el-form-item label="支持单位:"><el-input v-model="q.sponsorOrgName" placeholder="输入支持单位名称" clearable /></el-form-item>
<el-form-item label="服务机构:"><el-input v-model="q.execOrgName" placeholder="输入服务机构" clearable /></el-form-item>
<el-form-item label="项目编号:"><el-input v-model="q.projectNo" placeholder="输入项目编号" clearable /></el-form-item>
<el-form-item label="项目名称:"><el-input v-model="q.projectName" placeholder="输入项目名称" clearable /></el-form-item>
@@ -64,7 +64,8 @@
<span v-else style="color:#c0c4cc">-</span>
</template>
</el-table-column>
<el-table-column prop="sponsorAdminUserName" label="赞助方负责人" width="160" show-overflow-tooltip />
<el-table-column prop="sponsorOrgName" label="支持单位" width="160" show-overflow-tooltip />
<el-table-column prop="execOrgNames" label="服务机构" min-width="180" show-overflow-tooltip />
<el-table-column prop="projectForm" label="项目形式" width="100" align="center" />
<el-table-column prop="isFinished" label="是否结题" width="100" align="center">
<template #default="{ row }">
@@ -89,6 +90,7 @@
<el-dropdown-item v-if="row.isFinished !== '1' && row.isFinished !== 1" command="close">结题</el-dropdown-item>
<el-dropdown-item command="assign">项目分配</el-dropdown-item>
<el-dropdown-item command="rate">执行单位评分</el-dropdown-item>
<el-dropdown-item command="exportExperts" divided>导出报名专家</el-dropdown-item>
<el-dropdown-item v-if="row.isPublished === '1' || row.publishUrl" command="activate" divided>开通</el-dropdown-item>
<el-dropdown-item v-if="row.isPublished === '1' || row.publishUrl" command="delAnn" divided>删除公告</el-dropdown-item>
</el-dropdown-menu>
@@ -121,8 +123,8 @@
<div style="color:#606266;font-size:13px"> <b>{{ assignBatchProjects.length }}</b> 个项目</div>
</el-form-item>
<el-form-item label="支持方">
<el-select v-model="assignForm.sponsorAdminUserId" placeholder="请选择赞助方负责人" filterable :filter-method="searchSupporters" clearable style="width:100%" @change="onSupporterPick">
<el-option v-for="u in supporterOptions" :key="u.userId" :label="`${u.userName} (${u.nickName || ''})`" :value="u.userId" />
<el-select v-model="assignForm.sponsorAdminUserId" placeholder="请选择支持单位" filterable :filter-method="searchSponsorOrgs" clearable style="width:100%" @change="onSponsorOrgPick">
<el-option v-for="u in sponsorOrgOptions" :key="u.userId" :label="u.orgName" :value="u.userId" />
</el-select>
</el-form-item>
<el-divider>执行方分配</el-divider>
@@ -152,7 +154,7 @@
style="width:100%"
@change="v => onExecUserPick(row, v)">
<el-option v-for="u in (row._options || [])" :key="u.userId"
:label="`${u.userName}${u.nickName ? ' (' + u.nickName + ')' : ''}`" :value="u.userId" />
:label="u.orgName" :value="u.userId" />
</el-select>
</template>
</el-table-column>
@@ -270,7 +272,7 @@
import { ref, reactive, computed, onMounted, watch } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { bizList, bizAdd, bizUpdate, bizDelete } from '@/api/public'
import { listExecutor, listSupporters } from '@/api/system'
import { listExecutorOrgs, listSponsorOrgs } from '@/api/system'
import request from '@/utils/request'
import { ElMessage, ElMessageBox } from 'element-plus'
import { ArrowDown } from '@element-plus/icons-vue'
@@ -278,7 +280,7 @@ import Preview from '@/components/Preview.vue'
const router = useRouter()
const route = useRoute()
const q = ref({ sponsorAdminUserName: '', execOrgName: '', projectNo: '', projectName: '', projectForm: '', startTime: '', endTime: '', isFinished: '', isSettled: '', ratingScore: '' })
const q = ref({ sponsorOrgName: '', execOrgName: '', projectNo: '', projectName: '', projectForm: '', startTime: '', endTime: '', isFinished: '', isSettled: '', ratingScore: '' })
const rows = ref([])
const loading = ref(false)
const page = reactive({ pageNum: 1, pageSize: 10, total: 0 })
@@ -303,6 +305,7 @@ function onAction(cmd, row) {
else if (cmd === 'close') openClose(row)
else if (cmd === 'assign') doAssign(row)
else if (cmd === 'rate') openSingleScore(row)
else if (cmd === 'exportExperts') exportExperts(row)
else if (cmd === 'activate') openActivate(row)
else if (cmd === 'delAnn') openDeleteAnnouncement(row)
}
@@ -314,7 +317,7 @@ function doAssign(row) {
assignOpen.value = true
onAssignProjectChange(row.projectId)
// 预加载 sponsor 候选
setTimeout(() => loadSupporters(''), 100)
setTimeout(() => loadSponsorOrgs(''), 100)
}
function doEdit(row) { router.push(`/manager/projects/edit/${row.projectId}`) }
@@ -330,12 +333,38 @@ async function doDelete(row) {
}
}
function reset() { q.value = { sponsorAdminUserName:'', execOrgName:'', projectNo:'', projectName:'', projectForm:'', startTime:'', endTime:'', isFinished:'', isSettled:'', ratingScore:'' }; page.pageNum = 1; load() }
function reset() { q.value = { sponsorOrgName:'', execOrgName:'', projectNo:'', projectName:'', projectForm:'', startTime:'', endTime:'', isFinished:'', isSettled:'', ratingScore:'' }; page.pageNum = 1; load() }
// 导出
function exportProjects() { ElMessage.info('导出项目功能开发中') }
function exportEval() { ElMessage.info('项目评价导出功能开发中') }
function exportExperts() { ElMessage.info('已报名专家信息导出功能开发中') }
// 导出某项目的报名专家 (biz_execution_intent)
// 字段: 专家姓名 科室 医院 职称 报名时间 手机号
async function exportExperts(row) {
if (!row || !row.projectNo) { ElMessage.warning('缺少项目编号'); return }
try {
// 后端 BizExecutionIntent 参数没 @RequestBody, 必须走 URL query string
const res = await request({
url: '/business/executionIntent/export',
method: 'post',
params: { projectNo: row.projectNo },
responseType: 'blob'
})
const blob = new Blob([res.data], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' })
const url = window.URL.createObjectURL(blob)
const a = document.createElement('a')
a.href = url
a.download = `报名专家_${row.projectNo}.xlsx`
document.body.appendChild(a)
a.click()
document.body.removeChild(a)
window.URL.revokeObjectURL(url)
ElMessage.success('导出成功')
} catch (e) {
const msg = e?.msg || e?.message || '导出失败'
ElMessage.error(msg)
}
}
// ========== 单行操作按钮 handlers(弹 5 个独立 dialog ==========
function openClose(row) {
@@ -481,7 +510,7 @@ function openAssign() {
assignOpen.value = true
setTimeout(() => {
assignForm.execRows.forEach(r => searchExecutors('', r))
loadSupporters('')
loadSponsorOrgs('')
}, 100)
}
function openBatch(kind) {
@@ -573,7 +602,7 @@ const assignForm = reactive({
execRows: [], // 动态加
deadlineDays: 30
})
const supporterOptions = ref([])
const sponsorOrgOptions = ref([])
let _supporterTimer = null
// 已分配场次合计 (实时)
@@ -593,12 +622,12 @@ const singleAmountOver = computed(() =>
)
function makeEmptyExecRow() {
return { _loading: false, _timer: null, _options: [], execUserId: null, execUserName: '', execNickName: '', execOrg: '', sessions: 0, amount: 0, remark: '' }
return { _loading: false, _timer: null, _options: [], execUserId: null, sessions: 0, amount: 0, remark: '' }
}
function resetAssignForm() {
Object.assign(assignForm, { projectId:'', sponsorAdminUserId:null, sponsorAdminUserName:'', totalSessions:0, totalAmount:0, execRows:[makeEmptyExecRow()], deadlineDays:30 })
supporterOptions.value = []
sponsorOrgOptions.value = []
assignBatchMode.value = false
assignBatchProjects.value = []
}
@@ -621,36 +650,37 @@ function onAssignProjectChange(v) {
// 切换项目时重新拉已分配记录 (回显)
loadAssigns(v)
// 重新拉支持方候选
loadSupporters('')
loadSponsorOrgs('')
}
// 加载支持方 (sponsor 角色)
async function loadSupporters(query) {
// 加载支持方 (sponsor 角色) - 按公司名查, JOIN biz_org + sys_user
async function loadSponsorOrgs(query) {
if (_supporterTimer) clearTimeout(_supporterTimer)
_supporterTimer = setTimeout(async () => {
try {
const params = { pageNum: 1, pageSize: 50 }
if (query) params.userName = query
const r = await listSupporters(params)
supporterOptions.value = r.data || []
// 已选项不在结果里时单独拉取并加首位
if (assignForm.sponsorAdminUserId && !supporterOptions.value.find(u => u.userId === assignForm.sponsorAdminUserId)) {
const r2 = await listSupporters({ userId: assignForm.sponsorAdminUserId })
// 主搜索: 按 org_name 模糊匹配
const params = {}
if (query) params.orgName = query
const r = await listSponsorOrgs(params)
sponsorOrgOptions.value = r.data || []
// 已选项不在结果里时按 userId 单独拉取并加首位
if (assignForm.sponsorAdminUserId && !sponsorOrgOptions.value.find(u => u.userId === assignForm.sponsorAdminUserId)) {
const r2 = await listSponsorOrgs({ userId: assignForm.sponsorAdminUserId })
const sel = (r2.data || []).find(u => u.userId === assignForm.sponsorAdminUserId)
if (sel) supporterOptions.value = [sel, ...supporterOptions.value]
if (sel) sponsorOrgOptions.value = [sel, ...sponsorOrgOptions.value]
}
} catch (e) {
supporterOptions.value = []
sponsorOrgOptions.value = []
}
}, 200)
}
function searchSupporters(q) { loadSupporters(q) }
function searchSponsorOrgs(q) { loadSponsorOrgs(q) }
// 选中支持方后回填名称
function onSupporterPick(userId) {
const u = supporterOptions.value.find(x => x.userId === userId)
if (u) assignForm.sponsorAdminUserName = u.nickName || u.userName
// 选中支持方后回填 user_name (缓存到 biz_project.sponsor_admin_user_name)
function onSponsorOrgPick(userId) {
const u = sponsorOrgOptions.value.find(x => x.userId === userId)
if (u) assignForm.sponsorAdminUserName = u.userName
}
// 拉取项目已分配的执行方
@@ -663,9 +693,6 @@ async function loadAssigns(projectId) {
assignForm.execRows = list.map(a => ({
...makeEmptyExecRow(),
execUserId: a.execUserId,
execUserName: a.execUserName,
execNickName: a.execNickName,
execOrg: a.execOrg,
sessions: a.sessions || 0,
amount: Number(a.amount || 0),
remark: a.remark || ''
@@ -682,19 +709,22 @@ async function loadAssigns(projectId) {
}
}
// 加载执行方 (row 级 debounce, 每个 row 独立 timer)
// 加载执行方 (按执行单位名 org_name 模糊匹配)
// 关键: 数据源是 biz_org (org_type='executor') JOIN sys_user (MAIN 账号 only)
// label=orgName (执行单位名称), value=MAIN user_id (直接写 biz_project_assign.exec_user_id)
// 走 /business/org/executorOptions (不在走 sys_user.role_type='executor' 查询, 避免子账号混入)
async function searchExecutors(query, row) {
if (row._timer) clearTimeout(row._timer)
row._loading = true
row._timer = setTimeout(async () => {
try {
const params = { pageNum: 1, pageSize: 20 }
if (query) params.userName = query
const r = await listExecutor(params)
const params = {}
if (query) params.orgName = query
const r = await listExecutorOrgs(params)
row._options = r.data || []
// 选中的项如果不在结果里, 加到首位
// 选中的项如果不在结果里, 按 userId 单独拉取并加到首位 (保证已选项在 el-option 中能找到 label)
if (row.execUserId && !row._options.find(u => u.userId === row.execUserId)) {
const r2 = await listExecutor({ userId: row.execUserId })
const r2 = await listExecutorOrgs({ userId: row.execUserId })
const sel = (r2.data || []).find(u => u.userId === row.execUserId)
if (sel) row._options = [sel, ...row._options]
}
@@ -706,13 +736,12 @@ async function searchExecutors(query, row) {
}, 300)
}
// 选中执行方后回填
// 选中执行方后只保留 userId (后端 service 层会反查 biz_org 写 execution_unit_id;
// 名称/nickName/deptName 不再缓存, 由前端从 _options 里实时取)
function onExecUserPick(row, userId) {
const u = (row._options || []).find(x => x.userId === userId)
if (u) {
row.execUserName = u.userName
row.execNickName = u.nickName || ''
row.execOrg = u.dept?.deptName || ''
// 仅清掉旧的非持久化字段 (兼容旧 _options 残留), 业务字段不写
}
}
@@ -751,9 +780,6 @@ async function submitAssign() {
const assignBody = valid.map(r => ({
execUserId: r.execUserId,
execUserName: r.execUserName,
execNickName: r.execNickName,
execOrg: r.execOrg,
sessions: r.sessions,
amount: r.amount,
remark: r.remark
+49 -47
View File
@@ -20,6 +20,24 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="项目负责人">
<el-select v-model="form.leadUserId" placeholder="请选择合规管理员" filterable clearable :filter-method="searchManagers" style="width:100%">
<el-option v-for="u in managerOptions" :key="u.userId"
:label="`${u.userName}${u.nickName ? ' (' + u.nickName + ')' : ''}`" :value="u.userId" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否招标项目">
<el-select v-model="form.isBidProject" placeholder="请选择" style="width:100%" clearable>
<el-option label="是" value="Y" />
<el-option label="否" value="N" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="项目形式" prop="projectForm">
@@ -61,22 +79,6 @@
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="提交截止(天)">
<el-input-number v-model="form.submitDeadlineDays" :min="0" controls-position="right" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="支持单位">
<el-select v-model="form.sponsorAdminUserId" placeholder="请选择赞助方负责人" filterable clearable style="width:100%" @change="onSupporterPick">
<el-option v-for="u in supporterOptions" :key="u.userId"
:label="`${u.userName}${u.nickName ? ' (' + u.nickName + ')' : ''}`"
:value="u.userId" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- ========== 第二区块角色劳务设置 ========== -->
<div class="new-card-title">角色劳务设置</div>
@@ -134,7 +136,7 @@
import { ref, reactive, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { bizAdd, bizUpdate, bizGet } from '@/api/public'
import { listExecutor, listSupporters } from '@/api/system'
import { listExecutor, listManagers } from '@/api/system'
import { ElMessage, ElMessageBox } from 'element-plus'
import request from '@/utils/request'
import OssFileUploader from '@/components/OssFileUploader.vue'
@@ -150,18 +152,18 @@ const fileInputRef = ref(null)
function defaultRoleRow() { return { role: '', customName: '', amount: 0 } }
function defaultNotice(key, label) { return { key, label, url: '', name: '' } }
// 支持方候选 (sponsor 角色)
const supporterOptions = ref([])
// 项目负责人候选 (合规管理员, sys_user.role_type='manager')
const managerOptions = ref([])
let _managerTimer = null
const form = reactive({
projectName: '', projectNo: '', projectForm: '',
// 项目负责人 (sys_user.role_type='manager' 合规管理员, 名称由后端 JOIN 查, 不缓存)
leadUserId: null,
// 是否招标项目 Y/N (默认 N)
isBidProject: 'N',
totalSessions: 0, totalAmount: 0, manageFee: 0,
startTime: '', endTime: '',
// 赞助方负责人 (sys_user.role_type='sponsor', 原 org_id/org_name 字段已重命名)
sponsorAdminUserId: null,
sponsorAdminUserName: '',
// 提交截止(天)
submitDeadlineDays: 30,
roleRows: [
{ role: '主席', customName: '', amount: 0 },
{ role: '主持', customName: '', amount: 0 },
@@ -222,9 +224,8 @@ async function loadProject() {
form.manageFee = p.manageFee || 0
form.startTime = p.startTime || ''
form.endTime = p.endTime || ''
form.sponsorAdminUserId = p.sponsorAdminUserId || null
form.sponsorAdminUserName = p.sponsorAdminUserName || ''
form.submitDeadlineDays = p.submitDeadlineDays || 30
form.leadUserId = p.leadUserId || null
form.isBidProject = p.isBidProject || 'N'
// 公告文件反显: 优先 publicityFiles JSON 数组, 否则兼容旧字段
const files = []
if (Array.isArray(p.publicityFiles)) files.push(...p.publicityFiles)
@@ -258,27 +259,29 @@ async function loadProject() {
}
}
async function loadSupporters(query = '') {
try {
const params = { roleType: 'sponsor', pageNum: 1, pageSize: 50 }
if (query) params.userName = query
const r = await listSupporters(params)
supporterOptions.value = (r.data && r.data.rows) || r.rows || []
} catch (e) { supporterOptions.value = [] }
// 加载项目负责人 (合规管理员, sys_user.role_type='manager')
async function loadManagers(query) {
if (_managerTimer) clearTimeout(_managerTimer)
_managerTimer = setTimeout(async () => {
try {
const params = { pageNum: 1, pageSize: 50 }
if (query) params.userName = query
const r = await listManagers(params)
managerOptions.value = (r.data && r.data.rows) || r.rows || []
// 已选项不在结果里时按 userId 单独拉取并加首位, 避免 el-select 选中后 label 空白
if (form.leadUserId && !managerOptions.value.find(u => u.userId === form.leadUserId)) {
const r2 = await listManagers({ userId: form.leadUserId })
const sel = (r2.data && r2.data.rows) || r2.rows || []
if (sel[0]) managerOptions.value = [sel[0], ...managerOptions.value]
}
} catch (e) { managerOptions.value = [] }
}, 200)
}
function onSupporterPick(userId) {
const u = supporterOptions.value.find(x => x.userId === userId)
if (u) form.sponsorAdminUserName = u.userName || ''
}
function searchManagers(q) { loadManagers(q) }
onMounted(() => {
loadProject()
loadSupporters('')
loadManagers('')
})
function goBack() {
// 带 _t 强制 Projects.vue watch 触发 reload, 即便路由一样也重载
@@ -301,9 +304,8 @@ async function submit(mode = 'save') {
manageFee: form.manageFee,
startTime: form.startTime,
endTime: form.endTime,
sponsorAdminUserId: form.sponsorAdminUserId,
sponsorAdminUserName: form.sponsorAdminUserName,
submitDeadlineDays: form.submitDeadlineDays
leadUserId: form.leadUserId,
isBidProject: form.isBidProject
}
// 公告文件以 publicityFiles JSON 数组存储 (替代旧 invitationUrl/supportLetterUrl/noticeUrl/scheduleUrl)
payload.publicityFiles = JSON.stringify(uploaded.map(n => ({
+1 -1
View File
@@ -56,7 +56,7 @@
<el-dialog v-model="detailOpen" title="支持单位详情" width="640px" v-if="currentRow">
<el-descriptions :column="1" border>
<el-descriptions-item label="公司类型">
<el-tag type="success">赞助</el-tag>
<el-tag type="success">支持</el-tag>
</el-descriptions-item>
<el-descriptions-item label="公司名称">{{ currentRow.orgName }}</el-descriptions-item>
<el-descriptions-item label="公司地址">{{ currentRow.address }}</el-descriptions-item>
+5 -2
View File
@@ -137,7 +137,10 @@ function reset() {
async function onToggleStatus(row) {
const disabled = isDisabled(row)
const newStatus = disabled ? '正常' : '禁用'
// sys_user.status 是 CHAR(1), 只能写 '0'/'1' (禁用='1', 启用='0')
// 必须带 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只更新 biz_person (而 biz_person.status 已删除)
const newStatus = disabled ? '0' : '1'
const label = disabled ? '启用' : '禁用'
try {
await ElMessageBox.confirm(
@@ -147,7 +150,7 @@ async function onToggleStatus(row) {
)
} catch { return }
try {
await bizUpdate('person', { personId: row.personId, status: newStatus })
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success('已' + label)
load()
} catch (e) { ElMessage.error(e?.msg || '操作失败') }
@@ -30,7 +30,7 @@
<el-input v-model="form.position" placeholder="职务" maxlength="50" />
</el-form-item>
<el-form-item label="角色">
<span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(赞助方人员固定)</span></span>
<span style="color:#303133">监察员 <span style="color:#909399;font-size:12px">(支持方人员固定)</span></span>
</el-form-item>
</el-form>
</el-card>
+8 -15
View File
@@ -26,8 +26,6 @@
</router-link>
</div>
<p class="hint-text">*点击数字跳转到相应的列表页</p>
<!-- 消息通知 -->
<section class="section">
<h2 class="section-title">消息通知<a class="more" href="javascript:void(0)">更多 </a></h2>
@@ -102,37 +100,32 @@ onMounted(() => { loadStats(); loadNotices() })
.manager-workbench { padding: 16px; }
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 12px; }
/* 5 个 KPI 卡 (跟 executor/Overview 一致) */
/* 5 个 KPI 卡 (深色底白字) */
.stats-grid { display: grid; grid-template-columns: repeat(5, 1fr); gap: 16px; margin-bottom: 12px; }
.stat-card {
background: #fff;
border: 1px solid #f0f0f0;
background: #1e3a8a;
border: 1px solid #1e3a8a;
border-radius: 8px;
padding: 24px;
cursor: pointer;
text-decoration: none;
color: inherit;
color: #fff;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
transition: opacity .15s, border-color .15s;
transition: opacity .15s, border-color .15s, transform .15s;
min-height: 120px;
}
.stat-card:hover { border-color: var(--brand-primary); opacity: .9; }
.stat-label { font-size: 14px; color: #8c8c8c; margin-bottom: 16px; }
.stat-card:hover { opacity: .9; transform: translateY(-2px); }
.stat-label { font-size: 14px; color: rgba(255, 255, 255, 0.85); margin-bottom: 16px; }
.stat-value {
font-size: 32px;
font-weight: 600;
line-height: 1.2;
background: linear-gradient(135deg, var(--brand-primary) 0%, var(--brand-primary-deep) 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
color: #fff;
}
.hint-text { font-size: 12px; color: #ff4d4f; margin: 12px 0 20px; text-align: center; }
/* 消息通知 */
.section {
background: #fff;
+9 -11
View File
@@ -111,29 +111,27 @@ onMounted(() => {
.stats-grid-2 { grid-template-columns: repeat(2, 1fr); }
.stat-card {
background: #fff;
border: 1px solid #f0f0f0;
background: var(--brand-primary);
border: 1px solid var(--brand-primary);
border-radius: 8px;
padding: 24px;
cursor: pointer;
text-decoration: none;
color: inherit;
color: #fff;
display: block;
transition: border-color 0.2s, box-shadow 0.2s;
transition: opacity .15s, transform .15s, box-shadow .2s;
box-shadow: 0 2px 8px rgba(30, 58, 138, 0.15);
}
.stat-card:hover { border-color: var(--brand-primary); box-shadow: 0 2px 8px rgba(30,58,138,0.15); }
.stat-label { font-size: 14px; color: #8c8c8c; margin-bottom: 16px; }
.stat-card:hover { opacity: .92; transform: translateY(-2px); box-shadow: 0 4px 12px rgba(30, 58, 138, 0.25); }
.stat-label { font-size: 14px; color: rgba(255, 255, 255, 0.85); margin-bottom: 16px; }
.stat-value {
font-size: 32px;
font-weight: 700;
line-height: 1;
margin-bottom: 8px;
background: linear-gradient(135deg, var(--brand-primary) 0%, var(--brand-primary-deep) 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
background-clip: text;
color: #fff;
}
.stat-desc { font-size: 12px; color: #bfbfbf; }
.stat-desc { font-size: 12px; color: rgba(255, 255, 255, 0.7); }
.section {
background: #fff;
+51 -16
View File
@@ -4,7 +4,7 @@
表单布局: el-card shadow="never" form-card + el-row :gutter="12" el-col :span="12" 两列
编辑/新建复用: 通过 route.params.id 区分
-->
<div class="page-card">
<div class="page-card new-person">
<!-- 面包屑 -->
<div class="breadcrumb">
<a @click="goBack">人员管理</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}
@@ -15,13 +15,13 @@
<el-form :model="form" :rules="rules" ref="formRef" label-width="120px">
<el-row v-if="!isEdit" :gutter="12">
<el-col :span="12">
<el-form-item label="账号" prop="loginUsername">
<el-input v-model="form.loginUsername" placeholder="请输入子账号登录账号" maxlength="30" />
<el-form-item label="用户名" prop="userName">
<el-input v-model="form.userName" placeholder="请输入子账号登录用户名" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="初始密码" prop="loginPassword">
<el-input v-model="form.loginPassword" placeholder="请输入初始密码 (≥6 位)" type="password" show-password maxlength="30" />
<el-form-item label="初始密码" prop="password">
<el-input v-model="form.password" placeholder="请输入初始密码 (≥6 位)" type="password" show-password maxlength="30" />
</el-form-item>
</el-col>
</el-row>
@@ -42,7 +42,13 @@
<el-row :gutter="12">
<el-col :span="12">
<el-form-item label="所属公司" prop="orgName">
<el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
<el-input v-model="form.orgName" :readonly="!!myOrg" placeholder="请输入所属公司" maxlength="200">
<template #append v-if="myOrg">
<el-tooltip content="主账号公司, 注册时已自动关联" placement="top">
<el-icon><Lock /></el-icon>
</el-tooltip>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -94,15 +100,21 @@ import { reactive, ref, onMounted } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { ElMessage, ElMessageBox } from 'element-plus'
import { bizAdd, bizUpdate, bizGet } from '@/api/public'
import request from '@/utils/request'
import { useUserStore } from '@/store/user'
import { Lock } from '@element-plus/icons-vue'
const router = useRouter()
const route = useRoute()
const userStore = useUserStore()
const formRef = ref(null)
const saving = ref(false)
const loadingDetail = ref(false)
const isEdit = !!route.params.id
const personId = route.params.id || null
// 主账号关联的公司 (注册时建, 按 user_id 反查)
const myOrg = ref(null)
const form = reactive({
personId: null,
@@ -114,9 +126,9 @@ const form = reactive({
role: 'supervisor',
unitType: 'sponsor',
status: '0',
// 子账号登录信息 (后端会创建 sys_user SUB,parent_user_id=主账号)
loginUsername: '',
loginPassword: '',
// 子账号登录信息 (后端会创建 sys_user SUB,parent_user_id=主账号, 字段名跟后端 @JsonProperty 对齐)
userName: '',
password: '',
})
// 7 字段全必填 + 手机号正则
@@ -131,11 +143,11 @@ const rules = {
position: [{ required: true, message: '请输入职务', trigger: 'blur' }],
role: [{ required: true, message: '请选择角色', trigger: 'change' }],
status: [{ required: true, message: '请选择状态', trigger: 'change' }],
loginUsername: [
{ required: true, message: '请输入子账号登录账号', trigger: 'blur' },
{ pattern: /^[a-zA-Z][a-zA-Z0-9_]{2,29}$/, message: '账号以字母开头,3-30 位字母数字下划线', trigger: 'blur' },
userName: [
{ required: true, message: '请输入子账号登录用户名', trigger: 'blur' },
{ pattern: /^[a-zA-Z][a-zA-Z0-9_]{2,29}$/, message: '用户名以字母开头,3-30 位字母数字下划线', trigger: 'blur' },
],
loginPassword: [
password: [
{ required: true, message: '请输入初始密码', trigger: 'blur' },
{ min: 6, max: 30, message: '密码长度 6-30 位', trigger: 'blur' },
],
@@ -145,6 +157,27 @@ function goBack() {
router.push({ path: '/sponsor/people', query: { _t: Date.now() } })
}
// 加载主账号关联的公司 (注册时建, 按 user_id + orgType 反查, 一用户一类型一公司)
async function loadMyOrg() {
const uid = userStore.user?.userId
if (!uid) return
try {
const res = await request({
url: '/business/org/list',
method: 'get',
params: { userId: uid, orgType: 'sponsor', pageNum: 1, pageSize: 1 }
})
const rows = (res?.data?.rows) || res?.rows || []
if (rows.length) {
myOrg.value = rows[0]
// 默认带出, 提交时也直接发这个 orgId (不再依赖 orgName 字符串匹配)
form.orgName = rows[0].orgName || ''
}
} catch (e) {
console.warn('loadMyOrg:', e?.msg)
}
}
async function loadDetail() {
if (!personId) return
loadingDetail.value = true
@@ -201,8 +234,8 @@ async function onSave() {
let payload = { ...form }
let res
if (isEdit) {
delete payload.loginUsername // 编辑时不改登录账号
delete payload.loginPassword // 编辑时不改密码 (password 走独立接口)
delete payload.userName // 编辑时不改登录账号
delete payload.password // 编辑时不改密码 (password 走独立接口)
res = await bizUpdate('person', payload)
} else {
payload.unitType = 'sponsor'
@@ -213,7 +246,7 @@ async function onSave() {
// 新建成功: 提示主账号刚创建的子账号信息
const u = res.data
ElMessageBox.alert(
`子账号已创建\n账号: ${u.userName || form.loginUsername}\n初始密码: ${u.password || form.loginPassword}\n请记录后告知使用人 (密码仅本次显示)`,
`子账号已创建\n账号: ${u.userName || form.userName}\n初始密码: ${u.password || form.password}\n请记录后告知使用人 (密码仅本次显示)`,
'创建成功',
{ type: 'success', confirmButtonText: '我已记录, 返回' }
).then(() => goBack())
@@ -238,11 +271,13 @@ async function onSave() {
onMounted(() => {
if (isEdit) loadDetail()
else loadMyOrg() // 新建时默认带出主账号公司
})
</script>
<style scoped>
/* 1:1 抄 doctor/SubmissionNew.vue */
.new-person { max-width: 1200px; }
.page-card { background: #fff; padding: 16px 20px; border-radius: 6px; border: 1px solid #f0f0f0; }
.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 16px; }
.breadcrumb a { color: var(--brand-primary); cursor: pointer; text-decoration: none; }
+2 -1
View File
@@ -45,7 +45,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="角色">
<el-input :model-value="display.role" readonly />
<el-tag v-if="detail.role === 'supervisor'" type="primary" disable-transitions>监察员</el-tag>
<span v-else style="color:#909399">{{ display.role }}</span>
</el-form-item>
</el-col>
</el-row>
+5 -5
View File
@@ -66,7 +66,7 @@
<el-table-column label="已支付会务费" width="120" align="right"><template #default="{ row }">¥{{ formatMoney(row.paidMeetingAmount) }}</template></el-table-column>
<el-table-column prop="complianceScore" label="执行单位得分(合规)" width="150" align="center" />
<el-table-column prop="ratingScore" label="执行单位评价(支持方)" width="160" align="center" />
<el-table-column prop="orgName" label="赞助公司" min-width="140" show-overflow-tooltip />
<el-table-column prop="orgName" label="支持公司" min-width="140" show-overflow-tooltip />
<el-table-column prop="projectForm" label="项目形式" width="100" align="center" />
<el-table-column label="是否结题" width="90" align="center">
<template #default="{ row }">
@@ -172,8 +172,8 @@
<el-descriptions-item label="项目编号">{{ detail.projectNo }}</el-descriptions-item>
<el-descriptions-item label="项目形式">{{ detail.projectForm }}</el-descriptions-item>
<el-descriptions-item label="项目名称" :span="2">{{ detail.projectName }}</el-descriptions-item>
<el-descriptions-item label="赞助方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="公司类型" :span="2">赞助</el-descriptions-item>
<el-descriptions-item label="支持方负责人" :span="2">{{ detail.sponsorAdminUserName || '-' }}</el-descriptions-item>
<el-descriptions-item label="公司类型" :span="2">支持</el-descriptions-item>
<el-descriptions-item label="总场次/总期数">{{ detail.totalSessions || 0 }}</el-descriptions-item>
<el-descriptions-item label="已执行/未执行">{{ detail.doneSessions || 0 }} / {{ detail.todoSessions || 0 }}</el-descriptions-item>
<el-descriptions-item label="总金额">¥{{ formatMoney(detail.totalAmount) }}</el-descriptions-item>
@@ -276,8 +276,8 @@ function onCreateMeeting(row) {
}
function onSupportUnit(row) {
if (!row.sponsorAdminUserId) { ElMessage.warning('该项目未关联赞助方负责人'); return }
ElMessage.info(`查看赞助方负责人: ${row.sponsorAdminUserName || row.sponsorAdminUserId}`)
if (!row.sponsorAdminUserId) { ElMessage.warning('该项目未关联支持方负责人'); return }
ElMessage.info(`查看支持方负责人: ${row.sponsorAdminUserName || row.sponsorAdminUserId}`)
}
async function onDeleteNotice(row) {
try { await ElMessageBox.confirm(`确定删除「${row.projectName}」的所有公告吗?删除后无法恢复`, '删除公告', { type: 'warning' }) } catch { return }
+9 -2
View File
@@ -49,7 +49,12 @@
<el-table-column prop="orgName" label="所属公司" min-width="180" show-overflow-tooltip />
<el-table-column prop="department" label="部门" width="120" />
<el-table-column prop="position" label="职务" width="120" />
<el-table-column prop="role" label="角色" width="100" />
<el-table-column label="角色" width="100">
<template #default="{ row }">
<el-tag v-if="row.role === 'supervisor'" type="primary" disable-transitions>监察员</el-tag>
<span v-else style="color:#909399"></span>
</template>
</el-table-column>
<el-table-column label="账号类型" width="90">
<template #default="{ row }">
<el-tag v-if="row.accountType" :type="row.accountType === 'MAIN' ? 'success' : 'warning'" disable-transitions>
@@ -192,7 +197,9 @@ async function onToggleStatus(row) {
await ElMessageBox.confirm(`确定要${label}${row.name}」吗?`, '确认', { type: 'warning' })
} catch { return }
try {
await bizUpdate('person', { personId: row.personId, status: newStatus })
// 必须带上 userId: BizPersonServiceImpl.updateByPrimaryKey 仅在 userId != null 时
// 才同步 status 到 sys_user, 否则只是白更新 biz_person (而 biz_person.status 已删除)
await bizUpdate('person', { personId: row.personId, userId: row.userId, status: newStatus })
ElMessage.success('已' + label)
load()
} catch (e) {