From 84cdb467dd7a9467dabf5dd48aa479a4ceedd4bc Mon Sep 17 00:00:00 2001 From: Hera Zhao Date: Tue, 14 Apr 2026 23:03:17 +0000 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E5=A5=97=E8=A3=85=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E5=AF=B9=E6=AF=94=E5=AF=BC=E5=87=BA=E6=97=B6=E9=85=8D?= =?UTF-8?q?=E6=96=B9=E5=90=8D=E5=90=8E=E9=99=84=E5=AE=B9=E9=87=8F"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a002ba7ef6c4e43cd5db28d5ba66164423e9ff2c. --- frontend/src/views/KitExport.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/frontend/src/views/KitExport.vue b/frontend/src/views/KitExport.vue index 8b60eb2..d069c1b 100644 --- a/frontend/src/views/KitExport.vue +++ b/frontend/src/views/KitExport.vue @@ -267,9 +267,8 @@ async function exportExcel(mode) { const unit = oils.unitLabel(i.oil) return `${i.oil} ${i.drops}${unit}` }).join('、') - const vol = volumeLabel(r) ws.addRow([ - vol ? `${r.name}(${vol})` : r.name, + r.name, (r.tags || []).join('/'), ingredientStr, calcMaxTimes(r), @@ -288,9 +287,8 @@ 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([ - vol ? `${r.name}(${vol})` : r.name, + r.name, calcMaxTimes(r), Number(r.kitCost.toFixed(2)), Number(r.originalCost.toFixed(2)), @@ -328,8 +326,7 @@ async function exportExcel(mode) { for (const row of crossComparison.value) { const price = getSellingPrice(row.id) - const vol = volumeLabel(row) - const vals = [vol ? `${row.name}(${vol})` : row.name] + const vals = [row.name] if (mode === 'full') vals.push((row.tags || []).join('/')) for (const ka of kitAnalysis.value) { const cost = row.costs[ka.id]