feat(휴가): 협의자 결재·신청 화면 개편(라디오·붙박이 달력·결재 라인)·내 신청 내역
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
{#- 결재 라인 공용 조각(2026-11-02) — 아이콘 + 이름, 협의·결재 진행 상황 -#}
|
||||
{% macro face(p) -%}
|
||||
{% if p.picture %}<img class="vac-opt-face" src="{{ p.picture }}" alt="" referrerpolicy="no-referrer" />
|
||||
{%- else %}<span class="vac-opt-face is-ini">{{ (p.name or p.email)[:1] }}</span>{% endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro person(p) -%}
|
||||
<span class="vac-person">{{ face(p) }}<span class="vac-opt-name">{{ p.name or p.email }}</span></span>
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro status_badge(status) -%}
|
||||
{% set badge = 'erp-badge-neutral' %}
|
||||
{% if status == '승인' %}{% set badge = 'erp-badge-success' %}
|
||||
{% elif status in ('제출', '협의중') %}{% set badge = 'erp-badge-inverse' %}
|
||||
{% elif status == '반려' %}{% set badge = 'erp-badge-danger' %}{% endif %}
|
||||
<span class="erp-badge {{ badge }}">{{ status }}</span>
|
||||
{%- endmacro %}
|
||||
|
||||
{#- 협의자별 상태 → 결재 상태. r.consults 필요 -#}
|
||||
{% macro progress(r, people) -%}
|
||||
{% set rejected_in_consult = r.consults | selectattr('state', 'equalto', '반려') | list %}
|
||||
<span class="vac-steps">
|
||||
{% for c in r.consults %}
|
||||
{% set p = people.get(c.email) or {'email': c.email, 'name': c.name, 'picture': ''} %}
|
||||
<span class="vac-step is-{{ {'대기': 'wait', '승인': 'ok', '반려': 'no'}[c.state] }}" title="협의 {{ c.state }}">{{ face(p) }}{{ p.name or p.email }} <b>{{ c.state }}</b></span>
|
||||
{% endfor %}
|
||||
{% if r.consults %}<span class="vac-step-arrow" aria-hidden="true">→</span>{% endif %}
|
||||
{% if r.status == '협의중' %}<span class="vac-step is-wait">결재 <b>협의 후</b></span>
|
||||
{% elif r.status == '제출' %}<span class="vac-step is-wait">결재 <b>대기</b></span>
|
||||
{% elif r.status == '승인' %}<span class="vac-step is-ok">결재 <b>승인</b></span>
|
||||
{% elif r.status == '반려' and not rejected_in_consult %}<span class="vac-step is-no">결재 <b>반려</b></span>
|
||||
{% elif r.status == '반려' %}<span class="vac-step">결재 <b>안 넘어감</b></span>
|
||||
{% elif r.status == '작성중' %}<span class="vac-step">결재 <b>제출 전</b></span>
|
||||
{% else %}<span class="vac-step">{{ r.status }}</span>{% endif %}
|
||||
</span>
|
||||
{%- endmacro %}
|
||||
@@ -1,6 +1,7 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% import "vacation/_macros.html" as vm %}
|
||||
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261027e" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac">
|
||||
@@ -13,7 +14,7 @@
|
||||
</div>
|
||||
{% set badge = 'erp-badge-neutral' %}
|
||||
{% if req.status == '승인' %}{% set badge = 'erp-badge-success' %}
|
||||
{% elif req.status == '제출' %}{% set badge = 'erp-badge-inverse' %}
|
||||
{% elif req.status in ('제출', '협의중') %}{% set badge = 'erp-badge-inverse' %}
|
||||
{% elif req.status == '반려' %}{% set badge = 'erp-badge-danger' %}{% endif %}
|
||||
<span class="erp-badge {{ badge }} vac-detail-status">{{ req.status }}</span>
|
||||
</div>
|
||||
@@ -24,7 +25,7 @@
|
||||
<div><dt>시작일</dt><dd>{{ req.start_date }} ({{ half_labels[req.start_half] }})</dd></div>
|
||||
<div><dt>종료일</dt><dd>{{ req.end_date }} ({{ half_labels[req.end_half] }})</dd></div>
|
||||
{% if req.approver_email %}
|
||||
<div><dt>승인자</dt><dd>{{ req.approver_email }}</dd></div>
|
||||
<div><dt>{{ '반려자' if req.status == '반려' else '승인자' }}</dt><dd>{{ req.approver_email }}</dd></div>
|
||||
<div><dt>결재일시</dt><dd>{{ req.decided_at }}</dd></div>
|
||||
{% endif %}
|
||||
</dl>
|
||||
@@ -43,6 +44,42 @@
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{#- 결재 라인(2026-11-02) — 협의자별 상태·협의 내용(협의자에게는 자기 줄만, 서버가 거름), 통보자·결재자 -#}
|
||||
<div class="vac-detail-block vac-line">
|
||||
<div class="vac-detail-label">결재 진행</div>
|
||||
<p class="vac-line-progress">{{ vm.progress(req, people) }}</p>
|
||||
{% for c in req.consults %}
|
||||
{% set p = people.get(c.email) or {'email': c.email, 'name': c.name, 'picture': ''} %}
|
||||
<div class="vac-line-consult">
|
||||
<div>{{ vm.person(p) }} <span class="erp-muted">협의 {{ c.state }}{% if c.decided_at %} · {{ c.decided_at[5:16] | replace('T', ' ') }}{% endif %}</span></div>
|
||||
{% if c.message %}<p>{{ c.message }}</p>{% endif %}
|
||||
{% if c.comment %}<p class="vac-line-comment">반려 사유: {{ c.comment }}</p>{% endif %}
|
||||
</div>
|
||||
{% endfor %}
|
||||
<div class="vac-line-row">
|
||||
<span class="vac-line-label">통보자</span>
|
||||
<div class="vac-line-body">{% for p in line.notifiers %}{{ vm.person(p) }}{% else %}<span class="erp-muted">없음</span>{% endfor %}</div>
|
||||
</div>
|
||||
<div class="vac-line-row">
|
||||
<span class="vac-line-label">결재자</span>
|
||||
<div class="vac-line-body">{% for p in line.approvers %}{{ vm.person(p) }}{% else %}<span class="erp-muted">ERP 관리자</span>{% endfor %}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if can_consult %}
|
||||
<div class="vac-approve-box">
|
||||
<form method="post" action="/vacation/{{ req.id }}/consult" class="vac-inline-form">
|
||||
<input type="hidden" name="decision" value="approve" />
|
||||
<button type="submit" class="erp-btn erp-btn-primary">협의 승인</button>
|
||||
</form>
|
||||
<form method="post" action="/vacation/{{ req.id }}/consult" class="vac-reject-form">
|
||||
<input type="hidden" name="decision" value="reject" />
|
||||
<input class="erp-input" type="text" name="reject_reason" placeholder="반려 사유" required />
|
||||
<button type="submit" class="erp-btn erp-btn-danger">협의 반려</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- ── 승인자 액션 (제출 상태) ── -->
|
||||
{% if is_approver and req.status == '제출' %}
|
||||
<div class="vac-approve-box">
|
||||
@@ -91,7 +128,7 @@
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
{% if req.status in ('작성중', '제출', '반려') and (is_owner or is_admin) %}
|
||||
{% if req.status in ('작성중', '협의중', '제출', '반려') and (is_owner or is_admin) %}
|
||||
<form method="post" action="/vacation/{{ req.id }}/delete" class="vac-inline-form"
|
||||
onsubmit="return confirm('이 휴가 신청을 삭제할까요? (복구 불가)');">
|
||||
<button type="submit" class="erp-btn erp-btn-danger">삭제</button>
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% import "vacation/_macros.html" as vm %}
|
||||
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261027e" />
|
||||
{#- 날짜 칸 = 프로젝트와 같은 아사나식 날짜 팝업(2026-10-27, erp-datepop) -#}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />
|
||||
{#- 달력 = ERP 공용 달력 서식(2026-11-02, erp-datepop mountRange) -#}
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
<link rel="stylesheet" href="/static/erp-datepop.css?v=20261027a" />{% endblock %}
|
||||
<link rel="stylesheet" href="/static/erp-datepop.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac">
|
||||
@@ -11,51 +12,112 @@
|
||||
{% set action = '/vacation/new' if mode == 'new' else '/vacation/' ~ req.id ~ '/edit' %}
|
||||
<form id="vac-form" method="post" action="{{ action }}" class="erp-card vac-form-card">
|
||||
|
||||
<div class="vac-form-grid">
|
||||
<label class="erp-field"><span>휴가 종류 *</span>
|
||||
<select class="erp-select" name="vacation_type" id="vac-type" required>
|
||||
{% for t in vacation_types %}
|
||||
<option value="{{ t }}" {% if req and req.vacation_type == t %}selected{% endif %}>{{ t }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</label>
|
||||
<fieldset class="vac-types">
|
||||
<legend>휴가 종류</legend>
|
||||
{% for t in vacation_types %}
|
||||
<label class="vac-type"><input type="radio" name="vacation_type" value="{{ t }}"
|
||||
{% if (req and req.vacation_type == t) or (not req and loop.first) %}checked{% endif %} /><span>{{ t }}</span></label>
|
||||
{% endfor %}
|
||||
</fieldset>
|
||||
|
||||
<label class="erp-field"><span>시작일 *</span>
|
||||
<input class="erp-input" type="date" name="start_date" id="vac-start" required
|
||||
value="{{ req.start_date if req else default_date }}" />
|
||||
</label>
|
||||
<div class="vac-form-main">
|
||||
<div class="vac-range-cal" id="vac-cal"></div>
|
||||
|
||||
<label class="erp-field" id="vac-start-half-field"><span>시작 구분</span>
|
||||
<select class="erp-select" name="start_half" id="vac-start-half">
|
||||
{% for h in halves %}
|
||||
<option value="{{ h }}" {% if req and req.start_half == h %}selected{% endif %}>{{ half_labels[h] }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</label>
|
||||
<div class="vac-form-side">
|
||||
<input type="hidden" name="start_date" id="vac-start" value="{{ req.start_date if req else '' }}" />
|
||||
<input type="hidden" name="end_date" id="vac-end" value="{{ req.end_date if req else '' }}" />
|
||||
<div class="vac-form-grid">
|
||||
<label class="erp-field"><span>시작일</span>
|
||||
<input class="erp-input" type="text" id="vac-start-show" readonly placeholder="달력에서 선택" />
|
||||
</label>
|
||||
<label class="erp-field" id="vac-end-field"><span>종료일</span>
|
||||
<input class="erp-input" type="text" id="vac-end-show" readonly placeholder="달력에서 선택" />
|
||||
</label>
|
||||
<label class="erp-field" id="vac-start-half-field"><span>시작 구분</span>
|
||||
<select class="erp-select" name="start_half" id="vac-start-half">
|
||||
{% for h in halves %}
|
||||
<option value="{{ h }}" {% if req and req.start_half == h %}selected{% endif %}>{{ half_labels[h] }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</label>
|
||||
<label class="erp-field" id="vac-end-half-field"><span>종료 구분</span>
|
||||
<select class="erp-select" name="end_half" id="vac-end-half">
|
||||
{% for h in halves %}
|
||||
<option value="{{ h }}" {% if req and req.end_half == h %}selected{% endif %}>{{ half_labels[h] }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<label class="erp-field" id="vac-end-field"><span>종료일 *</span>
|
||||
<input class="erp-input" type="date" name="end_date" id="vac-end"
|
||||
value="{{ req.end_date if req else default_date }}" />
|
||||
</label>
|
||||
<div class="vac-days-preview">
|
||||
예상 사용 일수: <strong id="vac-days-out">—</strong>
|
||||
<span class="erp-muted">(주말 · 공휴일 제외)</span>
|
||||
</div>
|
||||
|
||||
<label class="erp-field" id="vac-end-half-field"><span>종료 구분</span>
|
||||
<select class="erp-select" name="end_half" id="vac-end-half">
|
||||
{% for h in halves %}
|
||||
<option value="{{ h }}" {% if req and req.end_half == h %}selected{% endif %}>{{ half_labels[h] }}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</label>
|
||||
<label class="erp-field vac-reason"><span>휴가 사유</span>
|
||||
<textarea class="erp-input" name="reason" rows="5"
|
||||
placeholder="휴가 사유를 입력하세요.">{{ req.reason if req else '' }}</textarea>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<label class="erp-field vac-full"><span>사유</span>
|
||||
<textarea class="erp-input" name="reason" rows="3"
|
||||
placeholder="휴가 사유를 입력하세요.">{{ req.reason if req else '' }}</textarea>
|
||||
</label>
|
||||
{#- 결재 라인 — 협의자(구성원 전체에서 복수, 사람마다 협의 내용) · 통보자·결재자(옵션 값, 고칠 수 없음) -#}
|
||||
<section class="vac-line" aria-label="결재 라인">
|
||||
<h3>결재 라인</h3>
|
||||
|
||||
<div class="vac-days-preview">
|
||||
예상 사용 일수: <strong id="vac-days-out">—</strong>
|
||||
<span class="erp-muted">(주말 · 공휴일 제외)</span>
|
||||
</div>
|
||||
<div class="vac-line-row">
|
||||
<span class="vac-line-label">협의자</span>
|
||||
<div class="vac-line-body">
|
||||
<button type="button" class="erp-btn erp-btn-outline" id="vac-pick-btn" aria-expanded="false"
|
||||
{% if not consult_ready %}disabled{% endif %}>구성원 선택</button>
|
||||
<label class="vac-check"><input type="checkbox" name="no_consult" id="vac-no-consult" value="1"
|
||||
{% if not consult_ready %}checked disabled{% endif %} /> 협의자 없음</label>
|
||||
{% if not consult_ready %}<span class="erp-muted">협의자 기능은 DB 마이그레이션 003 적용 뒤에 쓸 수 있습니다.</span>{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul class="vac-pick" id="vac-pick" hidden>
|
||||
{% for m in members %}
|
||||
<li>
|
||||
<label class="vac-opt-person">
|
||||
<input type="checkbox" data-email="{{ m.email }}" {% if m.email in consult_chosen %}checked{% endif %} />
|
||||
{{ vm.person(m) }}
|
||||
</label>
|
||||
</li>
|
||||
{% else %}
|
||||
<li class="erp-muted">고를 수 있는 구성원이 없습니다.</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
<div class="vac-consult-box" id="vac-consult-box" hidden>
|
||||
<p class="vac-line-sub">협의자 전달 사항 <span class="erp-muted">— 협의자마다 자기 내용만 메일로 받습니다.</span></p>
|
||||
{% for m in members %}
|
||||
{% set on = m.email in consult_chosen %}
|
||||
<div class="vac-consult-row" data-email="{{ m.email }}" {% if not on %}hidden{% endif %}>
|
||||
<input type="hidden" name="consult_email" value="{{ m.email }}" {% if not on %}disabled{% endif %} />
|
||||
{{ vm.person(m) }}
|
||||
<textarea class="erp-input" name="consult_message" rows="2" placeholder="{{ m.name }}님에게 전달할 내용"
|
||||
aria-label="{{ m.name }} 협의 내용" {% if not on %}disabled{% endif %}>{{ consult_chosen.get(m.email, '') }}</textarea>
|
||||
<button type="button" class="vac-consult-x" aria-label="{{ m.name }} 빼기">✕</button>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<div class="vac-line-row">
|
||||
<span class="vac-line-label">통보자</span>
|
||||
<div class="vac-line-body">
|
||||
{% for p in line.notifiers %}{{ vm.person(p) }}{% else %}<span class="erp-muted">없음(옵션에서 지정)</span>{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
<div class="vac-line-row">
|
||||
<span class="vac-line-label">결재자</span>
|
||||
<div class="vac-line-body">
|
||||
{% for p in line.approvers %}{{ vm.person(p) }}{% else %}<span class="erp-muted">ERP 관리자(옵션에서 지정)</span>{% endfor %}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<p class="vac-form-err" id="vac-form-err" role="alert" hidden></p>
|
||||
|
||||
<div class="erp-page-actions vac-form-actions">
|
||||
<button type="submit" class="erp-btn erp-btn-primary" name="action" value="submit">제출</button>
|
||||
@@ -72,5 +134,5 @@
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}<script type="application/json" id="vac-holidays">{{ holidays | tojson }}</script>
|
||||
<script src="/static/erp-datepop.js?v=20261027b" defer></script>
|
||||
<script src="/static/vacation.js?v=20261027c" defer></script>{% endblock %}
|
||||
<script src="/static/erp-datepop.js?v=20261102a" defer></script>
|
||||
<script src="/static/vacation.js?v=20261102a" defer></script>{% endblock %}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261027e" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac">
|
||||
@@ -9,6 +9,12 @@
|
||||
<div class="vac-actions">
|
||||
<div class="vac-actions-main">
|
||||
<a class="erp-btn erp-btn-primary" href="/vacation/new">+ 휴가 신청</a>
|
||||
<a class="erp-btn erp-btn-outline" href="/vacation/mine">내 신청 내역</a>
|
||||
{% if consult_count %}
|
||||
<a class="erp-btn erp-btn-outline" href="/vacation/pending#consults">협의 대기
|
||||
<span class="erp-badge erp-badge-inverse vac-mini">{{ consult_count }}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if is_approver %}
|
||||
<a class="erp-btn erp-btn-outline" href="/vacation/pending">승인 대기
|
||||
{% if pending_count %}<span class="erp-badge erp-badge-inverse vac-mini">{{ pending_count }}</span>{% endif %}
|
||||
@@ -85,7 +91,7 @@
|
||||
</div>
|
||||
|
||||
<div class="vac-legend">
|
||||
<span class="vac-leg"><i class="vac-dot vac-bar-submit"></i>제출</span>
|
||||
<span class="vac-leg"><i class="vac-dot vac-bar-submit"></i>협의·제출</span>
|
||||
<span class="vac-leg"><i class="vac-dot vac-bar-approve"></i>승인</span>
|
||||
<span class="vac-leg"><i class="vac-dot vac-bar-reject"></i>반려</span>
|
||||
<span class="vac-leg"><i class="vac-dot vac-bar-cancel"></i>취소</span>
|
||||
@@ -108,7 +114,7 @@
|
||||
<strong>{{ r.owner_name or r.owner }}</strong>
|
||||
{% set badge = 'erp-badge-neutral' %}
|
||||
{% if r.status == '승인' %}{% set badge = 'erp-badge-success' %}
|
||||
{% elif r.status == '제출' %}{% set badge = 'erp-badge-inverse' %}
|
||||
{% elif r.status in ('제출', '협의중') %}{% set badge = 'erp-badge-inverse' %}
|
||||
{% elif r.status == '반려' %}{% set badge = 'erp-badge-danger' %}{% endif %}
|
||||
<span class="erp-badge {{ badge }}">{{ r.status }}</span>
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% import "vacation/_macros.html" as vm %}
|
||||
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac vac-options">
|
||||
<div class="vac-actions">
|
||||
<div class="vac-actions-main">
|
||||
<a class="erp-btn erp-btn-outline" href="/vacation/">◀ 달력</a>
|
||||
<a class="erp-btn erp-btn-primary" href="/vacation/new">+ 휴가 신청</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-card">
|
||||
{% if items %}
|
||||
<div class="erp-table-wrap">
|
||||
<table class="erp-table">
|
||||
<thead><tr><th>휴가종류</th><th>기간</th><th>일수</th><th>상태</th><th>결재 진행</th></tr></thead>
|
||||
<tbody>
|
||||
{% for r in items %}
|
||||
<tr>
|
||||
<td><a href="/vacation/{{ r.id }}">{{ r.vacation_type }}</a></td>
|
||||
<td>{{ r.start_date }}{% if r.end_date != r.start_date %} ~ {{ r.end_date }}{% endif %}</td>
|
||||
<td>{{ r.days }}</td>
|
||||
<td>{{ vm.status_badge(r.status) }}</td>
|
||||
<td>{{ vm.progress(r, people) }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<p class="erp-muted">휴가 신청 내역이 없습니다.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</section>
|
||||
{% endblock %}
|
||||
@@ -1,10 +1,10 @@
|
||||
{% extends "erp_base.html" %}
|
||||
|
||||
{#- 휴가 옵션(2026-10-27) — 승인자·승인 통보자·잔여 연차(수정 = ERP 관리자·승인자·통보자, 나머지는 보기만) + 내 Gmail 연결(누구나).
|
||||
메일: 제출 = 승인자·통보자, 승인·반려 = 승인자·통보자·신청자. 보내는 사람 = 처리한 사람 본인 Gmail(없으면 회사 메일). -#}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261027e" />
|
||||
메일: 제출 = 승인자·통보자(+ 협의자마다 자기 몫), 협의 완료·승인·반려 = 승인자·통보자·신청자. 보내는 사람 = 처리한 사람 본인 Gmail(없으면 회사 메일). -#}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />
|
||||
<link rel="stylesheet" href="/static/vendor/material-symbols/material-symbols.css" />
|
||||
<link rel="stylesheet" href="/static/erp-datepop.css?v=20261027a" />{% endblock %}
|
||||
<link rel="stylesheet" href="/static/erp-datepop.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac vac-options">
|
||||
@@ -149,5 +149,5 @@
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
||||
{% block scripts %}<script src="/static/erp-datepop.js?v=20261027b" defer></script>
|
||||
<script src="/static/vacation.js?v=20261027c" defer></script>{% endblock %}
|
||||
{% block scripts %}<script src="/static/erp-datepop.js?v=20261102a" defer></script>
|
||||
<script src="/static/vacation.js?v=20261102a" defer></script>{% endblock %}
|
||||
|
||||
@@ -1,17 +1,60 @@
|
||||
{% extends "erp_base.html" %}
|
||||
{% import "vacation/_macros.html" as vm %}
|
||||
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261027e" />{% endblock %}
|
||||
{% block head_extra %}<link rel="stylesheet" href="/static/vacation.css?v=20261102a" />{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<section class="vac">
|
||||
<div class="erp-card">
|
||||
<section class="vac vac-options">
|
||||
{#- 협의 대기(2026-11-02) — 내가 협의자인 신청. 내 몫 협의 내용만 -#}
|
||||
<div class="erp-card" id="consults">
|
||||
<div class="vac-card-head"><h2>협의 대기 <span class="erp-muted vac-opt-count">{{ consult_items | length }}건</span></h2></div>
|
||||
{% if consult_items %}
|
||||
<div class="erp-table-wrap">
|
||||
<table class="erp-table vac-pending-table">
|
||||
<thead>
|
||||
<tr><th>신청자</th><th>휴가종류</th><th>기간</th><th>일수</th><th>협의 내용</th><th class="vac-act-col">동작</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for r in consult_items %}
|
||||
<tr>
|
||||
<td><a href="/vacation/{{ r.id }}">{{ r.owner_name or r.owner }}</a></td>
|
||||
<td>{{ r.vacation_type }}</td>
|
||||
<td>{{ r.start_date }}{% if r.end_date != r.start_date %} ~ {{ r.end_date }}{% endif %}</td>
|
||||
<td>{{ r.days }}</td>
|
||||
<td class="vac-reason-cell">{{ r.my_message or '-' }}</td>
|
||||
<td class="vac-act-col">
|
||||
<div class="vac-pending-acts">
|
||||
<form method="post" action="/vacation/{{ r.id }}/consult" class="vac-inline-form">
|
||||
<input type="hidden" name="decision" value="approve" />
|
||||
<button type="submit" class="erp-btn erp-btn-primary erp-btn-sm">승인</button>
|
||||
</form>
|
||||
<form method="post" action="/vacation/{{ r.id }}/consult" class="vac-reject-form">
|
||||
<input type="hidden" name="decision" value="reject" />
|
||||
<input class="erp-input erp-input-sm" type="text" name="reject_reason" placeholder="반려 사유" required />
|
||||
<button type="submit" class="erp-btn erp-btn-danger erp-btn-sm">반려</button>
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<p class="erp-muted">협의할 휴가 신청이 없습니다.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% if is_approver %}
|
||||
<div class="erp-card" id="approvals">
|
||||
<div class="vac-card-head"><h2>승인 대기 <span class="erp-muted vac-opt-count">{{ items | length }}건</span></h2></div>
|
||||
{% if items %}
|
||||
<div class="erp-table-wrap">
|
||||
<table class="erp-table vac-pending-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>신청자</th><th>휴가종류</th><th>기간</th><th>일수</th>
|
||||
<th>사유</th><th class="vac-act-col">동작</th>
|
||||
<th>사유</th><th>협의</th><th class="vac-act-col">동작</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -22,6 +65,11 @@
|
||||
<td>{{ r.start_date }}{% if r.end_date != r.start_date %} ~ {{ r.end_date }}{% endif %}</td>
|
||||
<td>{{ r.days }}</td>
|
||||
<td class="vac-reason-cell erp-muted">{{ r.reason }}</td>
|
||||
<td class="vac-reason-cell">
|
||||
{% for c in r.consults %}
|
||||
<div class="vac-consult-brief"><b>{{ (people.get(c.email) or c).name or c.email }}</b> {{ c.state }}{% if c.message %} — {{ c.message }}{% endif %}</div>
|
||||
{% else %}<span class="erp-muted">없음</span>{% endfor %}
|
||||
</td>
|
||||
<td class="vac-act-col">
|
||||
<div class="vac-pending-acts">
|
||||
<form method="post" action="/vacation/{{ r.id }}/approve" class="vac-inline-form">
|
||||
@@ -43,5 +91,6 @@
|
||||
<p class="erp-muted">승인 대기 중인 휴가 신청이 없습니다.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</section>
|
||||
{% endblock %}
|
||||
|
||||
Reference in New Issue
Block a user