From f4bde32f8313ea69155ac51f0496f64f62032273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Wed, 18 Nov 2026 00:27:04 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=96=B0=E5=BB=BA=E5=88=86?= =?UTF-8?q?=E7=BB=84=E7=BB=84=E9=95=BF=E5=8F=AF=E4=B8=8B=E6=8B=89=E9=80=89?= =?UTF-8?q?=EF=BC=882026-11-18=20=E7=94=A8=E6=88=B7=E5=8F=A3=E5=BE=84?= =?UTF-8?q?=E3=80=8C=E7=BB=84=E9=95=BF=E4=B8=8D=E8=83=BD=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E9=80=89=E5=90=97=E3=80=8D=EF=BC=89=E2=80=94=E2=80=94=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E5=8E=9F=E4=B8=BA=E5=8F=AA=E8=AF=BB=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=EF=BC=88?= =?UTF-8?q?2026-10-07=20=E5=AF=B9=E9=BD=90=20admin.js=20=E7=9A=84=E6=9C=89?= =?UTF-8?q?=E6=84=8F=E8=AE=BE=E8=AE=A1=EF=BC=89=EF=BC=9B=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=20validateLeaderOperator=20=E5=AF=B9=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E8=B6=85=E7=AE=A1=E6=9C=AC=E5=B0=B1=E6=94=BE=E8=A1=8C=E4=BB=BB?= =?UTF-8?q?=E6=84=8F=20createdById=EF=BC=88=E5=8F=AA=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E7=BB=84=E9=95=BF=E4=B8=8E=E6=93=8D=E4=BD=9C=E8=80=85=E5=90=8C?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=20ensureLeaderSharesOperatorCompany=EF=BC=89?= =?UTF-8?q?=EF=BC=8C=E6=95=85=E7=BA=AF=E5=89=8D=E7=AB=AF=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=BB=BA+=E7=AB=99=E7=82=B9=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E5=87=BA=20filterable=20=E4=B8=8B=E6=8B=89=EF=BC=88?= =?UTF-8?q?=E5=80=99=E9=80=89=3D=E6=9C=AC=E5=85=AC=E5=8F=B8=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=EF=BC=8C=E5=85=AC=E5=8F=B8=E8=B6=85=E7=AE=A1=E6=B0=B8?= =?UTF-8?q?=E4=B8=8D=E9=A2=86=E8=A1=94=E3=80=81=E7=AB=99=E7=82=B9=E8=B6=85?= =?UTF-8?q?=E7=AE=A1=E4=BB=85=E4=BF=9D=E7=95=99=E6=93=8D=E4=BD=9C=E8=80=85?= =?UTF-8?q?=E6=9C=AC=E4=BA=BA=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98/?= =?UTF-8?q?=E6=99=AE=E9=80=9A=E8=B4=A6=E5=8F=B7=E5=9D=87=E5=8F=AF=E9=A2=86?= =?UTF-8?q?=E8=A1=94=EF=BC=89=EF=BC=9B=E7=BB=84=E9=95=BF=E6=94=B9=E9=80=89?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E4=B8=A4=E4=BB=B6=E4=BA=8B=E2=80=94=E2=80=94?= =?UTF-8?q?=E7=BB=84=E5=91=98=E5=80=99=E9=80=89=E6=8C=89=E6=96=B0=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E9=87=8D=E7=AE=97=EF=BC=88eligibleGroupMembers=20?= =?UTF-8?q?=E5=B7=B2=E5=90=83=20leaderUserId=EF=BC=89+=20=E6=8A=8A?= =?UTF-8?q?=E6=96=B0=E7=BB=84=E9=95=BF=E4=BB=8E=E5=B7=B2=E9=80=89=E7=BB=84?= =?UTF-8?q?=E5=91=98=E9=87=8C=E6=91=98=E6=8E=89=EF=BC=88=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E3=80=8C=E7=BB=84=E9=95=BF=E4=B8=8D=E8=83=BD=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E7=BB=84=E5=91=98=E9=87=8D=E5=A4=8D=E5=8A=A0=E5=85=A5=E5=88=86?= =?UTF-8?q?=E7=BB=84=E3=80=8D=EF=BC=89=EF=BC=9B=E5=88=9B=E5=BB=BA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=20createdById=3D=E6=89=80=E9=80=89=E7=BB=84=E9=95=BF?= =?UTF-8?q?=EF=BC=9B=E7=BC=96=E8=BE=91=E4=B8=8E=E9=9D=9E=E8=B6=85=E7=AE=A1?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BF=9D=E6=8C=81=E5=8F=AA=E8=AF=BB=EF=BC=88?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=9B=B4=E6=96=B0=E8=BD=BD=E8=8D=B7=E4=B8=8D?= =?UTF-8?q?=E6=94=B6=E7=BB=84=E9=95=BF/=E5=BC=BA=E5=88=B6=E7=BB=84?= =?UTF-8?q?=E9=95=BF=3D=E6=93=8D=E4=BD=9C=E8=80=85=E6=9C=AC=E4=BA=BA?= =?UTF-8?q?=EF=BC=89=EF=BC=9B=E7=BC=96=E8=BE=91=E5=8E=86=E5=8F=B2=E8=A1=8C?= =?UTF-8?q?=E7=BC=BA=20leaderUserId=20=E4=BF=9D=E6=8C=81=20null=20?= =?UTF-8?q?=E5=8F=A3=E5=BE=84=E4=B8=8D=E5=9B=9E=E8=90=BD=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BA=BA=EF=BC=88=E7=BB=84=E5=91=98=E5=80=99?= =?UTF-8?q?=E9=80=89=E8=BF=87=E6=BB=A4=E4=B8=8D=E6=82=84=E6=82=84=E5=8F=98?= =?UTF-8?q?=EF=BC=89=E3=80=82=E5=88=A4=E6=8D=AE=EF=BC=9Aalign=5Fgroup=5Fle?= =?UTF-8?q?ader=5Fcandidates=5F*=203=20=E6=94=AF=E6=96=B0=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=94=A8=E4=BE=8B=EF=BC=8Bui=5Fwiring=20=E6=94=B9?= =?UTF-8?q?=E9=92=89=E6=96=B0=E5=BD=A2=E7=8A=B6=EF=BC=88v-if=3DcanPickLead?= =?UTF-8?q?er=EF=BC=8Fv-else=20=E5=8F=AA=E8=AF=BB=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=EF=BC=8FcreatedById=3DleaderId=EF=BC=8FcompanyTab=20=E7=BB=8A?= =?UTF-8?q?=E7=BA=BF=E4=BF=9D=E7=95=99=EF=BC=89=EF=BC=8Bplatform-account-p?= =?UTF-8?q?ages=20=E8=B0=83=E7=94=A8=E5=BD=A2=E7=8A=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=9Bvue-tsc=20rc=3D0=EF=BC=9Bnode=20--test=2039/39?= =?UTF-8?q?=EF=BC=88align-group-editor=2013=EF=BC=8Btask-253=208=EF=BC=8Bp?= =?UTF-8?q?latform-account-pages=2010=EF=BC=8Btask-268=208=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/pages/account/GroupEditorDialog.vue | 66 ++++++++++++++----- .../src/pages/account/shop-group-model.ts | 24 +++++++ .../tests/align-group-editor.test.ts | 37 +++++++++-- .../tests/platform-account-pages.test.ts | 4 +- admin-frontend-vue/tests/task-253.test.ts | 2 +- 5 files changed, 110 insertions(+), 23 deletions(-) diff --git a/admin-frontend-vue/src/pages/account/GroupEditorDialog.vue b/admin-frontend-vue/src/pages/account/GroupEditorDialog.vue index a8f8add40..8e906fe89 100644 --- a/admin-frontend-vue/src/pages/account/GroupEditorDialog.vue +++ b/admin-frontend-vue/src/pages/account/GroupEditorDialog.vue @@ -3,6 +3,7 @@ import { computed, onMounted, ref, watch } from 'vue' import type { AdminUser } from '@/types/admin' import type { PlatformTabId } from '@/config/platform-scope' import { + eligibleGroupLeaders, eligibleGroupMembers, groupMemberCandidateHint, validateShopGroupForm, @@ -27,15 +28,30 @@ const errorText = ref('') const busy = ref(false) const users = ref([]) -/** 组长:新建=当前登录用户;编辑=分组原组长(不可改,只读展示)。 */ -const leaderUserId = computed(() => - props.group ? (props.group.leaderUserId ?? null) : (session.user?.id ?? null), -) -const leaderUsername = computed(() => - props.group ? (props.group.leaderUsername || '') : (session.user?.username || '当前登录用户'), -) +/** + * 组长:新建默认当前登录用户,站点超管可下拉改选(2026-11-18 用户口径,后端 validateLeaderOperator + * 对站点超管放行任意 createdById、只要求组长与操作者同公司);编辑=分组原组长(后端更新载荷不收 + * 组长,不可改);非站点超管新建时后端强制组长=操作者本人,同样只读展示。 + */ +const leaderUserId = ref(null) +/** 只有「新建 + 站点超管」出组长下拉;其余场景只读回显。 */ +const canPickLeader = computed(() => !props.group && !!props.operatorSuper) const operatorRole = computed(() => session.user?.role || '') +const leaderUsername = computed(() => { + const picked = leaderUserId.value != null + ? users.value.find((u) => u.id === leaderUserId.value) + : null + if (picked) return picked.username + if (props.group) return props.group.leaderUsername || '' + return session.user?.username || '当前登录用户' +}) + +/** 组长候选:与组员同池(本公司账号),排除公司超管;站点超管仅保留操作者本人。 */ +const leaderCandidates = computed(() => + eligibleGroupLeaders(users.value, operatorRole.value, session.user?.id ?? null), +) + /** 组员候选:按组长归属过滤(超管全量、非超管仅本组长创建的普通账号)。 */ const memberCandidates = computed(() => eligibleGroupMembers(users.value, leaderUserId.value, operatorRole.value), @@ -53,18 +69,29 @@ watch( groupName.value = props.group.name memberIds.value = props.group.memberUserIds ?? [] groupPlatform.value = props.group.platform === 'jd' ? 'jd' : 'amazon' + // 编辑保持原值口径:历史行可能没有 leaderUserId(旧负载),回落 null 而不是当前登录人, + // 否则组员候选过滤会跟着悄悄变。 + leaderUserId.value = props.group.leaderUserId ?? null } else { groupPlatform.value = props.platform ?? 'amazon' + leaderUserId.value = session.user?.id ?? null } }, ) +// 组长改选后,若该人已被选为组员要立刻摘掉——后端「组长不能作为组员重复加入分组」会打回。 +watch(leaderUserId, (id) => { + if (id == null) return + memberIds.value = memberIds.value.filter((v) => v !== id) +}) + async function loadCandidates(): Promise { try { // 对齐 admin.js loadUserOptions:page=1&page_size=999 全量拉取,避免归属过滤漏人。 // company_id 必带:不带时后端对站点超管返回全平台账号,别家公司的人就会出现在本公司分组的候选里。 - // 取的是**组长自己那家**(当前登录用户),不是公司 tab——新建时组长就是操作者本人, - // 按 tab 取人会在超管停在别家 tab 时列出那家的人,保存时被后端"只能添加组长本公司的账号"打回。 + // 取操作者自己那家,不是公司 tab——组长候选与组员候选同池,后端要求组长与操作者同公司 + // (ensureLeaderSharesOperatorCompany),按 tab 取人会在超管停在别家 tab 时列出保存必被 + // 打回的人("只能添加组长本公司的账号")。 const page = await fetchUserList({ page: 1, pageSize: 999, companyId: session.user?.companyId ?? null }) users.value = page.items } catch (error) { @@ -86,13 +113,13 @@ async function save(): Promise { await updateShopGroup(props.group.id, groupName.value, memberIds.value, groupPlatform.value) showAdminFeedback('更新成功', 'success') } else { - // 对齐 admin:组长恒为当前登录用户,提交 createdBy=当前用户 id。 - const operatorId = session.user?.id ?? 0 - if (!operatorId) { - showAdminFeedback('无法获取当前登录用户,请重新登录', 'error') + // 组长默认当前登录用户;站点超管可改选本公司其他账号(createdById=所选组长)。 + const leaderId = leaderUserId.value ?? 0 + if (!leaderId) { + showAdminFeedback('无法获取组长账号,请重新登录', 'error') return } - await createShopGroup(groupName.value, memberIds.value, operatorId, groupPlatform.value) + await createShopGroup(groupName.value, memberIds.value, leaderId, groupPlatform.value) showAdminFeedback('创建成功', 'success') } emit('saved') @@ -121,7 +148,16 @@ onMounted(loadCandidates) - + + + + 0 ? String(operatorId) : '' + const operatorIsSiteSuper = isSuperAdminRole(operatorRole) + return users.filter((u) => { + if (!isGroupIneligibleRole(u.role)) return true + // 两档超管默认不领衔;站点超管只保留操作者本人这一个例外。 + return operatorIsSiteSuper && String(u.id) === operatorKey + }) +} + /** 组员候选帮助文案(对齐 admin.js:3179-3182)。 */ export function groupMemberCandidateHint(candidateCount: number, operatorRole: string): string { if (candidateCount > 0) return '可添加当前组长创建的普通员工账号' diff --git a/admin-frontend-vue/tests/align-group-editor.test.ts b/admin-frontend-vue/tests/align-group-editor.test.ts index da5598c8d..68c92abd1 100644 --- a/admin-frontend-vue/tests/align-group-editor.test.ts +++ b/admin-frontend-vue/tests/align-group-editor.test.ts @@ -2,11 +2,12 @@ import test from 'node:test' import assert from 'node:assert/strict' import { readSource } from './helpers.ts' import { + eligibleGroupLeaders, eligibleGroupMembers, groupMemberCandidateHint, } from '../src/pages/account/shop-group-model.ts' -/** 对齐 admin.js:3020-3028 getEligibleShopManageGroupUsers 与 3179-3182 帮助文案。 */ +/** 对齐 admin.js:3020-3028 getEligibleShopManageGroupUsers 与 3179-3182 帮助文案;组长候选为 2026-11-18 新增口径。 */ const USERS = [ { id: 1, username: '组长A', role: 'admin', createdById: null }, @@ -63,21 +64,47 @@ test('align_group_candidate_hint_empty_for_admin', () => { }) test('align_group_editor_dialog_ui_wiring', () => { - // UI 接线:候选请求 page_size=999;新建时组长恒为当前登录用户(无改选下拉);候选/提示走新模型。 + // UI 接线:候选请求 page_size=999;组长默认当前登录用户,新建+站点超管出改选下拉 + // (2026-11-18 用户口径「新建分组组长要能下拉选」),编辑与非超管仍只读;候选/提示走新模型。 const dialog = readSource('src/pages/account/GroupEditorDialog.vue') assert.match(dialog, /pageSize:\s*999/, '候选列表按参考 page_size=999 拉取') - assert.doesNotMatch(dialog, /组长(创建人)/, '新建弹窗不再提供组长改选下拉') - assert.match(dialog, /当前登录用户/, '新建时组长只读显示当前登录用户') + assert.match(dialog, /canPickLeader/, '组长下拉按「新建+站点超管」条件渲染') + assert.match(dialog, /v-if="canPickLeader"/, '下拉分支挂在 canPickLeader 上') + assert.match(dialog, /eligibleGroupLeaders/, '组长候选走 eligibleGroupLeaders 过滤') + assert.match(dialog, /v-else :model-value="leaderUsername" readonly/, '编辑与非超管新建仍走只读回显') + assert.match(dialog, /当前登录用户/, '只读回显保留当前登录用户兜底') + assert.match(dialog, /memberIds\.value\.filter/, '组长改选后把该人从组员里摘掉(后端拒绝组长重复入组)') + assert.match(dialog, /createShopGroup\(groupName\.value, memberIds\.value, leaderId/, + '创建提交 createdById=所选组长(站点超管改选通道,后端 validateLeaderOperator 放行)') assert.match(dialog, /eligibleGroupMembers/, '组员候选走归属过滤') assert.match(dialog, /groupMemberCandidateHint/, '候选提示文案走对齐逻辑') assert.match(dialog, /companyId:\s*session\.user\?\.companyId \?\? null/, - '候选必须按组长(新建时=当前登录用户)那家取人:不带时后端对站点超管返回全平台账号,别家公司的人会进到这家的候选里') + '候选必须按操作者那家取人:组长必须与操作者同公司(后端 ensureLeaderSharesOperatorCompany),不带时站点超管会拿到全平台账号') assert.doesNotMatch(dialog, /companyTab/, '分组候选不能按公司 tab 取人——超管停在别家 tab 时会列出那家的人,保存必被后端打回') const page = readSource('src/pages/account/GroupsPage.vue') assert.match(page, /创建时间/, '列表补创建时间列') assert.doesNotMatch(page, /slice\(0,\s*10\)/, '组员 chips 全量渲染不再收 +N') }) +test('align_group_leader_candidates_site_super_keeps_self_drops_company_super', () => { + // 组长候选:公司超管永不领衔;站点超管只保留操作者本人(保持 admin 自建组的既有能力)。 + const result = eligibleGroupLeaders(USERS, 'super_admin', 6) + assert.deepEqual(result.map((u) => u.id), [1, 2, 3, 4, 5, 6]) +}) + +test('align_group_leader_candidates_non_super_operator_drops_all_supers', () => { + // 非站点超管操作者:两档超管全部出局(弹窗此时不出下拉,这里是同池复用方的兜底口径)。 + const result = eligibleGroupLeaders(USERS, 'admin', 1) + assert.deepEqual(result.map((u) => u.id), [1, 2, 3, 4, 5]) +}) + +test('align_group_leader_candidates_normal_accounts_can_lead', () => { + // 普通账号可领衔(既有文案背书:「当前账号只能作为组长使用」)。 + const normals = USERS.filter((u) => u.role === 'normal') + const result = eligibleGroupLeaders(normals, 'super_admin', 6) + assert.deepEqual(result.map((u) => u.id), [2, 3, 4]) +}) + test('align_group_backend_gate_super_never_joins_and_leader_shares_company', () => { // 界面收窄只是少踩一次;这两条 403 才是出口。锚在调用点与抛出语句,不锚注释。 const java = readSource( diff --git a/admin-frontend-vue/tests/platform-account-pages.test.ts b/admin-frontend-vue/tests/platform-account-pages.test.ts index 9b2f871b9..5aa07bbe4 100644 --- a/admin-frontend-vue/tests/platform-account-pages.test.ts +++ b/admin-frontend-vue/tests/platform-account-pages.test.ts @@ -123,8 +123,8 @@ test('CreateUserDialog/GroupEditorDialog/CompanyEditorDialog:平台不设手 assert.match(group, /groupPlatform\.value = props\.platform \?\? 'amazon'/, '新建分组默认当前平台 tab') assert.match(group, /props\.group\.platform === 'jd' \? 'jd' : 'amazon'/, '编辑分组回填行值') assert.doesNotMatch(group, /v-model="groupPlatform"/, '分组弹窗不设平台手选:把单选写回来即红') - assert.match(group, /createShopGroup\(groupName\.value, memberIds\.value, operatorId, groupPlatform\.value\)/, - '创建分组必须带平台') + assert.match(group, /createShopGroup\(groupName\.value, memberIds\.value, leaderId, groupPlatform\.value\)/, + '创建分组必须带平台(createdById=所选组长,2026-11-18 起超管可改选)') assert.match(group, /updateShopGroup\(props\.group\.id, groupName\.value, memberIds\.value, groupPlatform\.value\)/, '更新分组必须带平台(编辑保持行值下发)') assert.doesNotMatch(group, /companyTab/, '分组弹窗不读公司 tab(既有口径:候选按组长公司取人)') diff --git a/admin-frontend-vue/tests/task-253.test.ts b/admin-frontend-vue/tests/task-253.test.ts index 1a741bf11..b403ea873 100644 --- a/admin-frontend-vue/tests/task-253.test.ts +++ b/admin-frontend-vue/tests/task-253.test.ts @@ -20,7 +20,7 @@ test('test_task_253_group_list_normal_variant_input', () => { assert.match(page, /leaderUserId/, '判定依赖组长 leaderUserId') const editor = readSource('src/pages/account/GroupEditorDialog.vue') assert.match(editor, /组长/, '编辑弹窗含组长展示') - assert.match(editor, /当前登录用户/, '新建时组长只读为当前登录用户') + assert.match(editor, /当前登录用户/, '组长默认当前登录用户(超管新建可改选,编辑/非超管只读回显)') }) test('test_task_253_group_list_normal_repeated_operation_is_idempotent', () => {