feat: 合并 admin/manager 重复页 + 公示意向 + 劳务签署
页合并 (admin/manager 共用, route.path 角色感知): - expert: Experts.vue + ExpertNew.vue (list/new/edit/view 一套) - sponsor-orgs: SponsorOrgs.vue - sponsor-people: SponsorPeople.vue + SponsorPersonNew.vue + SponsorPersonDetail.vue - executor-orgs: ExecutorOrgs.vue - executor-people: ExecutorPeople.vue + ExecutorPersonNew.vue + ExecutorPersonDetail.vue - 给 SponsorPeople / ExecutorPeople op 列补上 查看/编辑 按钮 (潜在 bug 修复) - 详情弹窗统一用 el-descriptions 风格 (替代 admin 旧版 ElMessageBox.alert) 后端: - BizSignController + BizSignServiceImpl + PdfService (劳务签署 PDF 流程) - BizPublicityIntentController (公示意向: 支持/执行) - BizPublicitySupportIntent / BizPublicityExecutionIntent ExportVo - BizMeetingAttendee 字段合并 (bank_region 替代 bankProvince/bankCity) - BizExpert 字段合并 (id_card_attachments CSV, bank_region) - Excel 导入模板精简 (开户行 1 列) 前端: - doctor/SignFill + SignContract + SignSuccess (劳务签署 3 页流程) - ImportResultDialog 通用组件 - IdCardUploader 重构 (单 v-model:idCardAttachments, CSV 格式) - AreaCascader 调整 - Login.vue + AdminLayout.vue + PortalShell.vue + Home.vue 适配 DB: 字段合并 (id_card_front/back → id_card_attachments, bank_province/city → bank_region)
This commit is contained in:
@@ -34,8 +34,8 @@
|
||||
<p class="login-subtitle">{{ loginMode === 'password' ? '请输入您的账号信息' : '请输入手机号接收验证码' }}</p>
|
||||
|
||||
<div class="login-tabs">
|
||||
<span class="tab" :class="{ active: loginMode === 'password' }" @click="switchMode('password')">账号密码登录</span>
|
||||
<span class="tab" :class="{ active: loginMode === 'sms' }" @click="switchMode('sms')">手机验证码登录</span>
|
||||
<span class="tab" :class="{ active: loginMode === 'password' }" @click="switchMode('password')">账号密码登录</span>
|
||||
</div>
|
||||
|
||||
<form v-if="loginMode === 'password'" id="loginForm" @submit.prevent="onSubmit">
|
||||
@@ -172,7 +172,7 @@
|
||||
|
||||
<script setup>
|
||||
import { reactive, ref, onMounted, onUnmounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useRouter, useRoute } from 'vue-router'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import request from '@/utils/request'
|
||||
import { login, getInfo, getCaptcha, sendLoginSms, smsLogin } from '@/api/auth'
|
||||
@@ -186,6 +186,7 @@ const { locked: smsSmsLocked, run: runSmsOnce } = useAsyncLock()
|
||||
const { locked: smsLoginLocked, run: runSmsLoginOnce } = useAsyncLock()
|
||||
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
const userStore = useUserStore()
|
||||
|
||||
const form = reactive({ username: '', password: '', code: '', uuid: '', role: 'leader' })
|
||||
@@ -196,7 +197,7 @@ const showRoleModal = ref(false)
|
||||
const registerUserType = ref('')
|
||||
|
||||
// 登录模式: 'password' | 'sms'
|
||||
const loginMode = ref('password')
|
||||
const loginMode = ref('sms')
|
||||
const smsForm = reactive({ phone: '', smsCode: '', uuid: '' })
|
||||
const smsSmsCountdown = ref(0)
|
||||
let smsSmsTimer = null
|
||||
@@ -287,6 +288,11 @@ async function afterLogin(token, displayName, fallbackRole) {
|
||||
ElMessage.success(`欢迎,${displayName}(${userTypes.find(u => u.value === role)?.name || role})`)
|
||||
// 没拿到角色就跳回登录页 (之前 fallback 到 /leader/home 会让子账号误入 leader)
|
||||
if (!role || !roleHome[role]) return router.replace({ name: 'login' })
|
||||
// 带 redirect 回跳 (401/守卫带过来的原页面), 否则跳角色首页
|
||||
const redirect = route.query.redirect
|
||||
if (redirect) {
|
||||
return router.replace(String(redirect))
|
||||
}
|
||||
router.replace(roleHome[role])
|
||||
}
|
||||
|
||||
@@ -875,7 +881,7 @@ onUnmounted(() => {
|
||||
}
|
||||
|
||||
/* 响应式 */
|
||||
@media (max-width: 1024px) {
|
||||
@media (min-width: 769px) and (max-width: 1024px) {
|
||||
.main-content {
|
||||
flex-direction: column;
|
||||
padding: 30px 30px;
|
||||
@@ -984,4 +990,12 @@ onUnmounted(() => {
|
||||
background: #f3f4f6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
/* mobile 端隐藏 banner + login-card 占满 (移到文件末尾, CSS 优先级最高, 覆盖上面 1024px/640px 块) */
|
||||
@media (max-width: 768px) {
|
||||
.login-page .main-content { flex-direction: column !important; padding: 20px !important; gap: 0 !important; }
|
||||
.login-page .banner-section { display: none !important; }
|
||||
.login-page .login-section { width: 100% !important; max-width: 100% !important; padding: 0 !important; flex: 0 0 auto !important; }
|
||||
.login-page .login-card { width: calc(100% - 10px) !important; max-width: none !important; margin: 0 auto !important; }
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user