diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index 9397e16..ab83b4c 100644 --- a/app/modules/cupang/templates/cupang/box_calc.html +++ b/app/modules/cupang/templates/cupang/box_calc.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
@@ -100,10 +100,7 @@ var optionsHtml = ''; rules.forEach(function (r) { - // 드롭다운 폭을 줄이려고 "쿠팡 " 접두어를 떼고 짧게 표기한다. 예: 미라네 1호 세트 (2호·8) - var shortBox = (r.box_name || "-").replace(/^쿠팡\s*/, ""); - var label = (r.product_name_snapshot || r.product_code) + - " (" + shortBox + "·" + r.units_per_box + ")"; + var label = r.product_name_snapshot || r.product_code; optionsHtml += '"; }); @@ -204,10 +201,7 @@ ""; } - // "쿠팡 2호" → "2호" (상자 그림 안에 넣을 짧은 이름) - function shortBoxName(name) { - return String(name || "").replace(/^쿠팡\s*/, "").trim() || "박스"; - } + function renderSummary(results, mixes, grandTotal) { var ok = results.filter(function (r) { return r.configured; }); @@ -254,7 +248,7 @@ return '
  • ' + esc(it.product_name) + "" + it.quantity + "개
    • "; }).join(""); bh += '
    ' + - '
    ' + boxSvg(b.fill_percent, shortBoxName(m.box_name)) + "
    " + + '
    ' + boxSvg(b.fill_percent, "쿠팡박스") + "
    " + '
    ' + '
    ' + esc(m.box_name) + " 혼합 #" + (i + 1) + "
    " + '
      ' + items + "
    " + diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index ba3587f..daac23e 100644 --- a/app/modules/cupang/templates/cupang/box_rules.html +++ b/app/modules/cupang/templates/cupang/box_rules.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/centers.html b/app/modules/cupang/templates/cupang/centers.html index 0562c22..37f7ea2 100644 --- a/app/modules/cupang/templates/cupang/centers.html +++ b/app/modules/cupang/templates/cupang/centers.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/detail.html b/app/modules/cupang/templates/cupang/detail.html index 16469ea..7e61157 100644 --- a/app/modules/cupang/templates/cupang/detail.html +++ b/app/modules/cupang/templates/cupang/detail.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/form.html b/app/modules/cupang/templates/cupang/form.html index 592a5ff..58f1adb 100644 --- a/app/modules/cupang/templates/cupang/form.html +++ b/app/modules/cupang/templates/cupang/form.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/index.html b/app/modules/cupang/templates/cupang/index.html index cb20f5c..8aa8ca7 100644 --- a/app/modules/cupang/templates/cupang/index.html +++ b/app/modules/cupang/templates/cupang/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/modules/cupang/templates/cupang/products.html b/app/modules/cupang/templates/cupang/products.html index 037ba8c..95d5154 100644 --- a/app/modules/cupang/templates/cupang/products.html +++ b/app/modules/cupang/templates/cupang/products.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %}
    diff --git a/app/static/cupang.css b/app/static/cupang.css index 25b4564..8061b27 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -331,7 +331,7 @@ .cpg-calc-table { table-layout: fixed; width: 100%; } .cpg-calc-table th, .cpg-calc-table td { padding: 8px 6px; } .cpg-calc-table .cpg-calc-num { text-align: right; white-space: nowrap; } -.cpg-calc-table th.cpg-calc-num { text-align: right; } + .cpg-calc-table .cpg-calc-name { width: 100%; min-width: 0; } .cpg-calc-table .cpg-calc-qty { width: 100%; min-width: 0; text-align: right; padding-left: 6px; padding-right: 6px; } .cpg-calc-table .cpg-calc-box { white-space: nowrap; font-size: 13px; } @@ -344,9 +344,13 @@ .cpg-calc-table col.cpg-col-box { width: 116px; } .cpg-calc-table col.cpg-col-n { width: 64px; } .cpg-calc-table col.cpg-col-act { width: 40px; } -/* fixed 레이아웃에서 내용이 셀 밖으로 삐져나와 가로 스크롤이 생기는 것을 막는다. */ -.cpg-calc-table th, .cpg-calc-table td { overflow: hidden; text-overflow: ellipsis; } -.cpg-calc-table thead th { white-space: nowrap; } +/* fixed 레이아웃에서 내용이 셀 밖으로 삐져나와 가로 스크롤이 생기는 것을 막는다. + 말줄임(…)은 글자 셀에만 준다 — input/button 이 든 셀에 주면 빈 "…" 이 그려진다. */ +.cpg-calc-table th, .cpg-calc-table td { overflow: hidden; } +.cpg-calc-table thead th { white-space: nowrap; text-align: center; font-weight: 700; color: var(--color-rich-black); } +.cpg-calc-table .cpg-calc-box { text-overflow: ellipsis; } +/* 숫자열 헤더도 가운데 정렬(본문 셀은 우측 정렬 유지) */ +.cpg-calc-table thead th.cpg-calc-num { text-align: center; } .cpg-calc-row.cpg-calc-warn { background: color-mix(in srgb, var(--color-callout-red) 8%, transparent); } .cpg-calc-actions { margin-top: 12px; gap: 8px; align-items: center; } /* 상단선 정렬: 2열 그리드에서는 위 여백을 주지 않는다. */ @@ -565,7 +569,7 @@ /* 상자 그림 안 박스 호수 라벨 (예: 2호) */ .cpg-box-label { font-family: inherit; - font-size: 15px; + font-size: 11px; font-weight: 700; fill: #8a5a1e; paint-order: stroke;