hera/oil-formula-calculator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feat: 商业核算+个人库存+认证优化 #23

Merged
hera merged 14 commits from feat/inventory-commercial into main 2026-04-11 10:47:08 +00:00
Conversation 16 Commits 14 Files Changed 8 +27 -25
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c12590039b - Show all commits

52
frontend/src/views/Projects.vue
View File

@@ -57,7 +57,7 @@
class="proj-name-input"
@blur="saveProject"
/>
<button class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
<button v-if="!isDemoMode || auth.isAdmin" class="btn-outline btn-sm" @click="importFromRecipe">📋 从配方导入</button>
</div>
<!-- Ingredients Table -->
@@ -174,21 +174,21 @@
</div>
<div class="profit-col">
<h4>📊 利润分析</h4>
<div class="profit-item">
<span class="profit-label">单件利润</span>
<span class="profit-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</span>
<div class="profit-card">
<div class="profit-card-label">单件利润</div>
<div class="profit-card-value" :class="{ negative: unitProfit < 0 }">{{ oils.fmtPrice(unitProfit) }}</div>
</div>
<div class="profit-item">
<span class="profit-label">利润率</span>
<span class="profit-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</span>
<div class="profit-card">
<div class="profit-card-label">利润率</div>
<div class="profit-card-value" :class="{ negative: profitMargin < 0 }">{{ profitMargin.toFixed(1) }}%</div>
</div>
<div class="profit-item">
<span class="profit-label">批量总利润</span>
<span class="profit-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</span>
<div class="profit-card">
<div class="profit-card-label">批量总利润</div>
<div class="profit-card-value" :class="{ negative: batchProfit < 0 }">{{ oils.fmtPrice(batchProfit) }}</div>
</div>
<div class="profit-item">
<span class="profit-label">批量总收入</span>
<span class="profit-value">{{ oils.fmtPrice(batchRevenue) }}</span>
<div class="profit-card">
<div class="profit-card-label">批量总收入</div>
<div class="profit-card-value">{{ oils.fmtPrice(batchRevenue) }}</div>
</div>
</div>
</div>
@@ -702,13 +702,16 @@ function formatDate(d) {
.price-row {
display: flex;
align-items: center;
padding: 8px 0;
justify-content: space-between;
padding: 6px 0;
border-bottom: 1px solid #eae8e5;
font-size: 14px;
gap: 12px;
font-size: 13px;
}
.price-row .price-label { flex: 0 0 80px; }
.price-row .price-value, .price-row .price-input-wrap, .price-row .form-input-inline { flex: 1; }
.price-row .price-label { color: #6b6375; }
.price-row .price-value { text-align: right; font-weight: 600; }
.price-row .price-input-wrap { display: flex; align-items: center; gap: 2px; }
.price-row .form-input-inline, .price-row input[type="number"] { width: 70px; text-align: right; padding: 4px 6px; border: 1px solid #d4cfc7; border-radius: 6px; font-size: 13px; font-family: inherit; outline: none; }
.price-row .form-input-inline:focus, .price-row input[type="number"]:focus { border-color: #7ec6a4; }
.price-row.total {
border-top: 2px solid #d4cfc7;
@@ -760,14 +763,13 @@ function formatDate(d) {
flex: 1; padding: 14px; background: #f8f7f5; border-radius: 12px; border: 1.5px solid #e5e4e7;
}
.pricing-col h4, .profit-col h4 { margin: 0 0 10px; font-size: 14px; color: #3e3a44; }
.profit-item {
display: flex; justify-content: space-between; align-items: center;
padding: 8px 0; border-bottom: 1px solid #eae8e5; font-size: 14px;
.profit-card {
padding: 10px 12px; background: #fff; border-radius: 10px;
border: 1.5px solid #e5e4e7; text-align: center; margin-bottom: 6px;
}
.profit-item:last-child { border-bottom: none; }
.profit-label { color: #6b6375; font-size: 13px; }
.profit-value { font-size: 16px; font-weight: 700; color: #4a9d7e; }
.profit-value.negative { color: #ef5350; }
.profit-card-label { font-size: 12px; color: #6b6375; margin-bottom: 2px; }
.profit-card-value { font-size: 18px; font-weight: 700; color: #4a9d7e; }
.profit-card-value.negative { color: #ef5350; }
.notes-textarea {
width: 100%;