feat: 统一角色枚举 (meetingExecutor/supervisor) + 子账号数据隔离 + Login 读取后端 role_type

后端: - SysUser 加 roleType 字段 (entity + mapper selectUserVo + service 接口/实现) - SysUserMapper 新增 selectUserIdsByParent (按 parent_user_id 取子账号列表) - BizPersonController.list 自动注入 MAIN 业务用户可见性: 仅查 user_id IN (子账号列表) - BizPersonMapper 加 params.subUserIds foreach 过滤 - BizPerson/BizPersonServiceImpl 配合 getParams().put 前端: - Login.vue 改用后端 sys_user.roleType 替代 username 前缀 autoRole, 修复 exe01 错入 leader 菜单 - utils/roleMap.js 新增: meetingExecutor->会议执行, supervisor->监察员 - executor/People.vue / sponsor/NewPerson.vue / sponsor/Projects.vue / sponsor/SponsorProjects.vue / manager/ManagerProjectDetail.vue / manager/{Executor,Sponsor}PersonNew.vue / admin/{Executor,Sponsor}PersonNew.vue 全部改为 enum key SQL: - migration_unify_role_type_2026_08_16.sql 清洗 biz_person.role 从中文到 enum key
2026-08-16 13:41:42 +08:00
parent cf5790229a
commit c612d4297a
22 changed files with 1211 additions and 112 deletions
@@ -0,0 +1,174 @@
+<template>
+  <!--
+    角色: 🟨 执行方 新建/编辑人员 (executor/people/new, executor/people/edit/:id)
+    结构 1:1 对齐 proto new-person.html (但用 page-card 整页包裹, 不用 main.content):
+      page-card (整页面板)
+        page-header (标题区: h1 + 副标题)
+          h1.page-title
+          p.page-sub
+        el-form.card
+          7 字段 form-row
+          form-actions (保存/取消)
+  -->
+  <div class="page-card new-person">
+    <!-- 面包屑 -->
+    <div class="breadcrumb">
+      <a href="javascript:void(0)" @click="goHome">首页</a>
+      <span class="sep">/</span>
+      <a href="javascript:void(0)" @click="goBack">人员管理</a>
+      <span class="sep">/</span>
+      <span>{{ isEdit ? '编辑人员' : '新建人员' }}</span>
+    </div>
+
+    <!-- 表单 (1 个 page-card 内, 无大标题) -->
+    <el-form ref="formRef" :model="form" :rules="rules" class="person-form" label-width="100px">
+      <el-form-item label="用户名" prop="userName">
+        <el-input v-model="form.userName" placeholder="请输入登录用户名" maxlength="50" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="form.name" placeholder="请输入姓名" maxlength="20" />
+      </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="orgName">
+        <el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
+      </el-form-item>
+
+      <el-form-item label="部门" prop="department">
+        <el-input v-model="form.department" placeholder="请输入部门" maxlength="50" />
+      </el-form-item>
+
+      <el-form-item label="职务" prop="position">
+        <el-input v-model="form.position" placeholder="请输入职务" maxlength="50" />
+      </el-form-item>
+
+      <el-form-item label="角色" prop="role">
+        <el-select v-model="form.role" placeholder="请选择角色" style="width:100%">
+          <el-option label="会议执行" value="meetingExecutor" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="form.status" placeholder="请选择" style="width:100%">
+          <el-option label="正常" value="1" />
+          <el-option label="禁用" value="0" />
+        </el-select>
+      </el-form-item>
+
+      <!-- 按钮区 (在表单内底部) -->
+      <div class="form-actions">
+        <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+        <el-button @click="goBack">取消</el-button>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+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'
+
+const route = useRoute()
+const router = useRouter()
+
+const isEdit = computed(() => !!route.params.id)
+const personId = computed(() => route.params.id || null)
+
+const formRef = ref()
+const saving = ref(false)
+const form = reactive({
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: '',
+  role: 'meetingExecutor',
+  status: '1',
+  unitType: 'executor'
+})
+
+const rules = {
+  userName:   [{ required: true, message: '请输入用户名',   trigger: 'blur' }],
+  name:       [{ required: true, message: '请输入姓名',     trigger: 'blur' }],
+  phone: [
+    { required: true, message: '请输入手机号', trigger: 'blur' },
+    { pattern: /^1\d{10}$/, message: '手机号格式错误', trigger: 'blur' }
+  ],
+  orgName:    [{ required: true, message: '请输入所属公司', trigger: 'blur' }],
+  department: [{ required: true, message: '请输入部门',     trigger: 'blur' }],
+  position:   [{ required: true, message: '请输入职务',     trigger: 'blur' }],
+  role:       [{ required: true, message: '请选择角色',     trigger: 'change' }],
+  status:     [{ required: true, message: '请选择状态',     trigger: 'change' }]
+}
+
+async function loadDetail() {
+  if (!isEdit.value) return
+  try {
+    const r = await bizGet('person', personId.value)
+    Object.assign(form, r.data || {})
+    form.status = String(form.status)
+  } catch (e) {
+    ElMessage.error('加载人员详情失败')
+    goBack()
+  }
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor' }
+    if (isEdit.value) {
+      await bizUpdate('person', { personId: personId.value, ...payload })
+      ElMessage.success('修改成功')
+    } else {
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+function goBack() { router.push('/executor/people') }
+
+function goHome() {
+  try { if (window.parent && window.parent.goHome) window.parent.goHome() } catch (e) {}
+  router.push('/executor/overview')
+}
+
+onMounted(loadDetail)
+</script>
+
+<style scoped>
+/* 整页面板 (与 People.vue 风格一致) */
+.executor-new-person { padding: 16px; }
+.breadcrumb { font-size: 13px; color: #8c8c8c; margin-bottom: 20px; }
+.breadcrumb a { color: var(--brand-primary); text-decoration: none; cursor: pointer; }
+.breadcrumb a:hover { text-decoration: underline; }
+.breadcrumb .sep { margin: 0 6px; color: #bfbfbf; }
+
+/* 表单 */
+.person-form { max-width: 720px; }
+.person-form :deep(.el-form-item) { margin-bottom: 18px; }
+.person-form :deep(.el-form-item__label) { font-size: 14px; color: #595959; }
+
+/* 按钮区 */
+.form-actions {
+  display: flex;
+  gap: 12px;
+  justify-content: center;
+  margin-top: 32px;
+  padding-top: 20px;
+  border-top: 1px solid #f0f0f0;
+}
+</style>