diff --git a/app/modules/cupang/templates/cupang/box_calc.html b/app/modules/cupang/templates/cupang/box_calc.html index d7adc52..b783e80 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 %}
@@ -1079,8 +1079,11 @@ if (!el) return; var top = el.getBoundingClientRect().top; var h = Math.max(160, window.innerHeight - top - 24); - el.style.maxHeight = h + "px"; - el.style.overflowY = "auto"; + // !important 로 박아 넣는다 — 다른 규칙에 밀리지 않게 + el.style.setProperty("max-height", h + "px", "important"); + el.style.setProperty("overflow-y", "auto", "important"); + el.style.setProperty("min-height", "0", "important"); + el.setAttribute("data-fit", h); }); } diff --git a/app/modules/cupang/templates/cupang/box_rules.html b/app/modules/cupang/templates/cupang/box_rules.html index 7d6662b..91d3f9d 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 0158f3b..2cf37c3 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/index.html b/app/modules/cupang/templates/cupang/index.html index aca1900..ffe021c 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 27fa257..ee46271 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/modules/cupang/templates/cupang/view.html b/app/modules/cupang/templates/cupang/view.html index c09a2cb..f3881a3 100644 --- a/app/modules/cupang/templates/cupang/view.html +++ b/app/modules/cupang/templates/cupang/view.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {% block content %} {# 출고 묶음 보기 — 상자 계산 화면과 같은 3열 구성. 읽기 전용(수정 없음). #} diff --git a/app/static/cupang.css b/app/static/cupang.css index e4bcc29..250650a 100644 --- a/app/static/cupang.css +++ b/app/static/cupang.css @@ -1492,3 +1492,19 @@ body.cpg-dragging { cursor: grabbing; user-select: none; } } .cpg-dist-card .cpg-dist-list::-webkit-scrollbar-thumb:hover, .cpg-dist-card::-webkit-scrollbar-thumb:hover { background: var(--color-midtone-gray); } + +/* ── 스크롤 최종 보정 — id 선택자 + !important 로 확정 ── */ +#cpg-dist-list { + max-height: 60vh !important; + overflow-y: auto !important; + min-height: 0 !important; +} +.cpg-calc-card .erp-table-wrap { + max-height: 52vh !important; + overflow-y: auto !important; +} +.cpg-calc-sum .cpg-sum-scroll { + max-height: 52vh !important; + overflow-y: auto !important; +} +.cpg-calc3 > .erp-card { max-height: 86vh !important; }