From 3cfca462ce7d31b51a79f68258ecc659e47c140a 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, 11 Nov 2026 11:27:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(appearance-patent):=20=E5=A4=96=E8=A7=82?= =?UTF-8?q?=E4=B8=93=E5=88=A9=E6=95=B0=E6=8D=AE=E5=BA=93=E5=8D=A1=E7=89=87?= =?UTF-8?q?=E6=8C=89=E6=89=80=E5=B1=9E=E4=B8=BB=E7=AE=A1=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=EF=BC=8B=E5=AD=97=E6=AE=B5=E7=B2=BE=E7=AE=80?= =?UTF-8?q?=EF=BC=882026-11-11=20=E5=AE=A2=E6=88=B7=E6=8B=8D=E6=9D=BF?= =?UTF-8?q?=E3=80=8C=E8=A6=81=E6=8C=89=E4=B8=BB=E7=AE=A1=E5=88=86=E7=BB=84?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=8D=E3=80=8C=E4=BB=B7=E6=A0=BC=20asin?= =?UTF-8?q?=20=E6=97=A0=E4=BE=B5=E6=9D=83=20=E8=BF=99=E4=BA=9B=E9=83=BD?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=E7=9A=84=E3=80=8D?= =?UTF-8?q?=E3=80=8C=E5=88=B0=E6=97=B6=E5=80=99=E8=83=BD=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=9C=8B=E5=B0=B1=E8=A1=8C=E3=80=8D=EF=BC=89?= =?UTF-8?q?=E2=80=94=E2=80=94=E5=8D=A1=E7=89=87=E6=8C=89=E4=B8=BB=E7=AE=A1?= =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E5=88=87=E6=AE=B5=EF=BC=8C=E7=BB=84=E5=A4=B4?= =?UTF-8?q?=EF=BC=9D=E4=B8=BB=E7=AE=A1=E5=90=8D=EF=BC=8B=E6=9C=AC=E9=A1=B5?= =?UTF-8?q?=E6=9D=A1=E6=95=B0=EF=BC=88=E4=BF=9D=E6=8C=81=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=AB=AF=20synced=5Fat=20DESC=20=E8=A1=8C=E5=BA=8F=E3=80=81?= =?UTF-8?q?=E4=B8=8D=E8=B7=A8=E9=A1=B5=E8=81=9A=E5=90=88=E3=80=81=E4=B8=8D?= =?UTF-8?q?=E6=8C=89=E5=90=8D=E9=87=8D=E6=8E=92=EF=BC=9B=E5=90=8C=E5=90=8D?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=E8=A2=AB=E9=9A=94=E5=BC=80=E6=8C=89=E8=A1=8C?= =?UTF-8?q?=E5=BA=8F=E5=87=BA=E5=A4=9A=E4=B8=AA=E5=90=8C=E5=90=8D=E7=BB=84?= =?UTF-8?q?=E5=A4=B4=EF=BC=8C=E5=8F=AA=E7=9C=8B=E5=8D=95=E4=BA=BA=E8=B5=B0?= =?UTF-8?q?=E6=97=A2=E6=9C=89=E5=88=86=E7=BB=84=E4=B8=8B=E6=8B=89=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=E5=8D=A1=E7=89=87=E5=AD=97=E6=AE=B5=E7=B2=BE=E7=AE=80?= =?UTF-8?q?=E4=B8=BA=20=E6=A0=87=E9=A2=98=EF=BC=88=E5=8D=A1=E5=A4=B4?= =?UTF-8?q?=E6=9B=BF=E4=B8=8B=20ASIN=EF=BC=89/=E4=BB=BB=E5=8A=A1/=E5=9B=BD?= =?UTF-8?q?=E5=AE=B6/=E5=93=81=E7=89=8C/SKU/=E5=90=8C=E6=AD=A5=EF=BC=8C?= =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E3=80=81ASIN=E3=80=81=E7=BB=93=E8=AE=BA?= =?UTF-8?q?=E5=BE=BD=E7=AB=A0=EF=BC=88=E6=97=A0=E4=BE=B5=E6=9D=83=EF=BC=89?= =?UTF-8?q?=E3=80=81=E6=89=80=E5=B1=9E=E4=B8=BB=E7=AE=A1=E8=A1=8C=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E4=B8=8B=E5=8D=A1=EF=BC=88=E4=B8=BB=E7=AE=A1=E7=94=B1?= =?UTF-8?q?=E7=BB=84=E5=A4=B4=E8=A1=A8=E8=BE=BE=EF=BC=8C=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=90=AB=E4=BB=B7=E6=A0=BC/ASIN/=E7=BB=93?= =?UTF-8?q?=E8=AE=BA/=E4=B8=BB=E7=AE=A1=E5=88=97=E4=BB=8D=E8=B5=B0=20/expo?= =?UTF-8?q?rt=20xlsx=EF=BC=89=EF=BC=9B=E9=80=80=E5=BD=B9=20cleanItemReason?= =?UTF-8?q?Tooltip=EF=BC=88=E5=94=AF=E4=B8=80=E6=B6=88=E8=B4=B9=E8=80=85?= =?UTF-8?q?=EF=BC=9D=E7=BB=93=E8=AE=BA=E5=BE=BD=E7=AB=A0=E6=82=AC=E5=81=9C?= =?UTF-8?q?=EF=BC=89=EF=BC=9B=E5=8F=96=E6=95=B0/=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E9=9D=A2/=E5=AF=BC=E5=87=BA/=E5=85=AC=E5=8F=B8tab=E5=A5=91?= =?UTF-8?q?=E7=BA=A6=E4=B8=80=E5=AD=97=E6=9C=AA=E5=8A=A8=EF=BC=88company-t?= =?UTF-8?q?ab-wiring=20watch=20token=20=E4=B8=8E=20date-filter=20=E8=B1=81?= =?UTF-8?q?=E5=85=8D=E7=85=A7=E6=97=A7=EF=BC=89=EF=BC=9B=E6=8C=82=E8=BD=BD?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=2011=E2=86=9213=20=E4=BE=8B=E9=80=82?= =?UTF-8?q?=E9=85=8D=EF=BC=88=E5=88=86=E7=BB=84=E5=88=87=E6=AE=B5=EF=BC=8B?= =?UTF-8?q?=E7=BB=84=E5=A4=B4=E8=AE=A1=E6=95=B0=EF=BC=8F=E8=BF=9E=E7=BB=AD?= =?UTF-8?q?=E5=88=87=E6=AE=B5=E4=B8=8D=E9=87=8D=E6=8E=92=EF=BC=8F=E7=A9=BA?= =?UTF-8?q?=E4=B8=BB=E7=AE=A1=20-=20=E4=B8=89=E7=94=A8=E4=BE=8B=E6=96=B0?= =?UTF-8?q?=E9=92=89=EF=BC=8CASIN/=E4=BB=B7=E6=A0=BC/=E5=BE=BD=E7=AB=A0?= =?UTF-8?q?=E5=8F=8D=E6=96=AD=E8=A8=80=EF=BC=89=EF=BC=8Cvue-tsc=20rc=3D0?= =?UTF-8?q?=E3=80=81vitest=2013=20=E7=BB=BF=E3=80=81=E6=89=AB=E6=9C=AC?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=89=E6=94=AF=20node=20--test=2021=20?= =?UTF-8?q?=E7=BB=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patent/AppearancePatentCleanItemsPage.vue | 171 ++++++++---------- .../patent/appearance-patent-clean-model.ts | 9 - .../appearance-patent-clean-page.test.ts | 64 +++++-- 3 files changed, 124 insertions(+), 120 deletions(-) diff --git a/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue b/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue index 1aaf76f8b..c4f5967df 100644 --- a/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue +++ b/admin-frontend-vue/src/pages/patent/AppearancePatentCleanItemsPage.vue @@ -9,7 +9,13 @@ import { formatDateTime, orderedPair } from '@/utils/datetime' * (task_id/asin)与前端过滤模块逐字对撞护栏原样保留,只是 UI 不再暴露。数据由出表成功点 * 自动同步(后端 SyncService),本页零写操作:无编辑/导入;单条明细没有可下载文件,下载/导出 * 统一走既有 /export 全量出 xlsx(带当前过滤面 + 公司 tab,含所属主管列)。分组下拉选项与去重页 - * 共用 GET /shop-manages/groups,选中后以 group_id 走同一过滤面(列表与导出同源)。 */ + * 共用 GET /shop-manages/groups,选中后以 group_id 走同一过滤面(列表与导出同源)。 + * 同日三改(客户「要按主管分组显示」「价格 asin 无侵权 这些都不需要展示的」「到时候能下载 + * 表格看就行」):卡片按所属主管连续分组——组头=主管名+本页条数(grid 全宽一行),组内行序 + * 保持服务端 synced_at DESC 原样,不跨页聚合、不按名重排(跨主管交错时按行序出多个同名组头, + * 忠实反映同步顺序;要只看一个主管用分组下拉过滤)。卡片字段同批精简:只留 标题(卡头,替下 + * 原 ASIN 卡头)/任务/国家/品牌/SKU/同步;价格、ASIN、结论徽章(无侵权)、所属主管行不再 + * 上卡——全量明细(含价格/ASIN/结论/主管列)仍走 /export xlsx。 */ import { computed, onMounted, reactive, ref, watch } from 'vue' import { exportAppearancePatentCleanList, @@ -18,7 +24,6 @@ import { type DedupeGroupOption, } from './appearance-patent-clean-api.ts' import type { AppearancePatentCleanItem } from './appearance-patent-clean-model.ts' -import { cleanItemReasonTooltip } from './appearance-patent-clean-model.ts' import { createAppearancePatentCleanFilterState } from './appearance-patent-clean-filter.ts' import { ASIN_COUNTRY_CODES, asinCountryLabel } from '../asin/asin-country.ts' import OldPagination from '@/components/OldPagination.vue' @@ -50,15 +55,19 @@ function clampDatePair(): void { const totalPages = computed(() => Math.max(1, Math.ceil(total.value / pageSize.value))) -/** 结论徽章档位:先判「无侵权」再判「侵权」(『无侵权』串里也含『侵权』二字),其余中性灰。 - * 本页同步面只进「结论=无侵权」的行,绿色是常态;兜住服务端将来放宽同步口径的展示。 */ -function conclusionBand(conclusion: string): 'success' | 'failed' | 'cancelled' { - const text = (conclusion || '').trim() - if (!text) return 'cancelled' - if (text.includes('无侵权')) return 'success' - if (text.includes('侵权') || text.includes('风险') || text.includes('存疑')) return 'failed' - return 'cancelled' -} +/** 主管分组视图(2026-11-11 三改「要按主管分组显示」):按服务端下发顺序(synced_at DESC)把 + * 连续同主管的行切段,组头带本页条数;只在当前页窗口内分组——不跨页聚合、不按名重排, + * 同名主管被别的主管隔开时按行序出多个同名组头。读不到主管名不猜,展示 -。 */ +const groupedRows = computed<{ name: string; items: AppearancePatentCleanItem[] }[]>(() => { + const groups: { name: string; items: AppearancePatentCleanItem[] }[] = [] + for (const row of rows.value) { + const name = row.supervisorName || '-' + const last = groups[groups.length - 1] + if (last && last.name === name) last.items.push(row) + else groups.push({ name, items: [row] }) + } + return groups +}) /** 分组选项与去重页/店铺管理同源(GET /shop-manages/groups);失败静默回空——分组只是筛选项, * 不该让它把首屏行集一起拖死(列表失败有自己的 LoadFailureBar)。 */ @@ -208,48 +217,40 @@ onMounted(() => {
-