From c4c370df2c35bfa0d893ef873da90bacb4d74f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=85=E5=B1=85?= <a1@1deMacBook-Air.local>
Date: Fri, 9 Oct 2026 16:18:56 +0800
Subject: [PATCH] =?UTF-8?q?feat(supply-chain):=20=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=95=B0=E6=8D=AE=E5=88=86=E7=B1=BB=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E3=80=8C=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E4=BE=8B=E5=A4=96?=
 =?UTF-8?q?=E3=80=8D=EF=BC=8C=E6=9D=83=E9=99=90=E7=BB=9F=E4=B8=80=E4=BB=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0=E4=B8=BA?=
 =?UTF-8?q?=E5=87=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 配置弹窗移除「数据权限例外」输入项，保存时不再写入该字段（旧配置下次保存即清空）
- 数据范围不再按人收窄：部门负责人/总负责人/普通账号一律看全部利润中心
- 设置结构、settings 接口返回与权限节点描述同步移除 dataScopeGrants
---
 .../DepartmentDistributionView.tsx            | 21 +-----
 .../lib/supply-chain-permission-settings.ts   |  4 +-
 ...y-chain-department-distribution.service.ts | 67 +++----------------
 ...pply-chain-department-distribution.test.ts | 40 ++---------
 4 files changed, 16 insertions(+), 116 deletions(-)

diff --git a/furniture-3d-system/src/app/supply-chain/management/blank-pages/DepartmentDistributionView.tsx b/furniture-3d-system/src/app/supply-chain/management/blank-pages/DepartmentDistributionView.tsx
index 1e4cf89c..fa01db0c 100644
--- a/furniture-3d-system/src/app/supply-chain/management/blank-pages/DepartmentDistributionView.tsx
+++ b/furniture-3d-system/src/app/supply-chain/management/blank-pages/DepartmentDistributionView.tsx
@@ -28,13 +28,12 @@ type SettingsDraft = {
   virtualOwnerProfitCenter: string
   ownerProfitCenterOverride: string
   profitCenterAlias: string
-  dataScopeGrants: string
   targetRows: TargetRowDraft[]
 }
 
 const EMPTY_DRAFT: SettingsDraft = {
   brandScope: '', brandOwnerAlias: '', virtualOwnerProfitCenter: '', ownerProfitCenterOverride: '',
-  profitCenterAlias: '', dataScopeGrants: '',
+  profitCenterAlias: '',
   targetRows: [{ profitCenter: '', newProductSuccess: '', newProductMoving: '', saRatio: '', saTargetRatio: '' }],
 }
 
@@ -81,18 +80,6 @@ function mapToLines(value: Record<string, string>) {
   return Object.entries(value).map(([key, item]) => `${key}=${item}`).join('\n')
 }
 
-function grantsToLines(value: Array<{ user: string; scopes: string[] }>) {
-  return value.map((grant) => `${grant.user}=${grant.scopes.join('，')}`).join('\n')
-}
-
-function linesToGrants(value: string) {
-  return value.split('\n').map((line) => line.trim()).filter(Boolean).map((line) => {
-    const separator = line.includes('=') ? '=' : line.includes('：') ? '：' : ':'
-    const [user, ...rest] = line.split(separator)
-    return { user: user.trim(), scopes: rest.join(separator).split(/[,，;；]+/).map((item) => item.trim()).filter(Boolean) }
-  }).filter((grant) => grant.user && grant.scopes.length > 0)
-}
-
 function targetRowPayload(row: TargetRowDraft | undefined) {
   return {
     newProductSuccess: Number(row?.newProductSuccess ?? 0),
@@ -245,7 +232,6 @@ export function DepartmentDistributionView({
         virtualOwnerProfitCenter: mapToLines(settings.virtualOwnerProfitCenter ?? {}),
         ownerProfitCenterOverride: mapToLines(settings.ownerProfitCenterOverride ?? {}),
         profitCenterAlias: mapToLines(settings.profitCenterAlias ?? {}),
-        dataScopeGrants: grantsToLines(settings.dataScopeGrants ?? []),
         targetRows: [
           {
             profitCenter: '',
@@ -277,7 +263,6 @@ export function DepartmentDistributionView({
         virtualOwnerProfitCenter: linesToMap(draft.virtualOwnerProfitCenter),
         ownerProfitCenterOverride: linesToMap(draft.ownerProfitCenterOverride),
         profitCenterAlias: linesToMap(draft.profitCenterAlias),
-        dataScopeGrants: linesToGrants(draft.dataScopeGrants),
         targets: targetRowPayload(draft.targetRows.find((row) => !row.profitCenter) ?? draft.targetRows[0]),
         profitCenterTargets: draft.targetRows
           .filter((row) => row.profitCenter)
@@ -405,10 +390,6 @@ export function DepartmentDistributionView({
               利润中心合并（一行一条：原利润中心=并入的利润中心，如 运营中心E=运营中心G）
               <textarea value={draft.profitCenterAlias} onChange={(event) => setDraft((current) => ({ ...current, profitCenterAlias: event.target.value }))} />
             </label>
-            <label className={styles.deptConfigField}>
-              数据权限例外（默认不需要配置：所有人都能看全部利润中心；只有这里写了花名的人才会被收窄。一行一条：花名=范围；范围支持 全部（看所有利润中心）/ 利润中心:xx / 事业部:xx / 品类部:xx / 负责人:xx，多个用逗号）
-              <textarea value={draft.dataScopeGrants} onChange={(event) => setDraft((current) => ({ ...current, dataScopeGrants: event.target.value }))} />
-            </label>
             <div className={styles.deptConfigField} style={{ gridColumn: '1 / -1' }}>
               目标参数（一行一个利润中心，可分别设置；利润中心选「默认」= 其它中心统一用这行目标）
               <table className={modalStyles.targetTable}>
diff --git a/furniture-3d-system/src/lib/supply-chain-permission-settings.ts b/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
index e6dd0dac..8f73ad1a 100644
--- a/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
+++ b/furniture-3d-system/src/lib/supply-chain-permission-settings.ts
@@ -44,7 +44,7 @@ export type SupplyChainPermissionTargetKey =
   | 'productSabc'
   // 模块权限：商品SABC打标「各部门数据分类」（可见/下载分开控制）
   | 'departmentDistribution'
-  // 商品SABC打标「各部门数据分类」的配置（品牌范围/兜底规则/数据权限例外/目标参数）
+  // 商品SABC打标「各部门数据分类」的配置（品牌范围/兜底规则/目标参数）
   | 'departmentDistributionConfig'
 
 export type SupplyChainPermissionSubject = Omit<
@@ -107,7 +107,7 @@ export const SUPPLY_CHAIN_PERMISSION_TARGETS: SupplyChainPermissionTarget[] = [
   { key: 'productSabcCalculation', label: '商品SABC打标 · 执行核算', description: '每月核算与重新生成商品SABC打标数据（页面内按钮）' },
   { key: 'departmentDistribution', label: '商品SABC打标 · 各部门数据分类', description: '按利润中心汇总的部门数据（可见、下载分别控制）' },
   { key: 'productSabc', label: '商品SABC打标 · 商品明细', description: '商品SABC打标明细页与明细导出（默认全员开放，可在用户管理后台关闭）' },
-  { key: 'departmentDistributionConfig', label: '商品SABC打标 · 部门数据配置', description: '维护品牌范围、负责人兜底、数据权限例外与目标参数（操作列控制）' },
+  { key: 'departmentDistributionConfig', label: '商品SABC打标 · 部门数据配置', description: '维护品牌范围、负责人兜底与目标参数（操作列控制）' },
 ]
 
 /**
diff --git a/furniture-3d-system/src/server/services/supply-chain-department-distribution.service.ts b/furniture-3d-system/src/server/services/supply-chain-department-distribution.service.ts
index 090e3e17..a11ee508 100644
--- a/furniture-3d-system/src/server/services/supply-chain-department-distribution.service.ts
+++ b/furniture-3d-system/src/server/services/supply-chain-department-distribution.service.ts
@@ -100,11 +100,6 @@ export function clearDepartmentDistributionCache() {
   departmentRawCache.clear()
 }
 
-export type DepartmentDataScopeGrant = {
-  user: string
-  scopes: string[]
-}
-
 export type DepartmentDistributionSettings = {
   brandScope: string[]
   brandOwnerAlias: Record<string, string>
@@ -113,7 +108,6 @@ export type DepartmentDistributionSettings = {
   profitCenterAlias: Record<string, string>
   targets: DepartmentTargets
   profitCenterTargets: DepartmentProfitCenterTargets[]
-  dataScopeGrants: DepartmentDataScopeGrant[]
 }
 
 type OwnerConfigRow = {
@@ -171,7 +165,6 @@ export function normalizeDepartmentSettings(value: unknown): DepartmentDistribut
       }
     })
     .filter((item) => item.profitCenter)
-  const grants = Array.isArray(raw.dataScopeGrants) ? raw.dataScopeGrants : []
   return {
     brandScope: cleanStringArray(raw.brandScope, DEFAULT_BRAND_SCOPE),
     brandOwnerAlias: cleanStringMap(raw.brandOwnerAlias, DEFAULT_BRAND_OWNER_ALIAS),
@@ -180,14 +173,6 @@ export function normalizeDepartmentSettings(value: unknown): DepartmentDistribut
     profitCenterAlias: cleanStringMap(raw.profitCenterAlias, DEFAULT_PROFIT_CENTER_ALIAS),
     targets: defaultTargets,
     profitCenterTargets,
-    dataScopeGrants: grants
-      .map((grant) => {
-        const item = asRecord(grant)
-        const user = String(item.user ?? '').trim()
-        const scopes = cleanStringArray(item.scopes, [])
-        return { user, scopes }
-      })
-      .filter((grant) => grant.user && grant.scopes.length > 0),
   }
 }
 
@@ -385,57 +370,21 @@ export type DepartmentViewerScope = {
 }
 
 /**
- * 「各部门数据分类」数据权限：
- *  1) 不做任何配置时，所有人都能看到全部利润中心数据（查看/导出本身由「用户管理后台」的
- *     「商品SABC打标 · 各部门数据分类」节点控制，默认开放）；
- *  2) 管理员始终全部可见；
- *  3) 只有在「数据权限例外」里显式给某人配置了范围（利润中心 / 事业部 / 品类部 / 负责人）
- *     时才会收窄；写 全部 / 所有 / * / 全公司 表示不受限。
+ * 「各部门数据分类」数据范围：不做任何按人收窄，所有人都能看到全部利润中心数据。
+ * 查看/导出权限统一以「用户管理后台」的「商品SABC打标 · 各部门数据分类」节点为准（默认开放）。
  */
 export async function resolveDepartmentViewerScope(
   user: AuthUser,
   configs: OwnerConfigRow[],
-  settings: DepartmentDistributionSettings,
 ): Promise<DepartmentViewerScope> {
   if (isAdmin(user)) return { nickname: '', isAdmin: true, allowedOwners: null, scopeLabel: '全部利润中心（管理员）' }
   const nickname = await resolveNickname(user, configs)
-  const scopes = new Set<string>()
-  for (const grant of settings.dataScopeGrants) {
-    if (grant.user !== nickname) continue
-    for (const scope of grant.scopes) scopes.add(scope)
+  return {
+    nickname,
+    isAdmin: false,
+    allowedOwners: null,
+    scopeLabel: nickname ? `全部利润中心（${nickname}）` : '全部利润中心',
   }
-  // 支持「全部」授权：scope 写 全部 / 所有 / * 即可看全部利润中心（不需要逐条列利润中心）
-  const grantsAllData = [...scopes].some((scope) => {
-    const normalized = scope.replace(/\s/g, '')
-    return normalized === '全部' || normalized === '所有' || normalized === '*' || normalized === '全公司'
-  })
-  if (grantsAllData) {
-    return { nickname, isAdmin: false, allowedOwners: null, scopeLabel: nickname ? `全部数据（授权给 ${nickname}）` : '全部数据' }
-  }
-  // 没有任何例外配置：默认全部利润中心可见，不做收窄
-  if (scopes.size === 0) {
-    return {
-      nickname,
-      isAdmin: false,
-      allowedOwners: null,
-      scopeLabel: nickname ? `全部利润中心（默认开放 · ${nickname}）` : '全部利润中心（默认开放）',
-    }
-  }
-  const allowed = new Set<string>(nickname ? [nickname] : [])
-  for (const scope of scopes) {
-    const [kind, rawValue] = scope.split(':')
-    const value = String(rawValue ?? '').trim()
-    if (!kind || !value) continue
-    for (const config of configs) {
-      if (!config.operationOwner) continue
-      if (kind === '负责人' && config.operationOwner === value) allowed.add(config.operationOwner)
-      if (kind === '事业部' && config.department === value) allowed.add(config.operationOwner)
-      if (kind === '品类部' && config.secondaryDepartment === value) allowed.add(config.operationOwner)
-      if (kind === '利润中心' && config.profitCenter === value) allowed.add(config.operationOwner)
-    }
-  }
-  const scopeLabel = [nickname ? `本人（${nickname}）` : '', ...scopes].filter(Boolean).join('、')
-  return { nickname, isAdmin: false, allowedOwners: allowed, scopeLabel }
 }
 
 function resolveProfitCenter(
@@ -816,7 +765,7 @@ export class SupplyChainDepartmentDistributionService {
 
     const settings = await loadDepartmentSettings()
     const configs = await loadOwnerConfigs()
-    const viewer = await resolveDepartmentViewerScope(input.user, configs, settings)
+    const viewer = await resolveDepartmentViewerScope(input.user, configs)
     const snapshot = await this.loadRawSnapshot(input.year, input.month)
     let result: DepartmentDistributionResult
     if (snapshot) {
diff --git a/furniture-3d-system/src/server/services/supply-chain-department-distribution.test.ts b/furniture-3d-system/src/server/services/supply-chain-department-distribution.test.ts
index 8ca54d0d..73905bca 100644
--- a/furniture-3d-system/src/server/services/supply-chain-department-distribution.test.ts
+++ b/furniture-3d-system/src/server/services/supply-chain-department-distribution.test.ts
@@ -82,27 +82,25 @@ describe('supply-chain department distribution', () => {
     expect(settings.targets.newProductSuccess).toBe(0.3)
   })
 
-  it('opens all profit centers by default and only narrows when a grant is configured', async () => {
+  it('gives everyone all profit centers (权限只看用户管理后台)', async () => {
     const configs = [
       config({ operationOwner: '比干', profitCenter: '运营中心A', department: '事业一部', departmentOwner: '比干', generalOwner: '比干' }),
       config({ operationOwner: '西门吹雪', profitCenter: '运营中心A', department: '事业二部', secondaryDepartment: '品类三部', departmentOwner: '西门吹雪', generalOwner: '無尘' }),
       config({ operationOwner: '玄女', profitCenter: '运营中心A', department: '事业二部', secondaryDepartment: '品类二部', departmentOwner: '西门吹雪', generalOwner: '無尘' }),
       config({ operationOwner: '香茗', profitCenter: '运营中心B', department: '运营一部' }),
     ]
-    const settings = normalizeDepartmentSettings(null)
 
     const admin = await resolveDepartmentViewerScope(
       { id: 'u', email: '', name: '管理员', role: 'ADMIN', status: 'ACTIVE' },
       configs,
-      settings,
     )
     expect(admin.allowedOwners).toBeNull()
+    expect(admin.scopeLabel).toContain('管理员')
 
-    // 默认（没有任何例外配置）：所有人都能看全部利润中心，不做收窄
+    // 部门负责人 / 总负责人 / 普通人员都不再收窄，全部可见
     const departmentOwner = await resolveDepartmentViewerScope(
       { id: 'u', email: '', name: '比干', role: 'USER', status: 'ACTIVE' },
       configs,
-      settings,
     )
     expect(departmentOwner.allowedOwners).toBeNull()
     expect(departmentOwner.scopeLabel).toContain('全部利润中心')
@@ -110,26 +108,14 @@ describe('supply-chain department distribution', () => {
     const generalOwner = await resolveDepartmentViewerScope(
       { id: 'u', email: '', name: '無尘', role: 'USER', status: 'ACTIVE' },
       configs,
-      settings,
     )
     expect(generalOwner.allowedOwners).toBeNull()
 
-    // 例外授权（显式配置才收窄）：香茗 只配了 利润中心:运营中心A
-    const granted = await resolveDepartmentViewerScope(
+    const ordinary = await resolveDepartmentViewerScope(
       { id: 'u', email: '', name: '香茗', role: 'USER', status: 'ACTIVE' },
       configs,
-      normalizeDepartmentSettings({ dataScopeGrants: [{ user: '香茗', scopes: ['利润中心:运营中心A'] }] }),
     )
-    expect([...(granted.allowedOwners ?? [])].sort()).toEqual(['香茗', '比干', '玄女', '西门吹雪'].sort())
-
-    // 「全部」授权：不限制利润中心
-    const full = await resolveDepartmentViewerScope(
-      { id: 'u', email: '', name: '望舒', role: 'USER', status: 'ACTIVE' },
-      configs,
-      normalizeDepartmentSettings({ dataScopeGrants: [{ user: '望舒', scopes: ['全部'] }] }),
-    )
-    expect(full.allowedOwners).toBeNull()
-    expect(full.scopeLabel).toContain('全部数据')
+    expect(ordinary.allowedOwners).toBeNull()
   })
 
   it('aggregates rows by profit center, department and owner with the manual-table metrics', async () => {
@@ -305,21 +291,5 @@ describe('supply-chain department distribution', () => {
     expect(selfResult.summary.productTotal).toBe(20)
     expect(selfResult.profitCenters.map((center) => center.profitCenter)).toEqual(['运营中心A', '运营中心B'])
     expect(selfResult.designerTotal.productTotal).toBe(10)
-
-    // 只有在「数据权限例外」里显式配置了范围，才会收窄（小计按可见数据重算）
-    clearDepartmentDistributionCache()
-    settingFindUnique.mockResolvedValue({
-      value: {
-        ...normalizeDepartmentSettings(null),
-        dataScopeGrants: [{ user: '比干', scopes: ['负责人:比干'] }],
-      },
-    })
-    const narrowedResult = await supplyChainDepartmentDistributionService.build({
-      year: 2026, month: 8,
-      user: { id: 'u', email: '', name: '比干', role: 'USER', status: 'ACTIVE' },
-      canExport: false,
-    })
-    expect(narrowedResult.summary.productTotal).toBe(10)
-    expect(narrowedResult.profitCenters.map((center) => center.profitCenter)).toEqual(['运营中心A'])
   })
 })