Revert "feat: 套装方案对比导出时配方名后附容量"
All checks were successful
Test / unit-test (push) Successful in 6s
Test / build-check (push) Successful in 4s
Test / e2e-test (push) Successful in 2m54s

This reverts commit a002ba7ef6.
This commit is contained in:
2026-04-14 23:03:17 +00:00
parent a002ba7ef6
commit 84cdb467dd

View File

@@ -267,9 +267,8 @@ async function exportExcel(mode) {
const unit = oils.unitLabel(i.oil) const unit = oils.unitLabel(i.oil)
return `${i.oil} ${i.drops}${unit}` return `${i.oil} ${i.drops}${unit}`
}).join('、') }).join('、')
const vol = volumeLabel(r)
ws.addRow([ ws.addRow([
vol ? `${r.name}${vol}` : r.name, r.name,
(r.tags || []).join('/'), (r.tags || []).join('/'),
ingredientStr, ingredientStr,
calcMaxTimes(r), calcMaxTimes(r),
@@ -288,9 +287,8 @@ async function exportExcel(mode) {
for (const r of ka.recipes) { for (const r of ka.recipes) {
const price = getSellingPrice(r._id) const price = getSellingPrice(r._id)
const margin = calcMargin(r.kitCost, price) const margin = calcMargin(r.kitCost, price)
const vol = volumeLabel(r)
ws.addRow([ ws.addRow([
vol ? `${r.name}${vol}` : r.name, r.name,
calcMaxTimes(r), calcMaxTimes(r),
Number(r.kitCost.toFixed(2)), Number(r.kitCost.toFixed(2)),
Number(r.originalCost.toFixed(2)), Number(r.originalCost.toFixed(2)),
@@ -328,8 +326,7 @@ async function exportExcel(mode) {
for (const row of crossComparison.value) { for (const row of crossComparison.value) {
const price = getSellingPrice(row.id) const price = getSellingPrice(row.id)
const vol = volumeLabel(row) const vals = [row.name]
const vals = [vol ? `${row.name}${vol}` : row.name]
if (mode === 'full') vals.push((row.tags || []).join('/')) if (mode === 'full') vals.push((row.tags || []).join('/'))
for (const ka of kitAnalysis.value) { for (const ka of kitAnalysis.value) {
const cost = row.costs[ka.id] const cost = row.costs[ka.id]