feat(permission): replace OA roles with post-bound roles and assignee posts

Unify effective roles via post-role bindings, remove dedicated OA role UI, and update OA assignee resolution plus related SQL/docs. Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-04 17:41:04 +08:00
1 parent a3c73d76bb
commit 06db3bc966
@@ -833,6 +833,18 @@ export function fetchUpdatePostBoundUsers(postId: string, userIds: string[]) {
  })
 }

+export function fetchPostBoundRoleIds(postId: string) {
+  return request.get<{ roleIds: string[] }>({ url: `/web/admin/posts/${postId}/roles` })
+}
+
+export function fetchUpdatePostBoundRoles(postId: string, roleIds: string[]) {
+  return request.put({
+    url: `/web/admin/posts/${postId}/roles`,
+    params: { roleIds },
+    showSuccessMessage: true
+  })
+}
+
 // ---------------------------------------------------------------------------
 // 物品单位管理
 // ---------------------------------------------------------------------------
@@ -2,75 +2,6 @@ import request from '@/utils/http'

 const BASE = '/web/admin/oa-approval'

-// ---------------------------------------------------------------------------
-// 工作流角色
-// ---------------------------------------------------------------------------
-
-export function fetchOaRoleList(params?: { keyword?: string; status?: string }) {
-  return request.get<{ list: any[] }>({
-    url: `${BASE}/roles`,
-    params
-  })
-}
-
-export function fetchEnsureOaRolePresets() {
-  return request.post<{ createdCount: number }>({
-    url: `${BASE}/roles/ensure-presets`,
-    showSuccessMessage: true
-  })
-}
-
-export function fetchCreateOaRole(data: {
-  roleName: string
-  roleCode: string
-  status?: string
-  orderNum?: number
-  remark?: string
-}) {
-  return request.post({
-    url: `${BASE}/roles`,
-    data,
-    showSuccessMessage: true
-  })
-}
-
-export function fetchUpdateOaRole(
-  id: string,
-  data: Partial<{
-    roleName: string
-    status: string
-    orderNum: number
-    remark: string
-  }>
-) {
-  return request.put({
-    url: `${BASE}/roles/${id}`,
-    data,
-    showSuccessMessage: true
-  })
-}
-
-export function fetchDeleteOaRole(id: string) {
-  return request.del({
-    url: `${BASE}/roles/${id}`,
-    showSuccessMessage: true
-  })
-}
-
-export function fetchOaRoleUsers(roleId: string) {
-  return request.get<{ list: any[] }>({
-    url: `${BASE}/roles/${roleId}/users`
-  })
-}
-
-export function fetchReplaceOaRoleUsers(roleId: string, userIds: string[]) {
-  return request.put<{ list: any[] }>({
-    url: `${BASE}/roles/${roleId}/users`,
-    data: { userIds },
-    showSuccessMessage: true
-  })
-}
-
 // ---------------------------------------------------------------------------
 // 收款账户
 // ---------------------------------------------------------------------------
@@ -187,6 +118,13 @@ export function fetchDeleteOaApp(id: string) {
  })
 }

+export function fetchCopyOaApp(id: string) {
+  return request.post({
+    url: `${BASE}/apps/${id}/copy`,
+    showSuccessMessage: true
+  })
+}
+
 export function fetchOaAppDraft(appId: string) {
  return request.get<any>({ url: `${BASE}/apps/${appId}/draft` })
 }
@@ -228,7 +228,7 @@
  function resolveSourceText(src: string) {
    const map: Record<string, string> = {
      users: '指定成员',
-      oa_roles: '工作流角色',
+      posts: '职位',
      dept_leader: '部门负责人',
      direct_supervisor: '直属主管',
      supervisor_fallback_dept_leader: '部门负责人（主管回退）',
@@ -83,72 +83,78 @@
          />
        </div>

-        <div class="oa-trip-leg__field">
-          <label class="oa-trip-leg__label">开始日期</label>
-          <template v-if="disabled">
-            <span class="oa-trip-leg__readonly">{{ leg.startDate || '—' }}</span>
-          </template>
-          <el-date-picker
-            v-else
-            :model-value="leg.startDate || undefined"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="选择日期"
-            @update:model-value="(v) => onScheduleChange(idx, 'startDate', v || '')"
-          />
-        </div>
-
-        <div class="oa-trip-leg__field">
-          <label class="oa-trip-leg__label">开始时段</label>
-          <template v-if="disabled">
-            <span class="oa-trip-leg__readonly">{{ leg.startHalf || '—' }}</span>
-          </template>
-          <el-select
-            v-else
-            :model-value="leg.startHalf"
-            @update:model-value="(v) => onScheduleChange(idx, 'startHalf', String(v || ''))"
-          >
-            <el-option
-              v-for="opt in halfOpts"
-              :key="opt.value"
-              :label="opt.label"
-              :value="opt.value"
+        <div class="oa-trip-leg__row">
+          <div class="oa-trip-leg__field oa-trip-leg__field--date">
+            <label class="oa-trip-leg__label">开始日期</label>
+            <template v-if="disabled">
+              <span class="oa-trip-leg__readonly">{{ leg.startDate || '—' }}</span>
+            </template>
+            <el-date-picker
+              v-else
+              :model-value="leg.startDate || undefined"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              @update:model-value="(v) => onScheduleChange(idx, 'startDate', v || '')"
            />
-          </el-select>
+          </div>
+
+          <div class="oa-trip-leg__field oa-trip-leg__field--half">
+            <label class="oa-trip-leg__label">开始时段</label>
+            <template v-if="disabled">
+              <span class="oa-trip-leg__readonly">{{ leg.startHalf || '—' }}</span>
+            </template>
+            <el-select
+              v-else
+              class="oa-trip-leg__half-select"
+              :model-value="leg.startHalf"
+              @update:model-value="(v) => onScheduleChange(idx, 'startHalf', String(v || ''))"
+            >
+              <el-option
+                v-for="opt in halfOpts"
+                :key="opt.value"
+                :label="opt.label"
+                :value="opt.value"
+              />
+            </el-select>
+          </div>
        </div>

-        <div class="oa-trip-leg__field">
-          <label class="oa-trip-leg__label">结束日期</label>
-          <template v-if="disabled">
-            <span class="oa-trip-leg__readonly">{{ leg.endDate || '—' }}</span>
-          </template>
-          <el-date-picker
-            v-else
-            :model-value="leg.endDate || undefined"
-            type="date"
-            value-format="YYYY-MM-DD"
-            placeholder="选择日期"
-            @update:model-value="(v) => onScheduleChange(idx, 'endDate', v || '')"
-          />
-        </div>
-
-        <div class="oa-trip-leg__field">
-          <label class="oa-trip-leg__label">结束时段</label>
-          <template v-if="disabled">
-            <span class="oa-trip-leg__readonly">{{ leg.endHalf || '—' }}</span>
-          </template>
-          <el-select
-            v-else
-            :model-value="leg.endHalf"
-            @update:model-value="(v) => onScheduleChange(idx, 'endHalf', String(v || ''))"
-          >
-            <el-option
-              v-for="opt in halfOpts"
-              :key="opt.value"
-              :label="opt.label"
-              :value="opt.value"
+        <div class="oa-trip-leg__row">
+          <div class="oa-trip-leg__field oa-trip-leg__field--date">
+            <label class="oa-trip-leg__label">结束日期</label>
+            <template v-if="disabled">
+              <span class="oa-trip-leg__readonly">{{ leg.endDate || '—' }}</span>
+            </template>
+            <el-date-picker
+              v-else
+              :model-value="leg.endDate || undefined"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="选择日期"
+              @update:model-value="(v) => onScheduleChange(idx, 'endDate', v || '')"
            />
-          </el-select>
+          </div>
+
+          <div class="oa-trip-leg__field oa-trip-leg__field--half">
+            <label class="oa-trip-leg__label">结束时段</label>
+            <template v-if="disabled">
+              <span class="oa-trip-leg__readonly">{{ leg.endHalf || '—' }}</span>
+            </template>
+            <el-select
+              v-else
+              class="oa-trip-leg__half-select"
+              :model-value="leg.endHalf"
+              @update:model-value="(v) => onScheduleChange(idx, 'endHalf', String(v || ''))"
+            >
+              <el-option
+                v-for="opt in halfOpts"
+                :key="opt.value"
+                :label="opt.label"
+                :value="opt.value"
+              />
+            </el-select>
+          </div>
        </div>

        <div class="oa-trip-leg__field oa-trip-leg__field--duration">
@@ -383,16 +389,28 @@

  .oa-trip-leg__grid {
    display: grid;
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-    gap: 12px 16px;
+    grid-template-columns: minmax(0, 1fr);
+    gap: 12px;
+  }
+
+  .oa-trip-leg__row {
+    display: flex;
+    gap: 12px;
+    align-items: flex-start;
+    min-width: 0;
  }

  .oa-trip-leg__field {
    min-width: 0;
  }

-  .oa-trip-leg__field--duration {
-    grid-column: 1 / -1;
+  .oa-trip-leg__field--date {
+    flex: 1 1 auto;
+  }
+
+  .oa-trip-leg__field--half {
+    flex: 0 0 120px;
+    width: 120px;
  }

  .oa-trip-leg__label {
@@ -443,18 +461,13 @@
    max-width: 100%;
  }

+  .oa-trip-leg__half-select {
+    width: 120px;
+    max-width: 100%;
+  }
+
  .oa-trip-leg :deep(.el-input__wrapper),
  .oa-trip-leg :deep(.el-select__wrapper) {
    min-height: 36px;
  }
-
-  @media (max-width: 640px) {
-    .oa-trip-leg__grid {
-      grid-template-columns: 1fr;
-    }
-
-    .oa-trip-leg__field--duration {
-      grid-column: auto;
-    }
-  }
 </style>
@@ -156,109 +156,77 @@
            </div>
          </el-form-item>

-          <el-form-item v-if="showRolesPicker">
+          <el-form-item v-if="showPostsPicker">
            <template #label>
-              工作流角色
-              <span class="form-label-tip">可多选，已选角色成员将作为本节点{{ editing.type === 'cc' ? '抄送' : '审批' }}人</span>
+              职位
+              <span class="form-label-tip">可多选，已选职位关联用户将作为本节点{{ editing.type === 'cc' ? '抄送' : '审批' }}人</span>
            </template>
-            <div v-loading="roleLoading" class="member-picker">
+            <div v-loading="postLoading" class="member-picker">
              <el-select
-                v-model="rolePickBuffer"
+                v-model="postPickBuffer"
                filterable
                clearable
-                :loading="roleLoading"
-                placeholder="搜索角色名称 / 编码，点击添加"
+                :loading="postLoading"
+                placeholder="搜索职位名称 / 编码，点击添加"
                style="width: 100%"
                popper-class="oa-flow-member-select-popper"
-                @change="onRolePick"
+                @change="onPostPick"
              >
-                <el-option-group v-if="presetRoles.length" label="预置">
-                  <el-option
-                    v-for="r in presetRoles"
-                    :key="r.id"
-                    :label="roleOptionLabel(r)"
-                    :value="r.id"
-                    :disabled="(cfg.oaRoleIds || []).includes(r.id)"
-                  >
-                    <div class="member-option">
-                      <span class="member-avatar" :style="{ background: avatarColor(r.id) }">
-                        {{ avatarInitial(r.roleName) }}
+                <el-option
+                  v-for="p in postOptions"
+                  :key="p.id"
+                  :label="postOptionLabel(p)"
+                  :value="p.id"
+                  :disabled="(cfg.postIds || []).includes(p.id)"
+                >
+                  <div class="member-option">
+                    <span class="member-avatar" :style="{ background: avatarColor(p.id) }">
+                      {{ avatarInitial(p.postName) }}
+                    </span>
+                    <span class="member-option__meta">
+                      <span class="member-option__name">{{ p.postName || '未命名' }}</span>
+                      <span v-if="p.postCode" class="member-option__sub">
+                        编码 {{ p.postCode }}
                      </span>
-                      <span class="member-option__meta">
-                        <span class="member-option__name">{{ r.roleName || '未命名' }}</span>
-                        <span v-if="r.roleCode" class="member-option__sub">
-                          编码 {{ r.roleCode }}
-                        </span>
-                      </span>
-                      <el-tag
-                        v-if="(cfg.oaRoleIds || []).includes(r.id)"
-                        size="small"
-                        type="info"
-                        effect="plain"
-                        class="member-option__tag"
-                      >
-                        已选
-                      </el-tag>
-                    </div>
-                  </el-option>
-                </el-option-group>
-                <el-option-group v-if="customRoles.length" label="自定义">
-                  <el-option
-                    v-for="r in customRoles"
-                    :key="r.id"
-                    :label="roleOptionLabel(r)"
-                    :value="r.id"
-                    :disabled="(cfg.oaRoleIds || []).includes(r.id)"
-                  >
-                    <div class="member-option">
-                      <span class="member-avatar" :style="{ background: avatarColor(r.id) }">
-                        {{ avatarInitial(r.roleName) }}
-                      </span>
-                      <span class="member-option__meta">
-                        <span class="member-option__name">{{ r.roleName || '未命名' }}</span>
-                        <span v-if="r.roleCode" class="member-option__sub">
-                          编码 {{ r.roleCode }}
-                        </span>
-                      </span>
-                      <el-tag
-                        v-if="(cfg.oaRoleIds || []).includes(r.id)"
-                        size="small"
-                        type="info"
-                        effect="plain"
-                        class="member-option__tag"
-                      >
-                        已选
-                      </el-tag>
-                    </div>
-                  </el-option>
-                </el-option-group>
+                    </span>
+                    <el-tag
+                      v-if="(cfg.postIds || []).includes(p.id)"
+                      size="small"
+                      type="info"
+                      effect="plain"
+                      class="member-option__tag"
+                    >
+                      已选
+                    </el-tag>
+                  </div>
+                </el-option>
              </el-select>

              <div
                class="member-chips"
-                :class="{ 'is-empty': !(cfg.oaRoleIds && cfg.oaRoleIds.length) }"
+                :class="{ 'is-empty': !(cfg.postIds && cfg.postIds.length) }"
              >
-                <template v-if="cfg.oaRoleIds && cfg.oaRoleIds.length">
-                  <span v-for="id in cfg.oaRoleIds" :key="id" class="member-chip">
+                <template v-if="cfg.postIds && cfg.postIds.length">
+                  <span v-for="id in cfg.postIds" :key="id" class="member-chip">
                    <span class="member-avatar member-avatar--sm" :style="{ background: avatarColor(id) }">
-                      {{ avatarInitial(resolveRole(id)?.roleName) }}
+                      {{ avatarInitial(resolvePost(id)?.postName) }}
                    </span>
-                    <span class="member-chip__name" :title="roleChipTitle(id)">
-                      {{ resolveRole(id)?.roleName || id }}
+                    <span class="member-chip__name" :title="postChipTitle(id)">
+                      {{ resolvePost(id)?.postName || id }}
                    </span>
                    <button
                      type="button"
                      class="member-chip__rm"
-                      :aria-label="`移除 ${resolveRole(id)?.roleName || id}`"
-                      @click="removeRole(id)"
+                      :aria-label="`移除 ${resolvePost(id)?.postName || id}`"
+                      @click="removePost(id)"
                    >
                      ×
                    </button>
                  </span>
                </template>
-                <template v-else>暂未选择角色，请从上方搜索添加</template>
+                <template v-else>暂未选择职位，请从上方搜索添加</template>
              </div>
-              <p class="member-picked-count">已选 {{ cfg.oaRoleIds?.length || 0 }} 个角色</p>
+              <p class="member-picked-count">已选 {{ cfg.postIds?.length || 0 }} 个职位</p>
            </div>
          </el-form-item>

@@ -330,8 +298,7 @@
  import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
  import { ElMessage, ElMessageBox } from 'element-plus'
  import { Plus, Close, Check, UserFilled } from '@element-plus/icons-vue'
-  import { fetchUserList } from '@/api/admin'
-  import { fetchOaRoleList } from '@/api/oaApproval'
+  import { fetchUserList, fetchPostList } from '@/api/admin'
  import { MAX_ADMIN_LIST_PAGE_SIZE } from '@/utils/fetch-paged-list'
  import type { ConditionCandidate } from '@/components/oa-approval/oa-condition-fields'
  import ConditionRuleEditor from './ConditionRuleEditor.vue'
@@ -396,13 +363,13 @@
    assigneeType: 'dept_leader',
    assigneeTypes: [],
    userIds: [],
-    oaRoleIds: [],
+    postIds: [],
    signMode: 'or'
  })

  const assigneeTypeOptions: Array<{ label: string; value: AssigneeType }> = [
    { label: '指定成员', value: 'users' },
-    { label: '工作流角色', value: 'oa_roles' },
+    { label: '职位', value: 'posts' },
    { label: '部门负责人', value: 'dept_leader' },
    { label: '发起人主管', value: 'direct_supervisor' },
    { label: '发起人自选', value: 'initiator_select' }
@@ -412,9 +379,9 @@
    if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('users')
    return cfg.assigneeType === 'users'
  })
-  const showRolesPicker = computed(() => {
-    if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('oa_roles')
-    return cfg.assigneeType === 'oa_roles'
+  const showPostsPicker = computed(() => {
+    if (editing.value?.type === 'cc') return (cfg.assigneeTypes || []).includes('posts')
+    return cfg.assigneeType === 'posts'
  })

  const drawerTitle = computed(() => {
@@ -435,19 +402,13 @@
    return '配置流程节点'
  })

-  const roleLoading = ref(false)
+  const postLoading = ref(false)
  const userLoading = ref(false)
-  const roleOptions = ref<any[]>([])
+  type PostOption = { id: string; postName: string; postCode: string }
+  const postOptions = ref<PostOption[]>([])
  const userOptions = ref<UserOption[]>([])
  const memberPickBuffer = ref('')
-  const rolePickBuffer = ref('')
-
-  const presetRoles = computed(() =>
-    roleOptions.value.filter((r) => r.roleKind === 'preset' || ['GM', 'CHAIRMAN'].includes(r.roleCode))
-  )
-  const customRoles = computed(() =>
-    roleOptions.value.filter((r) => r.roleKind !== 'preset' && !['GM', 'CHAIRMAN'].includes(r.roleCode))
-  )
+  const postPickBuffer = ref('')

  function avatarColor(id: string) {
    let hash = 0
@@ -464,8 +425,8 @@
    return userOptions.value.find((u) => u.id === id)
  }

-  function resolveRole(id: string) {
-    return roleOptions.value.find((r) => r.id === id)
+  function resolvePost(id: string) {
+    return postOptions.value.find((p) => p.id === id)
  }

  function chipTitle(id: string) {
@@ -473,16 +434,16 @@
    return u ? memberOptionLabel(u) : id
  }

-  function roleOptionLabel(r: { roleName?: string; roleCode?: string }) {
-    const name = (r.roleName || '').trim() || '未命名'
-    const code = (r.roleCode || '').trim()
+  function postOptionLabel(p: { postName?: string; postCode?: string }) {
+    const name = (p.postName || '').trim() || '未命名'
+    const code = (p.postCode || '').trim()
    if (code && code !== name) return `${name}（${code}）`
    return name
  }

-  function roleChipTitle(id: string) {
-    const r = resolveRole(id)
-    return r ? roleOptionLabel(r) : id
+  function postChipTitle(id: string) {
+    const p = resolvePost(id)
+    return p ? postOptionLabel(p) : id
  }

  function memberOptionLabel(u: UserOption) {
@@ -514,18 +475,18 @@
    cfg.userIds = cfg.userIds.filter((x) => x !== id)
  }

-  function onRolePick(id: string) {
+  function onPostPick(id: string) {
    if (!id) return
-    if (!cfg.oaRoleIds) cfg.oaRoleIds = []
-    if (!cfg.oaRoleIds.includes(id)) cfg.oaRoleIds.push(id)
+    if (!cfg.postIds) cfg.postIds = []
+    if (!cfg.postIds.includes(id)) cfg.postIds.push(id)
    nextTick(() => {
-      rolePickBuffer.value = ''
+      postPickBuffer.value = ''
    })
  }

-  function removeRole(id: string) {
-    if (!cfg.oaRoleIds) return
-    cfg.oaRoleIds = cfg.oaRoleIds.filter((x) => x !== id)
+  function removePost(id: string) {
+    if (!cfg.postIds) return
+    cfg.postIds = cfg.postIds.filter((x) => x !== id)
  }

  async function setAssigneeType(type: AssigneeType) {
@@ -542,19 +503,33 @@
      cfg.assigneeTypes = cur
      if (cur[0]) cfg.assigneeType = cur[0]
      if (cur.includes('users')) await loadUsers()
-      if (cur.includes('oa_roles')) await loadRoles()
+      if (cur.includes('posts')) await loadPosts()
      return
    }
    await setAssigneeType(type)
  }

-  async function loadRoles() {
-    roleLoading.value = true
+  async function loadPosts() {
+    postLoading.value = true
    try {
-      const res = await fetchOaRoleList({ status: '1' })
-      roleOptions.value = res?.list || []
+      const pageSize = MAX_ADMIN_LIST_PAGE_SIZE
+      const raw: any[] = []
+      let page = 1
+      for (;;) {
+        const res = await fetchPostList({ page, pageSize })
+        const list = (res?.list || []).filter((p: any) => p.status === '1')
+        raw.push(...list)
+        if ((res?.list || []).length < pageSize) break
+        if (typeof res?.total === 'number' && raw.length >= res.total) break
+        page += 1
+      }
+      postOptions.value = raw.map((p) => ({
+        id: p.id,
+        postName: p.postName || '',
+        postCode: p.postCode || ''
+      }))
    } finally {
-      roleLoading.value = false
+      postLoading.value = false
    }
  }

@@ -684,18 +659,18 @@
      cfg.assigneeType = ac.assigneeType || 'dept_leader'
    }
    cfg.userIds = [...(ac.userIds || [])]
-    cfg.oaRoleIds = [...(ac.oaRoleIds || [])]
+    cfg.postIds = [...(ac.postIds || [])]
    cfg.signMode = ac.signMode || 'or'
    memberPickBuffer.value = ''
    rolePickBuffer.value = ''
    if (showUsersPicker.value) await loadUsers()
-    if (showRolesPicker.value) await loadRoles()
+    if (showPostsPicker.value) await loadPosts()
    drawerVisible.value = true
  }

  async function onAssigneeTypeChange() {
    if (cfg.assigneeType === 'users' && !userOptions.value.length) await loadUsers()
-    if (cfg.assigneeType === 'oa_roles' && !roleOptions.value.length) await loadRoles()
+    if (cfg.assigneeType === 'posts' && !postOptions.value.length) await loadPosts()
  }

  function onDefaultChange(idx: number, v: boolean) {
@@ -750,21 +725,21 @@
        ElMessage.warning('已勾选指定成员，请选择至少一名成员')
        return
      }
-      if (types.includes('oa_roles') && !(cfg.oaRoleIds || []).length) {
-        ElMessage.warning('已勾选工作流角色，请选择至少一个角色')
+      if (types.includes('posts') && !(cfg.postIds || []).length) {
+        ElMessage.warning('已勾选职位，请选择至少一个职位')
        return
      }
      live.approverConfig = {
        assigneeTypes: types,
        assigneeType: types[0],
        userIds: [...(cfg.userIds || [])],
-        oaRoleIds: [...(cfg.oaRoleIds || [])]
+        postIds: [...(cfg.postIds || [])]
      }
    } else if (live.type === 'approval') {
      live.approverConfig = {
        assigneeType: cfg.assigneeType,
        userIds: cfg.assigneeType === 'users' ? [...(cfg.userIds || [])] : undefined,
-        oaRoleIds: cfg.assigneeType === 'oa_roles' ? [...(cfg.oaRoleIds || [])] : undefined,
+        postIds: cfg.assigneeType === 'posts' ? [...(cfg.postIds || [])] : undefined,
        signMode: cfg.signMode || 'or'
      }
    }
@@ -2,7 +2,7 @@ export type FlowNodeType = 'start' | 'approval' | 'cc' | 'condition' | 'end'

 export type AssigneeType =
  | 'users'
-  | 'oa_roles'
+  | 'posts'
  | 'dept_leader'
  | 'direct_supervisor'
  | 'initiator_select'
@@ -13,8 +13,7 @@ export interface ApproverConfig {
  /** 抄送人：多选选人方式（优先）。审批人：不使用 */
  assigneeTypes?: AssigneeType[]
  userIds?: string[]
-  oaRoleIds?: string[]
-  oaRoleCodes?: string[]
+  postIds?: string[]
  signMode?: 'or' | 'and'
 }

@@ -126,7 +125,7 @@ export function ensureFlowRoot(raw: unknown): FlowNode {

 const VALID_ASSIGNEE: AssigneeType[] = [
  'users',
-  'oa_roles',
+  'posts',
  'dept_leader',
  'direct_supervisor',
  'initiator_select'
@@ -134,7 +133,7 @@ const VALID_ASSIGNEE: AssigneeType[] = [

 const ASSIGNEE_LABEL: Record<AssigneeType, string> = {
  users: '指定成员',
-  oa_roles: '工作流角色',
+  posts: '职位',
  dept_leader: '发起人部门负责人',
  direct_supervisor: '发起人的主管',
  initiator_select: '发起人自选'
@@ -170,8 +169,8 @@ export function summarizeApprover(cfg?: ApproverConfig, nodeType?: FlowNodeType)
        const n = cfg?.userIds?.length || 0
        return n ? `${base}（${n}人）` : `${base}（未选）`
      }
-      if (t === 'oa_roles') {
-        const n = (cfg?.oaRoleIds?.length || 0) + (cfg?.oaRoleCodes?.length || 0)
+      if (t === 'posts') {
+        const n = cfg?.postIds?.length || 0
        return n ? `${base}（已选${n}）` : `${base}（未选）`
      }
      return base
@@ -185,8 +184,8 @@ export function summarizeApprover(cfg?: ApproverConfig, nodeType?: FlowNodeType)
    const n = cfg.userIds?.length || 0
    return n ? `${base}（${n}人）` : `${base}（未选）`
  }
-  if (cfg.assigneeType === 'oa_roles') {
-    const n = (cfg.oaRoleIds?.length || 0) + (cfg.oaRoleCodes?.length || 0)
+  if (cfg.assigneeType === 'posts') {
+    const n = cfg.postIds?.length || 0
    return n ? `${base}（已选${n}）` : `${base}（未选）`
  }
  const sign =
@@ -1374,17 +1374,6 @@ export const sqxpAdminRoutes: AppRouteRecord[] = [
              menuCode: 'oa:apps:list'
            }
          },
-          {
-            id: 'OA000000000000000000000000000102',
-            name: 'OaApprovalRoles',
-            path: 'roles',
-            component: '/oa-approval/roles/index',
-            meta: {
-              title: '工作流角色',
-              keepAlive: true,
-              menuCode: 'oa:roles:list'
-            }
-          },
          {
            id: 'OA000000000000000000000000000108',
            name: 'OaApprovalReceiveAccounts',
@@ -161,7 +161,7 @@ function buildConfirmationKitChildren() {

 export const confirmationKitDragRule = {
  menu: 'kit' as const,
-  icon: 'icon-user',
+  icon: 'icon-idcard',
  label: '转正',
  name: 'confirmationKit',
  input: false,
@@ -1,5 +1,6 @@
 import FcDesigner from '@form-create/designer'
 import OaConfirmationKit from '@/components/oa-approval/OaConfirmationKit.vue'
+import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
 import { confirmationKitDragRule } from '@/utils/oa-confirmation-kit-rule'

 const FLAG = '__oaConfirmationKitConfigured'
@@ -9,14 +10,7 @@ export function setupOaConfirmationKit(formCreate?: {
 }) {
  if ((FcDesigner as any)[FLAG]) return

-  // kit 菜单可能已由请假套件注册；幂等再调一次无妨
-  if (typeof FcDesigner.addMenu === 'function') {
-    try {
-      FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
-    } catch {
-      /* already */
-    }
-  }
+  ensureOaKitMenu()

  FcDesigner.component('confirmationKit', OaConfirmationKit)
  if (typeof formCreate?.component === 'function') {
@@ -0,0 +1,16 @@
+import FcDesigner from '@form-create/designer'
+
+const FLAG = '__oaKitMenuConfigured'
+
+/**
+ * 确保「套件」左侧菜单只注册一次。
+ * 全局 FcDesigner.addMenu 会无条件 push，多套件各自 addMenu 会导致同名分组重复，
+ * 进而 appendMenuItem 把每个拖拽规则挂到所有同名分组上（N 套件 × N 分组）。
+ */
+export function ensureOaKitMenu() {
+  if ((FcDesigner as any)[FLAG]) return
+  if (typeof FcDesigner.addMenu === 'function') {
+    FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
+  }
+  ;(FcDesigner as any)[FLAG] = true
+}
@@ -1,5 +1,6 @@
 import FcDesigner from '@form-create/designer'
 import OaLeaveKit from '@/components/oa-approval/OaLeaveKit.vue'
+import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
 import { leaveKitDragRule } from '@/utils/oa-leave-kit-rule'

 const FLAG = '__oaLeaveKitConfigured'
@@ -7,9 +8,7 @@ const FLAG = '__oaLeaveKitConfigured'
 export function setupOaLeaveKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
  if ((FcDesigner as any)[FLAG]) return

-  if (typeof FcDesigner.addMenu === 'function') {
-    FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
-  }
+  ensureOaKitMenu()

  FcDesigner.component('leaveKit', OaLeaveKit)
  if (typeof formCreate?.component === 'function') {
@@ -1,5 +1,6 @@
 import FcDesigner from '@form-create/designer'
 import OaOvertimeKit from '@/components/oa-approval/OaOvertimeKit.vue'
+import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
 import { overtimeKitDragRule } from '@/utils/oa-overtime-kit-rule'

 const FLAG = '__oaOvertimeKitConfigured'
@@ -7,13 +8,7 @@ const FLAG = '__oaOvertimeKitConfigured'
 export function setupOaOvertimeKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
  if ((FcDesigner as any)[FLAG]) return

-  if (typeof FcDesigner.addMenu === 'function') {
-    try {
-      FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
-    } catch {
-      /* kit menu may already exist */
-    }
-  }
+  ensureOaKitMenu()

  FcDesigner.component('overtimeKit', OaOvertimeKit)
  if (typeof formCreate?.component === 'function') {
@@ -1,5 +1,6 @@
 import FcDesigner from '@form-create/designer'
 import OaResignationKit from '@/components/oa-approval/OaResignationKit.vue'
+import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
 import { resignationKitDragRule } from '@/utils/oa-resignation-kit-rule'

 const FLAG = '__oaResignationKitConfigured'
@@ -9,13 +10,7 @@ export function setupOaResignationKit(formCreate?: {
 }) {
  if ((FcDesigner as any)[FLAG]) return

-  if (typeof FcDesigner.addMenu === 'function') {
-    try {
-      FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
-    } catch {
-      /* already */
-    }
-  }
+  ensureOaKitMenu()

  FcDesigner.component('resignationKit', OaResignationKit)
  if (typeof formCreate?.component === 'function') {
@@ -1,5 +1,6 @@
 import FcDesigner from '@form-create/designer'
 import OaTripKit from '@/components/oa-approval/OaTripKit.vue'
+import { ensureOaKitMenu } from '@/utils/oa-form-create-kit-menu'
 import { tripKitDragRule } from '@/utils/oa-trip-kit-rule'

 const FLAG = '__oaTripKitConfigured'
@@ -7,13 +8,7 @@ const FLAG = '__oaTripKitConfigured'
 export function setupOaTripKit(formCreate?: { component?: (name: string, c: unknown) => void }) {
  if ((FcDesigner as any)[FLAG]) return

-  if (typeof FcDesigner.addMenu === 'function') {
-    try {
-      FcDesigner.addMenu({ name: 'kit', title: '套件', list: [] })
-    } catch {
-      /* kit menu may already exist */
-    }
-  }
+  ensureOaKitMenu()

  FcDesigner.component('tripKit', OaTripKit)
  if (typeof formCreate?.component === 'function') {
@@ -96,7 +96,7 @@ function buildLeaveKitChildren() {
 /** FormCreate Designer DragRule：请假套件 */
 export const leaveKitDragRule = {
  menu: 'kit' as const,
-  icon: 'icon-date',
+  icon: 'icon-askforleave',
  label: '请假',
  name: 'leaveKit',
  input: false,
@@ -84,7 +84,7 @@ function buildOvertimeKitChildren() {
 /** FormCreate Designer DragRule：加班套件 */
 export const overtimeKitDragRule = {
  menu: 'kit' as const,
-  icon: 'icon-date',
+  icon: 'icon-time',
  label: '加班',
  name: 'overtimeKit',
  input: false,
@@ -1,4 +1,9 @@
-/** 加班套件运行时：时长仅手动填写，补齐数字框左对齐 */
+/** 加班套件运行时：时长仅手动填写，补齐数字框左对齐；加班人默认当前登录人 */
+
+import {
+  buildCurrentOwnerPerson,
+  type OwnerUserSnapshot
+} from '@/utils/oa-owner-field-defaults'

 function asRules(schema: unknown): Record<string, unknown>[] {
  if (Array.isArray(schema)) return schema.filter((r) => r && typeof r === 'object') as any
@@ -11,12 +16,88 @@ function asRules(schema: unknown): Record<string, unknown>[] {
  return []
 }

+function walk(rules: Record<string, unknown>[], out: Record<string, unknown>[]) {
+  for (const r of rules) {
+    out.push(r)
+    if (Array.isArray(r.children)) {
+      walk(r.children as any, out)
+    }
+    const props = r.props as any
+    if (props && Array.isArray(props.rule)) walk(props.rule, out)
+  }
+}
+
+export type OvertimeKitBinding = {
+  personField?: string
+  durationField?: string
+}
+
+function resolveBinding(kit: Record<string, unknown>): OvertimeKitBinding {
+  const props = (kit.props && typeof kit.props === 'object' ? kit.props : {}) as Record<
+    string,
+    any
+  >
+  let personField = props.personField ? String(props.personField) : undefined
+  let durationField = props.durationField ? String(props.durationField) : undefined
+  const children = (
+    Array.isArray(kit.children)
+      ? kit.children
+      : Array.isArray(props.rule)
+        ? props.rule
+        : []
+  ) as Record<string, any>[]
+  for (const c of children) {
+    if (!c?.field) continue
+    const sem = String(c.props?._fc_kit_field || '')
+    if (sem === 'overtimePerson' && !personField) personField = String(c.field)
+    if (sem === 'overtimeDuration' && !durationField) durationField = String(c.field)
+  }
+  return { personField, durationField }
+}
+
+export function listOvertimeKitBindings(schema: unknown): OvertimeKitBinding[] {
+  const flat: Record<string, unknown>[] = []
+  walk(asRules(schema), flat)
+  return flat.filter((r) => String(r.type || '') === 'overtimeKit').map(resolveBinding)
+}
+
+function isEmptyPersonValue(raw: unknown): boolean {
+  if (raw == null || raw === '') return true
+  if (Array.isArray(raw)) return raw.length === 0
+  if (typeof raw === 'object') {
+    const o = raw as Record<string, unknown>
+    return !String(o.id || '').trim()
+  }
+  return false
+}
+
+/**
+ * 发起页：加班人字段为空时写入当前登录人（人员组件为多选，值为数组）。
+ */
+export function applyOvertimeKitDefaults(
+  schema: unknown,
+  formData: Record<string, unknown>,
+  user: OwnerUserSnapshot | null | undefined
+): Record<string, unknown> {
+  const data = { ...formData }
+  const person = buildCurrentOwnerPerson(user)
+  if (!person) return data
+  for (const kit of listOvertimeKitBindings(schema)) {
+    const f = kit.personField
+    if (f && isEmptyPersonValue(data[f])) {
+      data[f] = [person]
+    }
+  }
+  return data
+}
+
 function resolveDurationField(kit: Record<string, unknown>): string | undefined {
+  const binding = resolveBinding(kit)
+  if (binding.durationField) return binding.durationField
  const props = (kit.props && typeof kit.props === 'object' ? kit.props : {}) as Record<
    string,
    any
  >
-  if (props.durationField) return String(props.durationField)
  const children = (
    Array.isArray(kit.children)
      ? kit.children
@@ -26,7 +107,6 @@ function resolveDurationField(kit: Record<string, unknown>): string | undefined
  ) as Record<string, any>[]
  for (const c of children) {
    if (!c?.field) continue
-    if (String(c.props?._fc_kit_field || '') === 'overtimeDuration') return String(c.field)
    const t = String(c.type || '')
    if ((t === 'inputNumber' || t === 'number') && String(c.title || '').includes('时长')) {
      return String(c.field)
@@ -90,7 +90,7 @@ function buildResignationKitChildren() {

 export const resignationKitDragRule = {
  menu: 'kit' as const,
-  icon: 'icon-user',
+  icon: 'icon-transfer',
  label: '离职',
  name: 'resignationKit',
  input: false,
@@ -124,7 +124,7 @@ function buildTripKitChildren() {
 /** FormCreate Designer DragRule：出差套件 */
 export const tripKitDragRule = {
  menu: 'kit' as const,
-  icon: 'icon-date',
+  icon: 'icon-businesstrip',
  label: '出差',
  name: 'tripKit',
  input: false,
@@ -103,6 +103,9 @@
                      <el-dropdown-item command="edit">
                        <el-icon><Edit /></el-icon>编辑基础
                      </el-dropdown-item>
+                      <el-dropdown-item command="copy">
+                        <el-icon><CopyDocument /></el-icon>复制
+                      </el-dropdown-item>
                      <el-dropdown-item command="delete" divided>
                        <el-icon><Delete /></el-icon>删除
                      </el-dropdown-item>
@@ -275,10 +278,12 @@
    Upload,
    Folder,
    Search,
-    Refresh
+    Refresh,
+    CopyDocument
  } from '@element-plus/icons-vue'
  import { fetchUploadAttachment } from '@/api/business'
  import {
+    fetchCopyOaApp,
    fetchCreateOaApp,
    fetchCreateOaGroup,
    fetchDeleteOaApp,
@@ -494,9 +499,15 @@
  function onMore(cmd: string, row: any) {
    if (cmd === 'publish') handlePublish(row)
    if (cmd === 'edit') handleEdit(row)
+    if (cmd === 'copy') handleCopy(row)
    if (cmd === 'delete') handleDelete(row)
  }

+  async function handleCopy(row: any) {
+    await fetchCopyOaApp(row.id)
+    await loadData()
+  }
+
  async function handleDelete(row: any) {
    await ElMessageBox.confirm(`确定删除应用「${row.appName}」吗？`, '提示', { type: 'warning' })
    await fetchDeleteOaApp(row.id)
@@ -1,767 +0,0 @@
-<!-- OA 工作流角色（非 sys_role） -->
-<!-- eslint-disable vue/no-v-model-argument -->
-<template>
-  <div class="page-container">
-    <section class="panel">
-      <div class="panel-top">
-        <h2 class="title-bar-heading">工作流角色</h2>
-      </div>
-
-      <div class="filter-block">
-        <el-form :model="searchForm" class="filter-form" @submit.prevent>
-          <div class="filter-grid">
-            <el-form-item label="关键词">
-              <el-input
-                v-model="searchForm.keyword"
-                placeholder="角色名称/编码"
-                clearable
-                @keyup.enter="handleSearch"
-              />
-            </el-form-item>
-            <el-form-item label="状态">
-              <el-select v-model="searchForm.status" placeholder="请选择" clearable>
-                <el-option label="启用" value="1" />
-                <el-option label="停用" value="0" />
-              </el-select>
-            </el-form-item>
-          </div>
-          <div class="filter-actions-row">
-            <div class="filter-actions-end">
-              <el-button class="btn-ghost" @click="handleReset">
-                <el-icon><RefreshLeft /></el-icon>重置
-              </el-button>
-              <el-button class="btn-main" type="primary" @click="handleSearch">
-                <el-icon><Search /></el-icon>搜索
-              </el-button>
-            </div>
-          </div>
-        </el-form>
-      </div>
-
-      <div class="list-toolbar">
-        <div class="list-toolbar-row">
-          <div class="list-toolbar-selected">
-            已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
-          </div>
-          <el-button class="btn-main" type="primary" @click="handleAdd">
-            <el-icon><Plus /></el-icon>
-            新增角色
-          </el-button>
-        </div>
-      </div>
-
-      <div class="list-body list-wrap">
-        <el-table
-          class="list-table"
-          :data="tableData"
-          v-loading="loading"
-          stripe
-          row-key="id"
-          @selection-change="(rows: any[]) => (selectedRows = rows)"
-        >
-          <el-table-column type="selection" min-width="55" align="center" header-align="center" />
-          <el-table-column
-            type="index"
-            label="序号"
-            min-width="68"
-            align="center"
-            header-align="center"
-          />
-          <el-table-column
-            prop="roleName"
-            label="角色名称"
-            min-width="140"
-            align="left"
-            header-align="left"
-          />
-          <el-table-column
-            prop="roleCode"
-            label="编码"
-            min-width="120"
-            align="center"
-            header-align="center"
-          />
-          <el-table-column
-            prop="roleKind"
-            label="类型"
-            min-width="100"
-            align="center"
-            header-align="center"
-          >
-            <template #default="{ row }">
-              <el-tag :type="row.roleKind === 'preset' ? 'primary' : 'info'" size="small">
-                {{ row.roleKind === 'preset' ? '预置' : '自定义' }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="memberCount"
-            label="成员数"
-            min-width="90"
-            align="center"
-            header-align="center"
-          />
-          <el-table-column
-            prop="status"
-            label="状态"
-            min-width="90"
-            align="center"
-            header-align="center"
-          >
-            <template #default="{ row }">
-              <el-tag :type="row.status === '1' ? 'success' : 'info'" size="small">
-                {{ row.status === '1' ? '启用' : '停用' }}
-              </el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="createTime"
-            label="创建时间"
-            min-width="170"
-            align="center"
-            header-align="center"
-          >
-            <template #default="{ row }">{{ formatDisplayOrDash(row.createTime) }}</template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            min-width="280"
-            fixed="right"
-            align="center"
-            header-align="center"
-          >
-            <template #default="{ row }">
-              <div style="display: flex; justify-content: center; gap: 8px">
-                <el-button class="btn-op-item primary" @click="handleMembers(row)">
-                  <el-icon><User /></el-icon>成员
-                </el-button>
-                <el-button class="btn-op-item" @click="handleEdit(row)">
-                  <el-icon><Edit /></el-icon>编辑
-                </el-button>
-                <el-button
-                  class="btn-op-item"
-                  :disabled="row.roleKind === 'preset'"
-                  @click="handleDelete(row)"
-                >
-                  <el-icon><Delete /></el-icon>删除
-                </el-button>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-
-      <el-dialog
-        v-model="dialogVisible"
-        :title="dialogTitle"
-        width="560px"
-        class="dialog-form-layout"
-        align-center
-        append-to-body
-        modal-class="protocol-dialog-mask"
-        destroy-on-close
-        :close-on-click-modal="false"
-      >
-        <el-form
-          ref="formRef"
-          :model="formData"
-          :rules="formRules"
-          label-position="top"
-          class="oa-role-dialog-form"
-          scroll-to-error
-          :scroll-into-view-options="{ behavior: 'smooth', block: 'center' }"
-        >
-          <div class="form-grid-2">
-            <el-form-item label="角色名称" prop="roleName">
-              <el-input v-model="formData.roleName" placeholder="如：财务审批" maxlength="100" />
-            </el-form-item>
-            <el-form-item label="角色编码" prop="roleCode">
-              <el-input
-                v-model="formData.roleCode"
-                placeholder="如：FINANCE"
-                maxlength="64"
-                :disabled="isEdit"
-              />
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="formData.status" placeholder="请选择">
-                <el-option label="启用" value="1" />
-                <el-option label="停用" value="0" />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="备注" class="form-col-span-2">
-              <el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
-            </el-form-item>
-          </div>
-        </el-form>
-        <template #footer>
-          <el-button class="btn-ghost" @click="dialogVisible = false">
-            <el-icon><Close /></el-icon>
-            取消
-          </el-button>
-          <el-button class="btn-main" type="primary" :loading="submitLoading" @click="handleSubmit">
-            <el-icon><Check /></el-icon>
-            确定
-          </el-button>
-        </template>
-      </el-dialog>
-
-      <el-dialog
-        v-model="memberVisible"
-        :title="`成员管理 · ${memberRole?.roleName || ''}`"
-        width="640px"
-        class="dialog-form-layout"
-        align-center
-        append-to-body
-        modal-class="protocol-dialog-mask"
-        destroy-on-close
-        :close-on-click-modal="false"
-      >
-        <el-form label-position="top">
-          <el-form-item>
-            <template #label>
-              绑定用户
-              <span class="form-label-tip">可多选，已选成员将展示在下方列表</span>
-            </template>
-            <div v-loading="memberLoading" class="member-picker">
-              <el-select
-                v-model="memberPickBuffer"
-                filterable
-                clearable
-                :loading="memberLoading"
-                placeholder="搜索姓名 / 工号，点击添加"
-                style="width: 100%"
-                popper-class="oa-role-member-select-popper"
-                @change="onMemberPick"
-              >
-                <el-option
-                  v-for="u in userOptions"
-                  :key="u.id"
-                  :label="memberOptionLabel(u)"
-                  :value="u.id"
-                  :disabled="memberUserIds.includes(u.id)"
-                >
-                  <div class="member-option">
-                    <span class="member-avatar" :style="{ background: avatarColor(u.id) }">
-                      {{ avatarInitial(u.nickName) }}
-                    </span>
-                    <span class="member-option__meta">
-                      <span class="member-option__name">{{ u.nickName || '未命名' }}</span>
-                      <span v-if="memberOptionSub(u)" class="member-option__sub">
-                        {{ memberOptionSub(u) }}
-                      </span>
-                    </span>
-                    <el-tag
-                      v-if="memberUserIds.includes(u.id)"
-                      size="small"
-                      type="info"
-                      effect="plain"
-                      class="member-option__tag"
-                    >
-                      已选
-                    </el-tag>
-                  </div>
-                </el-option>
-              </el-select>
-
-              <div
-                class="member-chips"
-                :class="{ 'is-empty': !memberUserIds.length }"
-              >
-                <template v-if="memberUserIds.length">
-                  <span v-for="id in memberUserIds" :key="id" class="member-chip">
-                    <span
-                      class="member-avatar member-avatar--sm"
-                      :style="{ background: avatarColor(id) }"
-                    >
-                      {{ avatarInitial(resolveUser(id)?.nickName) }}
-                    </span>
-                    <span class="member-chip__name" :title="chipTitle(id)">
-                      {{ resolveUser(id)?.nickName || id }}
-                    </span>
-                    <button
-                      type="button"
-                      class="member-chip__rm"
-                      :aria-label="`移除 ${resolveUser(id)?.nickName || id}`"
-                      @click="removeMember(id)"
-                    >
-                      ×
-                    </button>
-                  </span>
-                </template>
-                <template v-else>暂未选择成员，请从上方搜索添加</template>
-              </div>
-              <p class="member-picked-count">已选 {{ memberUserIds.length }} 人</p>
-            </div>
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <el-button class="btn-ghost" @click="memberVisible = false">
-            <el-icon><Close /></el-icon>
-            取消
-          </el-button>
-          <el-button
-            class="btn-main"
-            type="primary"
-            :loading="memberSubmitLoading"
-            @click="handleMemberSubmit"
-          >
-            <el-icon><Check /></el-icon>
-            确定
-          </el-button>
-        </template>
-      </el-dialog>
-    </section>
-  </div>
-</template>
-
-<script setup lang="ts">
-  import { formatDisplayOrDash } from '@/utils/datetime-display'
-  import { nextTick, onMounted, reactive, ref } from 'vue'
-  import { ElMessage, ElMessageBox } from 'element-plus'
-  import {
-    Plus,
-    Close,
-    Check,
-    Edit,
-    Delete,
-    User,
-    RefreshLeft,
-    Search
-  } from '@element-plus/icons-vue'
-  import { fetchUserList } from '@/api/admin'
-  import {
-    fetchCreateOaRole,
-    fetchDeleteOaRole,
-    fetchOaRoleList,
-    fetchOaRoleUsers,
-    fetchReplaceOaRoleUsers,
-    fetchUpdateOaRole
-  } from '@/api/oaApproval'
-  import { MAX_ADMIN_LIST_PAGE_SIZE } from '@/utils/fetch-paged-list'
-  import { watchDebounced } from '@vueuse/core'
-
-  defineOptions({ name: 'OaApprovalRoles' })
-
-  const searchForm = reactive({ keyword: '', status: '' })
-  const tableData = ref<any[]>([])
-  const selectedRows = ref<any[]>([])
-  const loading = ref(false)
-
-  const dialogVisible = ref(false)
-  const dialogTitle = ref('新增工作流角色')
-  const isEdit = ref(false)
-  const editingId = ref<string | null>(null)
-  const submitLoading = ref(false)
-  const formRef = ref()
-  const formData = reactive({
-    roleName: '',
-    roleCode: '',
-    status: '1',
-    remark: ''
-  })
-  const formRules = {
-    roleName: [{ required: true, message: '请输入角色名称', trigger: 'blur' }],
-    roleCode: [{ required: true, message: '请输入角色编码', trigger: 'blur' }],
-    status: [{ required: true, message: '请选择状态', trigger: 'change' }]
-  }
-
-  type UserOption = { id: string; nickName: string; userNo: string }
-
-  const AVATAR_COLORS = [
-    '#059669',
-    '#0ea5e9',
-    '#8b5cf6',
-    '#d97706',
-    '#ef4444',
-    '#14b8a6',
-    '#6366f1',
-    '#ec4899'
-  ]
-
-  const memberVisible = ref(false)
-  const memberRole = ref<any>(null)
-  const memberUserIds = ref<string[]>([])
-  const memberPickBuffer = ref('')
-  const memberLoading = ref(false)
-  const memberSubmitLoading = ref(false)
-  const userOptions = ref<UserOption[]>([])
-
-  function avatarColor(id: string) {
-    let hash = 0
-    for (let i = 0; i < id.length; i++) hash = (hash * 31 + id.charCodeAt(i)) >>> 0
-    return AVATAR_COLORS[hash % AVATAR_COLORS.length]
-  }
-
-  function avatarInitial(name?: string) {
-    const t = (name || '?').trim()
-    return t ? t.slice(0, 1) : '?'
-  }
-
-  function resolveUser(id: string) {
-    return userOptions.value.find((u) => u.id === id)
-  }
-
-  function memberOptionLabel(u: UserOption) {
-    const name = (u.nickName || '').trim() || '未命名'
-    const no = (u.userNo || '').trim()
-    if (no && no !== name) return `${name}（${no}）`
-    return name
-  }
-
-  function memberOptionSub(u: UserOption) {
-    const name = (u.nickName || '').trim()
-    const no = (u.userNo || '').trim()
-    if (!no || no === name) return ''
-    return `账号 ${no}`
-  }
-
-  function chipTitle(id: string) {
-    const u = resolveUser(id)
-    return u ? memberOptionLabel(u) : id
-  }
-
-  function onMemberPick(id: string) {
-    if (!id) return
-    if (!memberUserIds.value.includes(id)) {
-      memberUserIds.value = [...memberUserIds.value, id]
-    }
-    nextTick(() => {
-      memberPickBuffer.value = ''
-    })
-  }
-
-  function removeMember(id: string) {
-    memberUserIds.value = memberUserIds.value.filter((x) => x !== id)
-  }
-
-  async function loadData() {
-    loading.value = true
-    try {
-      const res = await fetchOaRoleList({
-        keyword: searchForm.keyword || undefined,
-        status: searchForm.status || undefined
-      })
-      tableData.value = res?.list || []
-    } finally {
-      loading.value = false
-    }
-  }
-
-  function handleSearch() {
-    loadData()
-  }
-
-  function handleReset() {
-    searchForm.keyword = ''
-    searchForm.status = ''
-    loadData()
-  }
-
-  function resetForm() {
-    formData.roleName = ''
-    formData.roleCode = ''
-    formData.status = '1'
-    formData.remark = ''
-    editingId.value = null
-  }
-
-  function handleAdd() {
-    isEdit.value = false
-    dialogTitle.value = '新增工作流角色'
-    resetForm()
-    dialogVisible.value = true
-    formRef.value?.clearValidate?.()
-  }
-
-  function handleEdit(row: any) {
-    isEdit.value = true
-    dialogTitle.value = '编辑工作流角色'
-    editingId.value = row.id
-    formData.roleName = row.roleName || ''
-    formData.roleCode = row.roleCode || ''
-    formData.status = row.status || '1'
-    formData.remark = row.remark || ''
-    dialogVisible.value = true
-    formRef.value?.clearValidate?.()
-  }
-
-  async function handleSubmit() {
-    await formRef.value?.validate?.()
-    submitLoading.value = true
-    try {
-      if (isEdit.value && editingId.value) {
-        await fetchUpdateOaRole(editingId.value, {
-          roleName: formData.roleName.trim(),
-          status: formData.status,
-          remark: formData.remark?.trim() || undefined
-        })
-      } else {
-        await fetchCreateOaRole({
-          roleName: formData.roleName.trim(),
-          roleCode: formData.roleCode.trim().toUpperCase(),
-          status: formData.status,
-          remark: formData.remark?.trim() || undefined
-        })
-      }
-      dialogVisible.value = false
-      await loadData()
-    } finally {
-      submitLoading.value = false
-    }
-  }
-
-  async function handleDelete(row: any) {
-    if (row.roleKind === 'preset') {
-      ElMessage.warning('预置角色不可删除')
-      return
-    }
-    await ElMessageBox.confirm(`确定删除工作流角色「${row.roleName}」吗？`, '提示', {
-      type: 'warning'
-    })
-    await fetchDeleteOaRole(row.id)
-    await loadData()
-  }
-
-  async function loadUserOptions() {
-    const pageSize = MAX_ADMIN_LIST_PAGE_SIZE
-    const raw: any[] = []
-    let page = 1
-    for (;;) {
-      const res = await fetchUserList({ page, pageSize, status: '1' })
-      const list = res?.list || []
-      raw.push(...list)
-      if (list.length < pageSize) break
-      if (typeof res?.total === 'number' && raw.length >= res.total) break
-      page += 1
-    }
-    userOptions.value = raw.map((u) => ({
-      id: u.id,
-      nickName: u.nickName || '',
-      userNo: u.userNo || ''
-    }))
-  }
-
-  async function handleMembers(row: any) {
-    memberRole.value = row
-    memberPickBuffer.value = ''
-    memberUserIds.value = []
-    memberVisible.value = true
-    memberLoading.value = true
-    try {
-      await loadUserOptions()
-      const res = await fetchOaRoleUsers(row.id)
-      memberUserIds.value = (res?.list || []).map((x: any) => x.userId)
-    } finally {
-      memberLoading.value = false
-    }
-  }
-
-  async function handleMemberSubmit() {
-    if (!memberRole.value?.id) return
-    memberSubmitLoading.value = true
-    try {
-      await fetchReplaceOaRoleUsers(memberRole.value.id, memberUserIds.value)
-      memberVisible.value = false
-      await loadData()
-    } finally {
-      memberSubmitLoading.value = false
-    }
-  }
-
-  watchDebounced(
-    searchForm,
-    () => {
-      loadData()
-    },
-    { debounce: 300, deep: true }
-  )
-
-  onMounted(() => {
-    loadData()
-  })
-</script>
-
-<style scoped lang="scss">
-  .oa-role-dialog-form {
-    :deep(.el-form-item) {
-      margin-bottom: 0;
-    }
-  }
-
-  .member-picker {
-    width: 100%;
-  }
-
-  .member-chips {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-    min-height: 44px;
-    margin-top: 12px;
-    padding: 12px;
-    background: #f8fafc;
-    border: 1px dashed #cbd5e1;
-    border-radius: 8px;
-
-    &.is-empty {
-      align-items: center;
-      justify-content: center;
-      color: var(--mint-text-muted, #94a3b8);
-      font-size: 13px;
-    }
-  }
-
-  .member-chip {
-    display: inline-flex;
-    gap: 8px;
-    align-items: center;
-    max-width: 100%;
-    padding: 4px 8px 4px 4px;
-    background: #fff;
-    border: 1px solid var(--mint-border, #e2e8f0);
-    border-radius: 999px;
-  }
-
-  .member-chip__name {
-    max-width: 120px;
-    overflow: hidden;
-    font-size: 13px;
-    font-weight: 500;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
-
-  .member-chip__rm {
-    display: grid;
-    flex-shrink: 0;
-    place-items: center;
-    width: 20px;
-    height: 20px;
-    padding: 0;
-    color: var(--mint-text-muted, #64748b);
-    font-size: 14px;
-    line-height: 1;
-    background: #f1f5f9;
-    border: 0;
-    border-radius: 50%;
-    cursor: pointer;
-
-    &:hover {
-      color: #dc2626;
-      background: #fee2e2;
-    }
-  }
-
-  .member-picked-count {
-    margin: 8px 0 0;
-    color: var(--mint-text-muted, #94a3b8);
-    font-size: 12px;
-  }
-
-  .member-avatar {
-    display: inline-flex;
-    flex-shrink: 0;
-    align-items: center;
-    justify-content: center;
-    width: 36px;
-    height: 36px;
-    color: #fff;
-    font-size: 13px;
-    font-weight: 700;
-    line-height: 1;
-    text-align: center;
-    border-radius: 50%;
-
-    &--sm {
-      width: 28px;
-      height: 28px;
-      font-size: 11px;
-    }
-  }
-</style>
-
-<!-- 下拉挂 body，须非 scoped -->
-<style lang="scss">
-  .oa-role-member-select-popper {
-    .el-select-dropdown__list {
-      padding: 8px;
-    }
-
-    .el-select-dropdown__item {
-      height: auto !important;
-      min-height: 56px;
-      margin-bottom: 8px;
-      padding: 10px 12px !important;
-      line-height: normal !important;
-      border-radius: 8px;
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      &.is-disabled {
-        opacity: 0.55;
-      }
-
-      &.hover,
-      &:hover {
-        background: var(--primary-bg, #ecfdf5);
-      }
-    }
-
-    .member-option {
-      display: flex;
-      gap: 12px;
-      align-items: center;
-      width: 100%;
-      min-height: 36px;
-    }
-
-    .member-option__meta {
-      display: flex;
-      flex: 1;
-      flex-direction: column;
-      gap: 2px;
-      justify-content: center;
-      min-width: 0;
-    }
-
-    .member-option__name {
-      overflow: hidden;
-      color: var(--mint-text, #0f172a);
-      font-size: 13px;
-      font-weight: 600;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    .member-option__sub {
-      overflow: hidden;
-      color: var(--mint-text-muted, #64748b);
-      font-size: 12px;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    .member-option__tag {
-      flex-shrink: 0;
-      margin-left: auto;
-    }
-
-    .member-avatar {
-      display: inline-flex;
-      flex-shrink: 0;
-      align-items: center;
-      justify-content: center;
-      width: 36px;
-      height: 36px;
-      color: #fff;
-      font-size: 13px;
-      font-weight: 700;
-      line-height: 1;
-      text-align: center;
-      border-radius: 50%;
-    }
-  }
-</style>
@@ -171,7 +171,7 @@
    listLeaveKitBindings,
    markLeaveDurationManual
  } from '@/utils/oa-leave-kit-runtime'
-  import { ensureOvertimeKitRuleProps } from '@/utils/oa-overtime-kit-runtime'
+  import { applyOvertimeKitDefaults, ensureOvertimeKitRuleProps } from '@/utils/oa-overtime-kit-runtime'
  import { applyResignationKitDefaults } from '@/utils/oa-resignation-kit-runtime'
  import {
    applyConfirmationKitDateLinkage,
@@ -395,6 +395,11 @@
        data,
        (userStore.info || userStore.getUserInfo) as any
      )
+      data = applyOvertimeKitDefaults(
+        { rule: formRule.value },
+        data,
+        (userStore.info || userStore.getUserInfo) as any
+      )
      const linked = applyConfirmationKitDateLinkage({ rule: formRule.value }, data)
      formData.value = linked.data
      confirmationKitPrevSnapshot = { ...linked.data }
@@ -635,6 +640,11 @@
                { ...(old?.formDataJson || {}) },
                (userStore.info || userStore.getUserInfo) as any
              )
+              formData.value = applyOvertimeKitDefaults(
+                { rule: formRule.value },
+                formData.value,
+                (userStore.info || userStore.getUserInfo) as any
+              )
            } catch {
              /* 预填失败仍可手工填 */
            }
@@ -404,7 +404,7 @@
            </el-form-item>
            <el-form-item>
              <template #label>
-                节点编号<span class="form-label-tip">可选，与名称共用序号</span>
+                节点编号<span class="form-label-tip">编号 = 前缀 + 序号 + 后缀；前缀后缀都空时 = 序号</span>
              </template>
              <div class="storage-name-compose">
                <div class="storage-compose-field storage-compose-field--affix">
@@ -1585,7 +1585,7 @@
    nameSuffix: '',
    startNum: 1,
    endNum: 10,
-    padWidth: 2,
+    padWidth: 0,
    codePrefix: '',
    codeSuffix: '',
    nodeType: 'box',
@@ -1619,16 +1619,14 @@
    if (count > 200) {
      return { count: 0, samples: [] as Array<{ name: string; code: string }> }
    }
-    const genCode = !!(batchChildForm.codePrefix.trim() || batchChildForm.codeSuffix.trim())
    const samples: Array<{ name: string; code: string }> = []
    const showMax = Math.min(count, 12)
    for (let i = 0; i < showMax; i++) {
      const num = start + i
      const seq = formatBatchSeq(num, batchChildForm.padWidth)
      const name = `${batchChildForm.namePrefix}${seq}${batchChildForm.nameSuffix}`.trim()
-      const code = genCode
-        ? `${batchChildForm.codePrefix}${seq}${batchChildForm.codeSuffix}`.trim()
-        : ''
+      // 前缀、后缀都空时，节点编号即为序号（含补零）
+      const code = `${batchChildForm.codePrefix}${seq}${batchChildForm.codeSuffix}`.trim()
      samples.push({ name: name || '（空名称）', code })
    }
    return { count, samples }
@@ -1685,7 +1683,7 @@
      nameSuffix: '',
      startNum: 1,
      endNum: 10,
-      padWidth: 2,
+      padWidth: 0,
      codePrefix: '',
      codeSuffix: '',
      nodeType: data.nodeType === 'facility' ? 'layer' : 'box',
@@ -1739,7 +1737,7 @@
      nameSuffix: '',
      startNum: 1,
      endNum: 10,
-      padWidth: 2,
+      padWidth: 0,
      codePrefix: '',
      codeSuffix: '',
      nodeType: 'box',
@@ -103,17 +103,21 @@
          </el-table-column>
          <el-table-column
            label="操作"
-            min-width="160"
+            min-width="320"
            fixed="right"
            align="center"
            header-align="center"
          >
            <template #default="{ row }">
-              <div style="display: flex; justify-content: center; gap: 8px">
+              <div style="display: flex; justify-content: center; gap: 8px; flex-wrap: wrap">
                <el-button class="btn-op-item primary" @click="handlePostBindUsers(row)">
                  <el-icon><User /></el-icon>
                  关联用户
                </el-button>
+                <el-button class="btn-op-item" @click="handlePostBindRoles(row)">
+                  <el-icon><Key /></el-icon>
+                  角色配置
+                </el-button>
                <el-dropdown trigger="hover" @command="(cmd: string) => handleDropdownCommand(cmd, row)">
                  <el-button class="btn-op-item">
                    <el-icon><More /></el-icon>
@@ -308,6 +312,58 @@
        </template>
      </el-dialog>

+      <!-- 角色配置 -->
+      <el-dialog
+        v-model="postRoleDialogVisible"
+        title="角色配置"
+        width="560px"
+        class="dialog-form-layout"
+        align-center
+        append-to-body
+        modal-class="protocol-dialog-mask"
+        destroy-on-close
+        :close-on-click-modal="false"
+      >
+        <DialogFormBody :loading="postRoleLoading">
+          <p v-if="postRolePostName" class="post-bind-subtitle">
+            职位：<strong>{{ postRolePostName }}</strong>
+          </p>
+          <el-form label-position="top">
+            <el-form-item label="关联角色">
+              <el-select
+                v-model="postRoleCheckedIds"
+                multiple
+                filterable
+                placeholder="请选择角色"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in postRoleOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </DialogFormBody>
+        <template #footer>
+          <el-button class="btn-ghost" @click="postRoleDialogVisible = false">
+            <el-icon><Close /></el-icon>
+            取消
+          </el-button>
+          <el-button
+            class="btn-main"
+            type="primary"
+            @click="handlePostRoleSubmit"
+            :loading="postRoleSubmitLoading"
+          >
+            <el-icon><Check /></el-icon>
+            确定
+          </el-button>
+        </template>
+      </el-dialog>
+
      <SystemViewDialog
        v-model:visible="viewVisible"
        :title="viewRow?.postName || '职位详情'"
@@ -328,6 +384,7 @@
    Close,
    Check,
    User,
+    Key,
    View,
    Edit,
    Delete,
@@ -349,7 +406,10 @@
    fetchDeptTree,
    fetchUserList,
    fetchPostBoundUserIds,
-    fetchUpdatePostBoundUsers
+    fetchUpdatePostBoundUsers,
+    fetchPostBoundRoleIds,
+    fetchUpdatePostBoundRoles,
+    fetchRoleList
  } from '@/api/admin'

  defineOptions({ name: 'SystemPost' })
@@ -385,6 +445,7 @@
  const viewVisible = ref(false)
  const viewRow = ref<Api.Post.PostItem | null>(null)
  const viewBoundUserNames = ref<string[]>([])
+  const viewBoundRoleNames = ref<string[]>([])
  const viewSections = computed(() => {
    const row = viewRow.value
    if (!row) return []
@@ -404,6 +465,12 @@
        ]
      }
    ]
+    if (viewBoundRoleNames.value.length > 0) {
+      sections.push({
+        title: '关联角色',
+        fields: [{ label: '已关联角色', value: viewBoundRoleNames.value.join('、'), span: true }]
+      })
+    }
    if (viewBoundUserNames.value.length > 0) {
      sections.push({
        title: '关联用户',
@@ -415,16 +482,68 @@
  async function handleView(row: Api.Post.PostItem) {
    viewRow.value = row
    viewBoundUserNames.value = []
+    viewBoundRoleNames.value = []
    viewVisible.value = true
    try {
-      const [boundRes] = await Promise.all([fetchPostBoundUserIds(row.id), fetchDeptTree()])
+      const [boundRes, roleRes] = await Promise.all([
+        fetchPostBoundUserIds(row.id),
+        fetchPostBoundRoleIds(row.id)
+      ])
+      const roleIds = roleRes?.roleIds || []
+      if (roleIds.length > 0) {
+        const roleListRes = await fetchRoleList({ page: 1, pageSize: 100 })
+        const idToName = new Map(
+          (roleListRes?.list || []).map((r: any) => [r.id, r.roleName || r.id])
+        )
+        viewBoundRoleNames.value = roleIds.map((id: string) => idToName.get(id) || id)
+      }
      const boundIds = boundRes?.userIds || []
      if (boundIds.length === 0) return
      const users = await fetchAllUsersForPostBind()
      const idToName = new Map(users.map((u) => [u.id, u.nickName || u.userNo || u.id]))
      viewBoundUserNames.value = boundIds.map((id: string) => idToName.get(id) || id)
    } catch (e) {
-      console.error('加载关联用户失败:', e)
+      console.error('加载职位关联信息失败:', e)
+    }
+  }
+
+  // ---- 角色配置弹窗 ----
+  const postRoleDialogVisible = ref(false)
+  const postRoleLoading = ref(false)
+  const postRoleSubmitLoading = ref(false)
+  const postRolePostId = ref('')
+  const postRolePostName = ref('')
+  const postRoleCheckedIds = ref<string[]>([])
+  const postRoleOptions = ref<Array<{ label: string; value: string }>>([])
+
+  async function handlePostBindRoles(row: Api.Post.PostItem) {
+    postRolePostId.value = row.id
+    postRolePostName.value = row.postName || row.postCode || ''
+    postRoleCheckedIds.value = []
+    postRoleDialogVisible.value = true
+    postRoleLoading.value = true
+    try {
+      const [boundRes, roleListRes] = await Promise.all([
+        fetchPostBoundRoleIds(row.id),
+        fetchRoleList({ page: 1, pageSize: 100 })
+      ])
+      postRoleCheckedIds.value = [...(boundRes?.roleIds || [])]
+      postRoleOptions.value = (roleListRes?.list || []).map((r: any) => ({
+        label: r.roleName || r.id,
+        value: r.id
+      }))
+    } finally {
+      postRoleLoading.value = false
+    }
+  }
+
+  async function handlePostRoleSubmit() {
+    postRoleSubmitLoading.value = true
+    try {
+      await fetchUpdatePostBoundRoles(postRolePostId.value, [...postRoleCheckedIds.value])
+      postRoleDialogVisible.value = false
+    } finally {
+      postRoleSubmitLoading.value = false
    }
  }

@@ -361,6 +361,7 @@
              <el-select
                v-model="formData.roleIds"
                multiple
+                filterable
                placeholder="请选择角色"
                style="width: 100%"
              >
@@ -372,6 +373,22 @@
                />
              </el-select>
            </el-form-item>
+            <el-form-item label="职位" style="grid-column: 1 / -1">
+              <el-select
+                v-model="formData.postIds"
+                multiple
+                filterable
+                placeholder="请选择职位"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
            <el-form-item label="备注" style="grid-column: 1 / -1">
              <el-input v-model="formData.remark" type="textarea" :rows="2" placeholder="可选" />
            </el-form-item>
@@ -426,12 +443,14 @@
    fetchDeleteUser,
    fetchResetPassword,
    fetchDeptTree,
-    fetchRoleOptions
+    fetchRoleOptions,
+    fetchPostList
  } from '@/api/admin'
  import { buildPathLabelMapFromTreeRoots } from '@/utils/tree-path'
  import { resolveUserAvatarFromInfo } from '@/utils/user-avatar'

  const roleOptions = ref<Array<{ label: string; value: string }>>([])
+  const postOptions = ref<Array<{ label: string; value: string }>>([])

  async function loadRoleOptions() {
    try {
@@ -441,6 +460,18 @@
    }
  }

+  async function loadPostOptions() {
+    try {
+      const res = await fetchPostList({ page: 1, pageSize: 100 })
+      postOptions.value = (res?.list || []).map((p) => ({
+        label: p.postName || p.postCode || p.id,
+        value: p.id
+      }))
+    } catch {
+      postOptions.value = []
+    }
+  }
+
  defineOptions({ name: 'SystemUser' })

  const deptKeyword = ref('')
@@ -489,6 +520,15 @@
    return labels.length ? labels.join('、') : '—'
  }

+  function formatUserPostDisplay(row: Api.User.UserItem) {
+    const ids = row.postIds || []
+    if (!ids.length) return '—'
+    const labels = ids
+      .map((id) => postOptions.value.find((o) => o.value === id)?.label)
+      .filter((name): name is string => Boolean(name))
+    return labels.length ? labels.join('、') : '—'
+  }
+
  const searchForm = reactive<{ keyword: string; status: string }>({ keyword: '', status: '' })
  const tableData = ref<Api.User.UserItem[]>([])
  const selectedRows = ref<Api.User.UserItem[]>([])
@@ -518,7 +558,8 @@
    status: '1',
    orderNum: 0,
    remark: '',
-    roleIds: [] as string[]
+    roleIds: [] as string[],
+    postIds: [] as string[]
  })

  const supervisorUserOptions = ref<Api.User.UserItem[]>([])
@@ -627,6 +668,7 @@
    formData.orderNum = 0
    formData.remark = ''
    formData.roleIds = []
+    formData.postIds = []
    supervisorUserOptions.value = []
    editingId.value = null
  }
@@ -667,6 +709,7 @@
      formData.orderNum = detail.orderNum ?? 0
      formData.remark = detail.remark || ''
      formData.roleIds = detail.roleIds ? [...detail.roleIds] : []
+      formData.postIds = detail.postIds ? [...detail.postIds] : []
      if (formData.supervisorUserId) {
        await remoteSearchSupervisorUsers(detail.nickName || '')
        if (!supervisorUserOptions.value.some((u) => u.id === formData.supervisorUserId)) {
@@ -701,7 +744,8 @@
          status: formData.status,
          orderNum: formData.orderNum,
          remark: formData.remark?.trim() || undefined,
-          roleIds: [...formData.roleIds]
+          roleIds: [...formData.roleIds],
+          postIds: [...formData.postIds]
        })
      } else {
        await fetchCreateUser({
@@ -719,7 +763,8 @@
          status: formData.status,
          orderNum: formData.orderNum,
          remark: formData.remark?.trim() || undefined,
-          roleIds: formData.roleIds.length ? formData.roleIds : undefined
+          roleIds: formData.roleIds.length ? formData.roleIds : undefined,
+          postIds: formData.postIds.length ? formData.postIds : undefined
        })
      }
      dialogVisible.value = false
@@ -838,6 +883,7 @@
            tagType: row.status === '1' ? 'success' : 'info'
          },
          { label: '角色', value: formatUserRoleDisplay(row), span: true },
+          { label: '职位', value: formatUserPostDisplay(row), span: true },
          { label: '创建时间', value: row.createTime },
          { label: '备注', value: row.remark, span: true }
        ]
@@ -868,6 +914,7 @@
    loadDeptTree()
    loadData()
    loadRoleOptions()
+    loadPostOptions()
  })
 </script>