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

ry-vue3/src/views/admin/ExecutorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟦 后台 服务机构下人员 新建/编辑 (admin/executor-people/new, admin/executor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'executor'
+    角色固定为「会议执行」(执行方子类型, 暂唯一)
+  -->
+  <div class="page-card admin-executor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">服务机构下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </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" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <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>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+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' }]
+}
+
+function goBack() {
+  router.push('/admin/executor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor', role: 'meetingExecutor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.admin-executor-person-new { max-width: 1000px; }
+.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; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/admin/SponsorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟦 后台 支持单位下人员 新建/编辑 (admin/sponsor-people/new, admin/sponsor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'sponsor'
+  -->
+  <div class="page-card admin-sponsor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">支持单位下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </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" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <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>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+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' }]
+}
+
+function goBack() {
+  router.push('/admin/sponsor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'sponsor', role: 'supervisor' }
+    // 从 org 页面跳来时 route.query 带 orgId, 直接作为 FK
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.admin-sponsor-person-new { max-width: 1000px; }
+.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; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/auth/Login.vue

@@ -154,12 +154,15 @@ async function onSubmit() {
   loading.value = true
   try {
     const res = await login({ username: form.username, password: form.password, code: form.code || '', uuid: form.uuid || '' })
-    const role = autoRole(form.username)
+    // username 推断仅作兜底, 真实 role 以 /getInfo 返回的 sys_user.role_type 为准
+    const fallbackRole = autoRole(form.username)
     userStore.setToken(res.token)
-    // /login 接口只返回 token; 调 /getInfo 拿完整 user (含 accountType/parentUserId, 让 isMain/isSub 判断正确)
+    // /login 接口只返回 token; 调 /getInfo 拿完整 user (含 accountType/parentUserId/roleType, 让 isMain/isSub/role 都从后端真实值取)
+    let role = fallbackRole
     try {
       const info = await getInfo()
       const u = info.user || {}
+      role = u.roleType || fallbackRole
       userStore.setUser({
         userId: u.userId,
         userName: u.userName || form.username,
@@ -176,13 +179,13 @@ async function onSubmit() {
         nickName: form.username,
         accountType: 'MAIN',
         parentUserId: null,
-        role
+        role: fallbackRole
       })
     }
     ElMessage.success(`欢迎，${form.username}（${userTypes.find(u => u.value === role)?.name || role}）`)
     router.replace(roleHome[role] || '/leader/home')
   } catch (e) {
-    ElMessage.error(e?.msg || '登录失败')
+    // 错误提示已由 utils/request.js 拦截器统一弹 (ElMessage.error), 这里只刷新验证码
     loadCaptcha()
   } finally {
     loading.value = false

ry-vue3/src/views/executor/NewPerson.vue

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

ry-vue3/src/views/executor/People.vue

@@ -17,7 +17,7 @@
 
     <!-- ========== 批量按钮 (top=203: 新建人员 / 批量导入) ========== -->
     <div class="batch-bar">
-      <el-button type="primary" @click="openAdd">新建人员</el-button>
+      <el-button type="primary" @click="goNew">新建人员</el-button>
       <el-button @click="importOpen = true">批量导入</el-button>
       <span class="filter-tip">*批量导入模板与列表表项一致</span>
     </div>
@@ -31,7 +31,7 @@
       <el-table-column prop="position" label="职务" min-width="100" />
       <el-table-column prop="role" label="角色" width="100">
         <template #default="{ row }">
-          <el-tag size="small" :type="row.role === '管理员' ? 'warning' : 'info'">{{ row.role || '监察员' }}</el-tag>
+          <el-tag size="small" :type="row.role === 'meetingExecutor' ? 'warning' : 'info'">{{ translatePersonRole(row.role) }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态" width="100">
@@ -42,7 +42,7 @@
       <el-table-column label="操作" width="220" fixed="right">
         <template #default="{ row }">
           <el-button size="small" link type="primary" @click="onView(row)">查看</el-button>
-          <el-button size="small" link type="primary" @click="onEdit(row)">编辑</el-button>
+          <el-button size="small" link type="primary" @click="goEdit(row)">编辑</el-button>
           <el-button v-if="(row.status || '正常') === '正常'" size="small" link type="danger" @click="onToggleStatus(row, '禁用')">禁用</el-button>
           <el-button v-else size="small" link type="success" @click="onToggleStatus(row, '恢复')">恢复</el-button>
         </template>
@@ -54,29 +54,8 @@
                      @current-change="loadList" @size-change="loadList" />
     </div>
 
-    <!-- ========== Dialog: 新增/编辑 ========== -->
-    <el-dialog v-model="formOpen" :title="form._id ? '编辑人员' : '新增人员'" width="520px">
-      <el-form :model="form" label-width="100px">
-        <el-form-item label="姓名"><el-input v-model="form.name" /></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.orgName" placeholder="所属公司 (TODO: 改 biz_org 下拉)" />
-        </el-form-item>
-        <el-form-item label="部门"><el-input v-model="form.department" /></el-form-item>
-        <el-form-item label="职务"><el-input v-model="form.position" /></el-form-item>
-        <el-form-item label="角色">
-          <el-select v-model="form.role" style="width:100%" :disabled="userRole === '管理员'">
-            <el-option label="管理员" value="管理员" />
-            <el-option label="监察员" value="监察员" />
-          </el-select>
-          <span class="filter-tip">*新建时，管理员只能新建监察员</span>
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button @click="formOpen = false">取消</el-button>
-        <el-button type="primary" @click="save">保存</el-button>
-      </template>
-    </el-dialog>
+    <!-- 新增/编辑: 跳转独立页面 /executor/people/new 或 /edit/:id, 不再是 dialog -->
+    <!-- (旧的 formOpen dialog 已删) -->
 
     <!-- ========== Dialog: 批量导入 ========== -->
     <el-dialog v-model="importOpen" title="批量导入" width="520px">
@@ -105,7 +84,7 @@
         <el-descriptions-item label="所属公司" :span="2">{{ view.orgName }}</el-descriptions-item>
         <el-descriptions-item label="部门">{{ view.department }}</el-descriptions-item>
         <el-descriptions-item label="职务">{{ view.position }}</el-descriptions-item>
-        <el-descriptions-item label="角色">{{ view.role || '监察员' }}</el-descriptions-item>
+        <el-descriptions-item label="角色">{{ translatePersonRole(view.role) }}</el-descriptions-item>
         <el-descriptions-item label="状态">{{ view.status || '正常' }}</el-descriptions-item>
       </el-descriptions>
       <template #footer><el-button @click="viewOpen = false">关闭</el-button></template>
@@ -115,18 +94,18 @@
 
 <script setup>
 import { ref, reactive, onMounted } from 'vue'
-import { bizList, bizAdd, bizUpdate } from '@/api/public'
+import { useRouter } from 'vue-router'
+import { bizList, bizUpdate } from '@/api/public'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { translatePersonRole } from '@/utils/roleMap'
 
-const userRole = '监察员'  // 简化: 默认监察员
+const router = useRouter()
 
 const list = ref([])
 const loading = ref(false)
 const q = reactive({ name: '', phone: '', orgName: '', department: '', position: '' })
 const page = reactive({ pageNum: 1, pageSize: 10, total: 0 })
 
-const formOpen = ref(false)
-const form = reactive({ _id: '', name: '', phone: '', orgName: '', department: '', position: '', role: '监察员' })
 const importOpen = ref(false)
 const view = ref({})
 const viewOpen = ref(false)
@@ -134,37 +113,21 @@ const viewOpen = ref(false)
 async function loadList() {
   loading.value = true
   try {
-    const r = await bizList('person', { pageNum: page.pageNum, pageSize: page.pageSize, ...q })
-    list.value = r.rows || []
-    page.total = r.total || 0
+    // request.js 拦截器已归一化为 {code, msg, data: {total, rows}}, 实际数据在 r.data
+    const r = await bizList('person', { pageNum: page.pageNum, pageSize: page.pageSize, ...q, unitType: 'executor' })
+    list.value = (r.data && r.data.rows) || r.rows || []
+    page.total = (r.data && r.data.total) || r.total || 0
   } finally { loading.value = false }
 }
 
 function reset() { Object.assign(q, { name:'',phone:'',orgName:'',department:'',position:'' }); page.pageNum = 1; loadList() }
 
-function openAdd() {
-  Object.assign(form, { _id:'', name:'', phone:'', orgName:'', department:'', position:'', role: '监察员' })
-  formOpen.value = true
-}
+// 新建/编辑走独立页面
+function goNew() { router.push('/executor/people/new') }
+function goEdit(row) { router.push(`/executor/people/edit/${row.personId}`) }
 
 function onView(row) { view.value = row; viewOpen.value = true }
 
-function onEdit(row) {
-  Object.assign(form, { _id: row.personId, name:row.name, phone:row.phone, orgName:row.orgName, department:row.department, position:row.position, role: row.role || '监察员' })
-  formOpen.value = true
-}
-
-async function save() {
-  if (!form.name) { ElMessage.error('请填写姓名'); return }
-  try {
-    if (form._id) await bizUpdate('person', { personId: form._id, ...form })
-    else await bizAdd('person', { ...form })
-    ElMessage.success('保存成功')
-    formOpen.value = false
-    loadList()
-  } catch (e) { ElMessage.error(e?.msg || '保存失败') }
-}
-
 async function onToggleStatus(row, action) {
   try {
     await ElMessageBox.confirm(`确定${action}「${row.name}」吗?`, action, { type: 'warning' })

ry-vue3/src/views/manager/ExecutorPersonNew.vue

@@ -0,0 +1,173 @@
+<template>
+  <!--
+    角色: 🟨 合规 服务机构下人员 新建/编辑 (manager/executor-people/new, manager/executor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'executor'
+    角色固定为「会议执行」(执行方子类型, 暂唯一)
+  -->
+  <div class="page-card manager-executor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">服务机构下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </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" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <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>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+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' }]
+}
+
+function goBack() {
+  router.push('/manager/executor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'executor', role: 'meetingExecutor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.manager-executor-person-new { max-width: 1000px; }
+.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; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/manager/ManagerProjectDetail.vue

@@ -281,7 +281,7 @@ async function openAddMonitor() {
   addMonitorOpen.value = true
   if (!monitorCandidates.value.length) {
     try {
-      const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: '监察员', unitType: 'sponsor' })
+      const resp = await bizList('person', { pageNum: 1, pageSize: 100, role: 'supervisor', unitType: 'sponsor' })
       monitorCandidates.value = (resp && resp.rows) || ((resp && resp.data) && (resp && resp.data).rows) || (resp && resp.data) || []
     } catch (e) { monitorCandidates.value = [] }
   }
@@ -393,7 +393,7 @@ onMounted(async () => {
 
 .section-title {
   font-size: 14px; font-weight: 600; color: #262626; margin: 16px 0 12px;
-  padding-left: 8px; border-left: 3px solid var(--brand-primary, #1890ff);
+  padding-left: 8px; border-left: 3px solid var(--brand-primary);
 }
 
 /* 项目信息: 11 字段, 一列竖排 (el-form + 文本, 无分隔线) */
@@ -407,7 +407,7 @@ onMounted(async () => {
   font-family: ui-monospace, "Courier New", monospace;
 }
 .op-link {
-  color: var(--brand-primary, #1890ff); text-decoration: none;
+  color: var(--brand-primary); text-decoration: none;
   font-weight: 600; cursor: pointer; font-size: 15px;
 }
 .op-link:hover { text-decoration: underline; }
@@ -435,5 +435,5 @@ onMounted(async () => {
 .toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; }
 
 /* 评分 */
-.score-num { font-size: 18px; color: var(--brand-primary, #1890ff); font-weight: 700; margin-right: 6px; }
+.score-num { font-size: 18px; color: var(--brand-primary); font-weight: 700; margin-right: 6px; }
 </style>

ry-vue3/src/views/manager/SponsorPersonNew.vue

@@ -0,0 +1,172 @@
+<template>
+  <!--
+    角色: 🟨 合规 支持单位下人员 新建/编辑 (manager/sponsor-people/new, manager/sponsor-people/edit/:id)
+    结构对齐 admin/ExpertNew.vue
+    unitType 硬编码 'sponsor'
+  -->
+  <div class="page-card manager-sponsor-person-new">
+    <div class="breadcrumb">
+      <a @click="goBack">支持单位下人员</a> &gt; {{ isEdit ? '编辑人员' : '新建人员' }}{{ orgName ? ' (' + orgName + ')' : '' }}
+    </div>
+
+    <el-card v-loading="loadingDetail" shadow="never" class="form-card nested">
+      <el-form :model="form" :rules="rules" ref="formRef" label-width="100px">
+        <el-form-item label="用户名" prop="userName">
+          <el-input v-model="form.userName" placeholder="登录用户名" maxlength="50" :disabled="isEdit" />
+        </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" :disabled="!!orgId" />
+        </el-form-item>
+        <el-form-item label="部门">
+          <el-input v-model="form.department" placeholder="部门" maxlength="50" />
+        </el-form-item>
+        <el-form-item label="职务">
+          <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>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <div class="form-actions">
+      <el-button type="primary" :loading="saving" @click="onSave">保存</el-button>
+      <el-button @click="confirmCancel">取消</el-button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { reactive, ref, computed, onMounted } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { bizAdd, bizUpdate, bizGet } from '@/api/public'
+
+const router = useRouter()
+const route = useRoute()
+
+const formRef = ref(null)
+const saving = ref(false)
+const loadingDetail = ref(false)
+const isEdit = !!route.params.id
+const personId = route.params.id || null
+
+const orgName = computed(() => route.query.orgName || '')
+const orgId = computed(() => route.query.orgId ? Number(route.query.orgId) : null)
+
+const form = reactive({
+  personId: null,
+  userName: '',
+  name: '',
+  phone: '',
+  orgName: '',
+  department: '',
+  position: ''
+})
+
+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' }]
+}
+
+function goBack() {
+  router.push('/manager/sponsor-people')
+}
+
+async function loadDetail() {
+  if (!personId) return
+  loadingDetail.value = true
+  try {
+    const res = await bizGet('person', personId)
+    if (res?.code === 200 && res.data) {
+      const d = res.data
+      Object.assign(form, {
+        personId: d.personId,
+        userName: d.userName || '',
+        name: d.name || '',
+        phone: d.phone || '',
+        orgName: d.orgName || '',
+        department: d.department || '',
+        position: d.position || ''
+      })
+    } else {
+      ElMessage.error(res?.msg || '加载失败')
+      goBack()
+    }
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '加载失败')
+    goBack()
+  } finally {
+    loadingDetail.value = false
+  }
+}
+
+function confirmCancel() {
+  const hasContent = form.name || form.phone || form.userName || form.orgName
+  if (!isEdit && !hasContent) { goBack(); return }
+  ElMessageBox.confirm('确定取消?未保存的内容将丢失', '提示', { type: 'warning' })
+    .then(() => goBack())
+    .catch(() => {})
+}
+
+async function onSave() {
+  try { await formRef.value.validate() } catch { return }
+  saving.value = true
+  try {
+    const payload = { ...form, unitType: 'sponsor', role: 'supervisor' }
+    if (!isEdit && orgId.value) payload.orgId = orgId.value
+    if (isEdit) {
+      delete payload.personId
+      await bizUpdate('person', payload)
+      ElMessage.success('修改成功')
+    } else {
+      payload.status = '0'
+      payload.password = '123456'   // @JsonProperty("password") → loginPassword
+      await bizAdd('person', payload)
+      ElMessage.success('新建成功,默认密码 123456')
+    }
+    goBack()
+  } catch (e) {
+    ElMessage.error(e?.msg || e?.message || '保存失败')
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  // 预填 orgName (从 org 页面跳来时)
+  if (!isEdit && orgName.value && !form.orgName) {
+    form.orgName = orgName.value
+  }
+  if (isEdit) loadDetail()
+})
+</script>
+
+<style scoped>
+.manager-sponsor-person-new { max-width: 1000px; }
+.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; }
+.breadcrumb a:hover { color: var(--brand-primary-deep, var(--brand-primary)); }
+
+.form-card.nested { background: transparent; border: none; box-shadow: none; }
+:deep(.form-card .el-card__body) { padding: 24px 28px; }
+
+.form-actions { margin-top: 16px; display: flex; gap: 8px; }
+
+:deep(.el-button--primary) { background: var(--brand-primary); border-color: var(--brand-primary); border-radius: 4px; }
+:deep(.el-button--primary:hover) { background: var(--brand-primary-deep, var(--brand-primary)); border-color: var(--brand-primary-deep, var(--brand-primary)); }
+:deep(.el-button) { border-radius: 4px; }
+:deep(.el-input__wrapper) { border-radius: 4px; }
+</style>

ry-vue3/src/views/sponsor/NewPerson.vue

@@ -42,7 +42,7 @@
         <el-row :gutter="12">
           <el-col :span="12">
             <el-form-item label="所属公司" prop="orgName">
-              <el-input v-model="form.orgName" placeholder="请输入所属公司 (TODO: 改 biz_org 下拉)" maxlength="200" />
+              <el-input v-model="form.orgName" placeholder="请输入所属公司" maxlength="200" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -61,7 +61,7 @@
           <el-col :span="12">
             <el-form-item label="角色" prop="role">
               <el-select v-model="form.role" placeholder="请选择" style="width:100%">
-                <el-option label="监察员" value="监察员" />
+                <el-option label="监察员" value="supervisor" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -111,7 +111,7 @@ const form = reactive({
   orgName: '',
   department: '',
   position: '',
-  role: '监察员',
+  role: 'supervisor',
   unitType: 'sponsor',
   status: '0',
   // 子账号登录信息 (后端会创建 sys_user SUB,parent_user_id=主账号)

ry-vue3/src/views/sponsor/Projects.vue

@@ -246,8 +246,8 @@ async function load() {
 async function loadPersons() {
   try {
     // sponsor 团队下"监察员"角色 + 已绑 sys_user 的子账号
-    const r = await bizList('person', { pageNum: 1, pageSize: 100, unitType: 'sponsor', role: '监察员' })
-    personList.value = (r.rows || []).filter(p => p.userId)
+    const r = await bizList('person', { pageNum: 1, pageSize: 100, unitType: 'sponsor', role: 'supervisor' })
+    personList.value = ((r.data && r.data.rows) || r.rows || []).filter(p => p.userId)
   } catch (e) { personList.value = [] }
 }
 

ry-vue3/src/views/sponsor/SponsorProjects.vue

@@ -288,7 +288,7 @@ const candidateMonitors = ref([])
 async function loadMonitors() {
   // 业务隔离: 仅查 login 主账号创建的人员 (parent_user_id = mainUserId)
   const mainUid = userStore.id
-  const res = await listBizPerson({ parentUserId: mainUid, role: '监察员', pageNum: 1, pageSize: 100 })
+  const res = await listBizPerson({ parentUserId: mainUid, role: 'supervisor', pageNum: 1, pageSize: 100 })
   allMonitors.value = res.rows || []
   candidateMonitors.value = allMonitors.value.slice()
 }