套装方案对比导出时配方名后附容量 #37

Merged
fam merged 3 commits from feat/kit-export-volume into main 2026-04-15 09:15:14 +00:00
Showing only changes of commit 0ce14352f1 - Show all commits

View File

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