diff --git a/app/modules/performance/templates/performance/index.html b/app/modules/performance/templates/performance/index.html index 98b54da..625a468 100644 --- a/app/modules/performance/templates/performance/index.html +++ b/app/modules/performance/templates/performance/index.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro won(v) -%} {%- if v is none -%} @@ -239,4 +239,4 @@ } | tojson }} {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/modules/performance/templates/performance/settings.html b/app/modules/performance/templates/performance/settings.html index 72169ec..fc46907 100644 --- a/app/modules/performance/templates/performance/settings.html +++ b/app/modules/performance/templates/performance/settings.html @@ -1,6 +1,6 @@ {% extends "erp_base.html" %} -{% block head_extra %}{% endblock %} +{% block head_extra %}{% endblock %} {%- macro when(v) -%}{{ (v or '')[:16] | replace('T', ' ') or '—' }}{%- endmacro -%} @@ -192,4 +192,4 @@ {% endblock %} -{% block scripts %}{% endblock %} +{% block scripts %}{% endblock %} diff --git a/app/static/performance.css b/app/static/performance.css index eab47dd..76057f7 100644 --- a/app/static/performance.css +++ b/app/static/performance.css @@ -157,6 +157,7 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; } .perf-modal { position: fixed; inset: 0; z-index: 1000; background: rgba(0, 0, 0, .35); display: flex; align-items: center; justify-content: center; padding: 20px; } .perf-modal-card { background: #fff; border-radius: 14px; width: min(1100px, 100%); max-height: 88vh; display: flex; flex-direction: column; box-shadow: 0 20px 60px rgba(0, 0, 0, .25); } .perf-modal-card.is-narrow { width: min(560px, 100%); } +.perf-modal-card.is-wide { width: min(1640px, 100%); } /* 주문 내역 — 열이 많아 넓게 */ .perf-modal-head { display: flex; align-items: center; justify-content: space-between; gap: 10px; padding: 14px 16px; border-bottom: 1px solid var(--perf-line); } .perf-modal-head h3 { margin: 0; font-size: 15px; font-weight: 600; } .perf-modal-body { padding: 12px 16px; overflow: auto; } @@ -229,6 +230,8 @@ td.is-link:hover { background: #eef2ff; text-decoration: underline; } .perf-ev-table thead th { background: var(--perf-soft, #fafafa); box-shadow: 0 1px 0 var(--perf-line, #e5e5e5); } /* 취소 행 — 행 전체를 기울임 + 취소선 + 회색 */ .perf-ev-table tr.is-cancel td { font-style: italic; text-decoration: line-through; color: #9a9a9a; } +/* 상품명만 줄바꿈 — 긴 상품명 때문에 표가 창보다 넓어져 가로 스크롤이 생기지 않게(나머지 열은 한 줄) */ +.perf-ev-table .perf-ev-name { white-space: normal; min-width: 220px; overflow-wrap: anywhere; } /* ── 매출 업데이트 진행 창 — 쇼핑몰별·전체 진행 막대(runSyncWithProgress) ── */ .perf-prog-card { width: min(640px, 100%); } diff --git a/app/static/performance.js b/app/static/performance.js index 5380ce2..695a7ee 100644 --- a/app/static/performance.js +++ b/app/static/performance.js @@ -54,7 +54,8 @@ function openModal(title, opts) { opts = opts || {}; const back = el("div", { class: "perf-modal" }); - const card = el("div", { class: "perf-modal-card" + (opts.narrow ? " is-narrow" : ""), role: "dialog", "aria-modal": "true" }); + const card = el("div", { class: "perf-modal-card" + (opts.narrow ? " is-narrow" : opts.wide ? " is-wide" : ""), + role: "dialog", "aria-modal": "true" }); const head = el("div", { class: "perf-modal-head" }); head.appendChild(el("h3", { text: title })); const x = el("button", { type: "button", class: "perf-modal-x", "aria-label": "닫기" }, "×"); @@ -335,7 +336,7 @@ async function openEvents(code, from, to) { const name = (data.names || {})[code] || code; const title = name + " · " + (from === to ? from : from + " ~ " + to) + " 주문 내역"; - const m = openModal(title); + const m = openModal(title, { wide: true }); // 넓은 창 + 상품명 줄바꿈 → 가로 스크롤 없이 m.body.innerHTML = '
불러오는 중…
'; try { const res = await api("GET", "/performance/api/events?code=" + encodeURIComponent(code) + @@ -351,7 +352,7 @@ "| 매출일 | 구분 | 주문번호 | ' + - '상품명 | 수량 | 금액 | 주문일 | ' + + '상품명 | 수량 | 금액 | 주문일 | ' + '결제일 | 상태 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 결제 ' + fmt(sales) + " / 취소·반품 " + fmt(minus) + ' | ' + fmt(sum) + ' | |||||||||||