Merge branch 'fix/inout-over-button'
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% from "inout/_macros.html" import status_badge, progress, due, n %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016b" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016c" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="io">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% from "inout/_macros.html" import status_badge, progress, due, n %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016b" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016c" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
{% set active = order.status in ('open', 'partial') %}
|
||||
@@ -64,7 +64,7 @@
|
||||
<div class="io-over-box" role="alert">
|
||||
<b>발주보다 많이 입고하려고 합니다.</b> 맞으면 [초과 입고로 저장]을 누르세요.
|
||||
<ul>{% for o in over %}<li><span class="io-code">{{ o.item_code }}</span> {{ o.item_name }} — 발주 {{ n(o.ordered) }}개, 입고 후 {{ n(o.after) }}개 (<b>+{{ n(o.over) }}</b>)</li>{% endfor %}</ul>
|
||||
<button type="submit" class="erp-btn erp-btn-danger" name="confirm_over" value="1">초과 입고로 저장</button>
|
||||
<button type="submit" class="io-btn-over" name="confirm_over" value="1">초과 입고로 저장</button>
|
||||
<span class="erp-muted">숫자를 고치려면 아래 칸을 고친 뒤 [입고 저장]</span>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016b" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016c" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="io">
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% from "inout/_macros.html" import due, n %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016b" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/inout.css?v=20261016c" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="io">
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
.io-default-submit { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0 0 0 0); border: 0; }
|
||||
.io-over-box { margin: 12px 20px 0; padding: 12px 16px; border-radius: 8px; background: #fbe9e6; border: 1px solid #efc6bf; color: #7a1d14; font-size: 13px; }
|
||||
.io-over-box ul { margin: 6px 0 10px; padding-left: 18px; }
|
||||
/* [초과 입고로 저장] — 분홍 안내 상자 위에서도 또렷하게: 진한 빨강 바탕 + 흰 글씨(공용 erp-btn-danger 는 연해서 안 보였다) */
|
||||
.io-btn-over { display: inline-flex; align-items: center; gap: 6px; padding: 8px 16px; border: 1px solid #b3261e; border-radius: 8px;
|
||||
background: #c5221f; color: #fff; font: inherit; font-size: 13px; font-weight: 600; cursor: pointer; box-shadow: 0 1px 2px rgba(0, 0, 0, .15); }
|
||||
.io-btn-over:hover { background: #a50e0e; border-color: #8c0b0b; }
|
||||
.io-btn-over:focus-visible { outline: 2px solid #7a1d14; outline-offset: 2px; }
|
||||
.io-chip { display: inline-block; margin: 2px 6px 2px 0; padding: 1px 8px; border-radius: 6px; background: var(--color-ghost-gray); font-size: 12px; white-space: nowrap; }
|
||||
|
||||
/* 발주서 폼 */
|
||||
|
||||
Reference in New Issue
Block a user