king/dbx-main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

style(malaysia): 입수량·박스 한 줄 + 칸 합계 제거

Browse Source 
- 입수량/박스 입력을 한 줄로(.rk-line)
- 칸 ∑ 합계 제거 — 서로 다른 상품을 합산해 의미 없음(입력·랙보기 양쪽)
- 상품별 행 소계(합계)는 유지(개별 SKU 기준 유효)
- malaysia_rack.js: 칸 합계 로직 삭제, 행 소계만 갱신

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
king
2026-06-14 17:10:49 +09:00
parent b24a418718
commit eacde5b322
3 changed files with 14 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/malaysia/templates/malaysia/rack_view.html
-4
View File
@@ -16,7 +16,6 @@
font-size:11px; font-weight:600; color:#475569; margin-bottom:4px;
border-bottom:1px solid #e2e8f0; padding-bottom:3px;
}
.rv-cell-head .rv-total { color:#0f172a; white-space:nowrap; }
.rv-items { display:flex; flex-direction:column; gap:3px; }
.rv-item { font-size:11px; line-height:1.25; }
.rv-item .rv-name { font-weight:600; color:#0f172a; }
@@ -56,12 +55,9 @@
{% for col in row.cols %}
{% for cell in col %}
{% set entries = rack_by_cell.get(cell, []) %}
{% set ns = namespace(total=0) %}
{% for e in entries %}{% set ns.total = ns.total + e.total %}{% endfor %}
<div class="rv-cell {% if not entries %}is-empty{% endif %}">
<div class="rv-cell-head">
<span>{{ cell }}</span>
<span class="rv-total">∑ {{ "{:,}".format(ns.total) }}</span>
</div>
<div class="rv-items">
{% for e in entries %}
app/modules/malaysia/templates/malaysia/stocktake_detail.html
+12 -11
View File
@@ -9,12 +9,14 @@
<option value="{{ it.item_code }}" {% if entry and entry.sku_code == it.item_code %}selected{% endif %}>{{ it.item_name }}</option>
{% endfor %}
</select>
<label class="rk-f"><span>입수량</span>
<input class="erp-input rk-upb" type="number" min="1" name="rk_upb"
value="{{ entry.units_per_box if entry else '' }}" {% if disabled %}disabled{% endif %} /></label>
<label class="rk-f"><span>박스</span>
<input class="erp-input rk-box" type="number" min="1" name="rk_box"
value="{{ entry.box_count if entry else '' }}" {% if disabled %}disabled{% endif %} /></label>
<div class="rk-line">
<label class="rk-f"><span>입수량</span>
<input class="erp-input rk-upb" type="number" min="1" name="rk_upb"
value="{{ entry.units_per_box if entry else '' }}" {% if disabled %}disabled{% endif %} /></label>
<label class="rk-f"><span>박스</span>
<input class="erp-input rk-box" type="number" min="1" name="rk_box"
value="{{ entry.box_count if entry else '' }}" {% if disabled %}disabled{% endif %} /></label>
</div>
<div class="rk-foot">
<span><span class="i18n">합계</span> <b class="rk-sub">{{ "{:,}".format(entry.units_per_box * entry.box_count) if entry else 0 }}</b></span>
{% if not disabled %}<button type="button" class="rk-del" title="행 삭제">× <span class="i18n">삭제</span></button>{% endif %}
@@ -52,7 +54,6 @@
display:flex; align-items:center; gap:4px; justify-content:space-between;
font-size:11px; font-weight:600; color:#475569; margin-bottom:4px;
}
.rack-cell-head .rk-cell-total { color:#0f172a; white-space:nowrap; }
.rack-cell-head .rk-add {
border:1px solid #94a3b8; background:#fff; border-radius:4px;
width:20px; height:20px; line-height:1; padding:0; cursor:pointer; font-weight:700; flex:0 0 auto;
@@ -64,8 +65,9 @@
border:1px solid #e2e8f0; border-radius:5px; background:#fff; padding:4px;
}
.rk-row .rk-sku { font-size:12px; padding:2px 4px; width:100%; min-width:0; }
.rk-row .rk-f { display:flex; align-items:center; gap:4px; font-size:11px; margin:0; }
.rk-row .rk-f > span { flex:0 0 38px; color:#64748b; }
.rk-row .rk-line { display:flex; gap:6px; }
.rk-row .rk-f { display:flex; align-items:center; gap:3px; font-size:11px; margin:0; flex:1 1 0; min-width:0; }
.rk-row .rk-f > span { flex:0 0 auto; color:#64748b; }
.rk-row .rk-upb, .rk-row .rk-box {
flex:1 1 auto; min-width:0; font-size:12px; padding:2px 4px; text-align:right;
}
@@ -119,7 +121,6 @@
<div class="rack-cell" data-cell="{{ cell }}">
<div class="rack-cell-head">
<span>{{ cell }}</span>
<span class="rk-cell-total">∑ <b class="rk-cell-total-v">0</b></span>
{% if is_draft %}<button type="button" class="rk-add" title="아이템 추가">+</button>{% endif %}
</div>
<div class="rk-rows">
@@ -193,5 +194,5 @@
</div>
</div>
</section>
<script src="/static/malaysia_rack.js?v=20260614b"></script>
<script src="/static/malaysia_rack.js?v=20260614c"></script>
{% endblock %}