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:
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user