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
+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