feat: 套装方案对比与导出功能 #32

Merged

hera merged 37 commits from feat/kit-comparison-export into main 2026-04-14 13:32:34 +00:00

Conversation 35 Commits 37 Files Changed 12 +1345 -33

fam commented 2026-04-13 22:26:45 +00:00

Contributor

Copy Link

Summary

• 新增套装方案对比页面，支持4个套装（芳香调理/家庭医生/居家呵护/全精油）的配方匹配和成本对比
• 按各精油原瓶价占比分摊套装总价，计算套装内每滴成本
• 支持设置配方售价，自动计算利润率
• Excel导出完整版（含成分明细）和简版，含横向对比sheet
• 修复库存页模糊匹配bug（牛至错误匹配到牛至呵护）
• 修正全精油套装油列表，所有套装加入椰子油
• 套装配置抽取到共享config/kits.js

Test plan

• 商业核算页 → 套装方案对比按钮可跳转
• 4个套装卡片显示正确价格和配方数
• 点击套装卡片切换配方列表
• 设置售价后利润率自动计算
• 导出完整版Excel：每个套装一个sheet + 横向对比sheet
• 导出简版Excel：配方名+成本+售价+利润率
• 个人库存页各套装按钮添加的精油正确（含椰子油，无误匹配）

🤖 Generated with Claude Code

## Summary - 新增套装方案对比页面，支持4个套装（芳香调理/家庭医生/居家呵护/全精油）的配方匹配和成本对比 - 按各精油原瓶价占比分摊套装总价，计算套装内每滴成本 - 支持设置配方售价，自动计算利润率 - Excel导出完整版（含成分明细）和简版，含横向对比sheet - 修复库存页模糊匹配bug（牛至错误匹配到牛至呵护） - 修正全精油套装油列表，所有套装加入椰子油 - 套装配置抽取到共享config/kits.js ## Test plan - [ ] 商业核算页 → 套装方案对比按钮可跳转 - [ ] 4个套装卡片显示正确价格和配方数 - [ ] 点击套装卡片切换配方列表 - [ ] 设置售价后利润率自动计算 - [ ] 导出完整版Excel：每个套装一个sheet + 横向对比sheet - [ ] 导出简版Excel：配方名+成本+售价+利润率 - [ ] 个人库存页各套装按钮添加的精油正确（含椰子油，无误匹配） 🤖 Generated with [Claude Code](https://claude.com/claude-code)

fam added 1 commit 2026-04-13 22:26:46 +00:00

feat: 套装方案对比与导出功能 ... cbf7294688

- 新增套装方案对比页面(KitExport.vue)，支持4个套装(芳香调理/家庭医生/居家呵护/全精油)的配方匹配和成本对比
- 按各精油原瓶价占比分摊套装总价，计算每滴套装成本
- 支持设置配方售价，自动计算利润率
- Excel导出完整版(含成分明细)和简版，含横向对比sheet
- 抽取套装配置到共享config/kits.js，Inventory页复用
- 修复库存页模糊匹配bug(牛至错误匹配到牛至呵护)
- 修正全精油套装列表(补芫荽叶/加州胡椒/罗马洋甘菊/道格拉斯冷杉/西班牙鼠尾草，修正广藿香/斯里兰卡肉桂皮名称)
- 所有套装加入椰子油

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 22:30:02 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 22:46:40 +00:00

fix: 撤销商业认证接口500错误，SELECT缺少display_name和username字段 ... c2369e9bee

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 22:47:09 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 22:50:23 +00:00

fix: 修正精油名称 西洋蓍草→西洋蓍草石榴籽, 元气→元气焕能 ... 1c1f91012d

defaults.json和数据库迁移同步更新，修复居家呵护套装少匹配1-2个油的问题。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 22:50:48 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:06:02 +00:00

fix: 油名迁移处理新旧名字同时存在的情况，避免UNIQUE冲突 ... 9562cbfe25

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:06:32 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:07:10 +00:00

fix: 西洋蓍草是正确名字，撤回误改；套装列表同步修正 ... 8600f16cea

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:07:39 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:12:39 +00:00

fix: 套装对比去掉标签列，横向对比按可做套装数从少到多排序 ... 981765e4bb

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:13:13 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:15:58 +00:00

fix: 套装方案对比仅商业认证用户可用，美化入口按钮 ... 750b247b5b

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:16:31 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:18:17 +00:00

feat: 横向对比改为会员阶梯式排列 ... ccd3607e35

- 列按套装可做配方数从少到多排（小套装左，大套装右）
- 行按可用套装数从多到少排（所有套装都能做的在上，独占的在下）
- 形成左上到右下的阶梯视觉效果
- 有值格子绿色背景，无值格子灰色，区分更明显

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:18:48 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:19:43 +00:00

fix: 套装方案对比按钮移到商业header区域，与项目列表分开 ... e4cad1e4e4

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:20:13 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:20:14 +00:00

fix: 横向对比去掉售价列 ... da00436701

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:20:43 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:20:53 +00:00

feat: 横向对比增加单买成本列（第一列） ... a8bbe77c0e

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:21:24 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:23:52 +00:00

fix: 配方名去除前缀数字，细胞律动统一为 细胞律动-XX系统 格式 ... ef87148872

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:24:19 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:24:45 +00:00

fix: 单买成本移到全精油后面；配方名末尾阿拉伯数字转中文数字 ... 4dfe1b7bb4

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fam added 1 commit 2026-04-13 23:25:10 +00:00

fix: 普拉提根基配方：2 → 普拉提根基配方二 ... 86ce634c71

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:25:14 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera commented 2026-04-13 23:25:38 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:31:46 +00:00

fix: 配方名数字加括号，无编号的同系列配方自动补（一） ... 2abd6563c7

例：灰指甲一→灰指甲（一），静脉曲张→静脉曲张（一）

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:32:14 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:34:53 +00:00

fix: 商业核算页未登录时显示登录提示，不暴露内容 ... 16b7d15981

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:35:24 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:36:42 +00:00

fix: 配方编号迁移避免重复（一），自动分配下一个可用编号 ... 7be167deeb

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:37:06 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:55:52 +00:00

feat: 配方显示容量和可做次数；套装成本不超过单买价（配件视为赠品） ... c090e5f3d6

- 每个配方名后显示容量（单次/5ml/10ml等）
- 新增可做次数列（按最先用完的精油计算）
- 套装成本分摊使用 min(套装价, 油瓶总价)，避免含配件的套装算出比单买贵

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:56:24 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-13 23:58:33 +00:00

fix: 全精油套装补充21种复配精油（DDR完美修护、保卫、乐活等） ... 2d8670bc1a

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-13 23:59:03 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:00:46 +00:00

feat: 全精油椰子油按实际295mL(2.57瓶)计算成本和可用量 ... 9fe6eeaf29

套装配置支持 bottleCount 字段指定某种油的瓶数倍率

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:01:15 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:07:01 +00:00

feat: 套装成本扣除配件价值后再分摊 ... a3d3e21085

芳香调理-香薰机¥375，家庭医生-香薰机+木盒¥475，全精油-香薰机+竹木架¥575

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:07:36 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:07:38 +00:00

fix: 居家呵护加配件扣除 香薰机+竹木架 ¥575 ... 9be7cb26c8

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:08:06 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:08:34 +00:00

fix: 芳香调理套装价格修正为¥1575 ... 796e3c7a7e

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:09:02 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:11:01 +00:00

fix: 套装折扣改为统一折扣率，配件和精油共享同一折扣 ... 385022002b

折扣率 = 套装价 / (油瓶总价 + 配件零售价)
芳香调理32.4%, 家庭医生32.8%, 居家呵护36.1%

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

fam added 1 commit 2026-04-14 00:12:02 +00:00

fix: 全精油套装 DDR完美修护 改为系统名称 完美修护 ... 15424a5ad9

全精油折扣率: 套装¥17700 / (油¥24860 + 配件¥575) = 30.4%

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:15:56 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera commented 2026-04-14 00:16:09 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 00:16:47 +00:00

test: 套装方案对比功能的单元测试和e2e测试 ... 616e51f36c

单元测试(21个): 套装配置验证、油名解析、折扣率计算、配方匹配逻辑
e2e测试(16个): 页面加载、权限控制、套装卡片、配方表格、横向对比、导出按钮

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 00:17:18 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 10:42:41 +00:00

fix: 配方保存时持久化volume字段，套装对比页复用容量显示逻辑 ... f03bf699e5

saveRecipe payload 漏传 selectedVolume 导致编辑器选择的容量从未写入数据库；
套装方案对比页改用与 RecipeCard 一致的 volumeLabel 计算逻辑。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 10:43:16 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-14 10:56:00 +00:00

fix: 原价成本→单买成本，导出简版加可做次数和单买成本列 ... 9206272a68

页面: 原价成本改为单买成本
导出简版: 配方名+可做次数+套装成本+单买成本+售价+利润率
导出完整版: 增加可做次数列，原价成本→单买成本

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 10:56:36 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 11:13:00 +00:00

fix: 芳香调理套装去掉错误的配件价值(无配件) ... d68934a952

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 11:13:33 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

fam added 1 commit 2026-04-14 11:15:13 +00:00

fix: 居家呵护套装补充仕女呵护 ... b21e798db2

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera added 1 commit 2026-04-14 12:30:08 +00:00

fix: 导出列宽 — 配方名自适应，其他列统一窄宽度，成分列35 ... 0e3bbf3ba7

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera added 1 commit 2026-04-14 12:55:04 +00:00

feat: 套装卡片显示折扣率（会员价后再X折） ... 72347493d7

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera added 1 commit 2026-04-14 12:59:55 +00:00

fix: 居家呵护套装精油数量22→23，修复单元测试 ... 142ad88cff

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 13:00:27 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-14 13:08:54 +00:00

fix: 竹木架价格200→210，配件总值575→585 ... 2f02636920

居家呵护和全精油套装的旋转竹木精油架实际价格210元。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 13:09:27 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-14 13:10:11 +00:00

fix: 全精油套装配件含2个竹木架，375+210×2=795 ... 91e77cbb42

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 13:10:44 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-14 13:16:51 +00:00

test: PR32测试 — 配件价值、折扣率、套装成本低于单买 ... b1df23c04b

新增8个测试:
- 4个配件价值验证(芳香无配件/家庭475/居家585/全精油795)
- 折扣率<1、全精油≈0.69、大套装折扣更好
- 套装成本≤单买成本

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 13:17:22 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera added 1 commit 2026-04-14 13:22:08 +00:00

fix: e2e测试原价成本→单买成本 ... ccf96d54cd

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

hera commented 2026-04-14 13:22:40 +00:00

Owner

Copy Link

🚀 Preview: https://pr-32.oil.oci.euphon.net

DB is a copy of production.

🚀 **Preview**: https://pr-32.oil.oci.euphon.net DB is a copy of production.

hera merged commit ccf96d54cd into main 2026-04-14 13:32:34 +00:00

hera commented 2026-04-14 13:32:49 +00:00

Owner

Copy Link

🗑️ Preview torn down.

🗑️ Preview torn down.

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

yoyo hera

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: hera/oil-formula-calculator#32