优化付款交货待办展示并支持列表快捷登记
This commit is contained in:
reddaniel110
@@ -36,5 +36,16 @@
|
||||
{% block body %}{% endblock %}
|
||||
</div>
|
||||
<footer class="foot">{{ COMPANY_NAME }} · 采购订单管理系统 v4.0</footer>
|
||||
{% if session.get('user_id') %}
|
||||
<dialog id="tracking-dialog" aria-labelledby="tracking-dialog-title">
|
||||
<div class="modal-head"><span id="tracking-dialog-title">快捷登记</span><button type="button" class="btn sm" data-tracking-close aria-label="关闭快捷登记">关闭</button></div>
|
||||
<div class="modal-body">
|
||||
<div id="tracking-dialog-error" class="flash error" role="alert" hidden></div>
|
||||
<button type="button" class="btn sm" id="tracking-reload" hidden>重新读取当前状态</button>
|
||||
<div id="tracking-dialog-content" aria-live="polite"></div>
|
||||
</div>
|
||||
</dialog>
|
||||
<script src="{{ url_for('static', filename='tracking.js') }}" defer></script>
|
||||
{% endif %}
|
||||
</body>
|
||||
</html>
|
||||
|
||||
+28
-19
@@ -8,29 +8,38 @@
|
||||
<div class="stat"><div class="v">{{ '%.2f'|format(month_total) }}</div><div class="k">审批通过订单总额（元）</div></div>
|
||||
</div>
|
||||
|
||||
<div class="card tracking-dashboard">
|
||||
<div class="card-head"><h2>付款与交货概况</h2><a href="{{ url_for('orders', status='approved') }}">查看全部</a></div>
|
||||
<p class="muted">统计当前可见、审批通过的订单。各类数量可能重叠；部分付款和部分交货按订单状态统计。</p>
|
||||
<div class="stat-row">
|
||||
{% for key in ['prepayment','invoice_due','unpaid','paid','undelivered','partial_delivery','paid_undelivered','completed'] %}
|
||||
<a class="stat tracking-stat" data-tracking="{{ key }}" href="{{ url_for('orders', tracking=key) }}"><div class="v">{{ tracking_counts[key] }}</div><div class="k">{{ TRACKING_FILTERS[key] }}</div></a>
|
||||
<div class="card tracking-dashboard" id="tracking-board">
|
||||
{% from 'tracking_macros.html' import progress, invoice, tasks, actions with context %}
|
||||
<div class="card-head"><div><h2>付款与交货待办</h2><p class="muted">先核对变更，再跟进付款与交货。同一订单可能出现在多个提醒中。</p></div><a href="{{ url_for('orders') }}">全部订单</a></div>
|
||||
<div class="stat-row tracking-focus">
|
||||
{% for key in ['prepayment','invoice_due','paid_undelivered','recheck'] %}
|
||||
<a class="stat tracking-stat focus-{{ key }} {{ 'selected' if tracking_key == key else '' }}" data-tracking="{{ key }}" href="{{ url_for('index', tracking=key) }}#tracking-board"><div class="v">{{ tracking_counts[key] }}</div><div class="k">{{ TRACKING_FILTERS[key] }}</div><span class="stat-arrow" aria-hidden="true">→</span></a>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<div class="toolbar tracking-shortcuts">{% for key in ['partial_payment','delivered','unrecorded','recheck'] %}<a class="btn sm" data-tracking="{{ key }}" href="{{ url_for('orders', tracking=key) }}">{{ TRACKING_FILTERS[key] }}（{{ tracking_counts[key] }}）</a>{% endfor %}</div>
|
||||
<h3>最近审批通过的订单</h3>
|
||||
<table class="grid tracking-table">
|
||||
<tr><th>订单 / 供应商</th><th class="num">订单金额</th><th>预付款</th><th>收票</th><th>付款</th><th>交货</th><th>操作</th></tr>
|
||||
{% for o in tracking_rows %}
|
||||
<tr>
|
||||
<td><a href="{{ url_for('order_view', oid=o.id) }}#order-tracking">{{ o.order_no }}</a><div class="muted">{{ o.supplier_name }}</div>{% if o.fulfillment_stale or o.payment_stale %}<div class="tracking-warning">变更后待核对</div>{% endif %}</td>
|
||||
<td class="num">{{ '%.2f'|format(o.total_amount) }}</td><td>{{ '需要' if o.needs_prepayment else '—' }}</td>
|
||||
<td><span class="badge track-{{ o.invoice_status }}">{{ o.invoice_status_text }}</span></td>
|
||||
<td><span class="badge track-{{ o.payment_status }}">{{ o.payment_status_text }}</span></td>
|
||||
<td><span class="badge track-{{ o.delivery_status }}">{{ o.delivery_status_text }}</span></td>
|
||||
<td><a class="btn sm" href="{{ url_for('order_view', oid=o.id) }}#order-tracking">查看跟进</a></td>
|
||||
<div class="tracking-board-head">
|
||||
<div><h3>{{ TRACKING_FILTERS[tracking_key] }} <span class="muted">共 {{ tracking_total }} 单</span></h3><p class="muted">同类优先显示较早订单；付款、交货、收票均完成后默认收起。</p></div>
|
||||
<form method="get" action="{{ url_for('index') }}#tracking-board" class="toolbar tracking-filter">
|
||||
<label for="board-filter">查看</label>
|
||||
<select id="board-filter" name="tracking">{% for key, label in TRACKING_FILTERS.items() %}<option value="{{ key }}" {{ 'selected' if tracking_key == key else '' }}>{{ label }}（{{ tracking_counts[key] }}）</option>{% endfor %}</select>
|
||||
<button class="btn sm">筛选</button>
|
||||
</form>
|
||||
</div>
|
||||
<table class="grid tracking-table order-cards">
|
||||
<thead><tr><th>订单 / 供应商</th><th class="num">金额</th><th>付款进度</th><th>交货进度</th><th>收票</th><th>待办 / 操作</th></tr></thead>
|
||||
<tbody>{% for o in tracking_rows %}
|
||||
<tr data-order-id="{{ o.id }}">
|
||||
<td data-label="订单" class="order-identity"><a href="{{ url_for('order_view', oid=o.id) }}#order-tracking"><b>{{ o.order_no }}</b></a><div class="supplier-name">{{ o.supplier_name }}</div>{% if o.needs_prepayment %}<span class="badge track-partial">需提前付款{{ '（待核对）' if o.fulfillment_stale else '' }}</span>{% endif %}</td>
|
||||
<td data-label="订单金额" class="num">¥{{ '%.2f'|format(o.total_amount) }}</td>
|
||||
<td data-label="付款">{{ progress(o, 'payment') }}</td>
|
||||
<td data-label="交货">{{ progress(o, 'delivery') }}</td>
|
||||
<td data-label="收票">{{ invoice(o) }}</td>
|
||||
<td data-label="待办 / 操作" class="order-next">{{ tasks(o) }}{{ actions(o, user) }}</td>
|
||||
</tr>
|
||||
{% else %}<tr><td colspan="7" class="center muted">暂无审批通过的订单</td></tr>{% endfor %}
|
||||
{% else %}<tr class="empty-row"><td colspan="6" class="center muted">当前分类暂无订单。可切换分类查看其他订单。</td></tr>{% endfor %}</tbody>
|
||||
</table>
|
||||
{% if tracking_total > tracking_rows|length %}<p class="right"><a href="{{ url_for('orders', tracking=tracking_key) }}">查看全部 {{ tracking_total }} 单 →</a></p>{% endif %}
|
||||
{% if tracking_key != 'open' %}<p><a href="{{ url_for('index') }}#tracking-board">返回全部待跟进（{{ tracking_counts['open'] }}）</a></p>{% endif %}
|
||||
<div class="tracking-completed-link"><a data-tracking="closed" href="{{ url_for('index', tracking='closed') }}#tracking-board">查看已全部完成（{{ tracking_counts['closed'] }}）</a></div>
|
||||
</div>
|
||||
|
||||
{% if todo %}
|
||||
|
||||
@@ -1,44 +1,30 @@
|
||||
{% from 'tracking_macros.html' import progress, invoice, tasks, form with context %}
|
||||
{% set recent = latest_tracking(o) %}
|
||||
<div class="card" id="order-tracking">
|
||||
<h2>付款与交货跟进</h2>
|
||||
<div class="tracking-summary">
|
||||
<div><label>预付款安排</label><b>{{ '需提前付款' if o.needs_prepayment else '正常付款' }}</b></div>
|
||||
<div><label>收票情况</label><span class="badge track-{{ o.invoice_status }}">{{ o.invoice_status_text }}</span></div>
|
||||
<div><label>付款情况</label><span class="badge track-{{ o.payment_status }}">{{ o.payment_status_text }}</span>{% if o.payment_date %}<div class="muted">{{ o.payment_date }}</div>{% endif %}</div>
|
||||
<div><label>交货情况</label><span class="badge track-{{ o.delivery_status }}">{{ o.delivery_status_text }}</span></div>
|
||||
</div>
|
||||
{% if o.fulfillment_stale or o.payment_stale %}
|
||||
<p class="hint">订单内容已变更，以下记录来自变更前：{{ '采购跟进' if o.fulfillment_stale else '' }}{{ '、' if o.fulfillment_stale and o.payment_stale else '' }}{{ '付款情况' if o.payment_stale else '' }}。请对应经办人核对后保存确认。</p>
|
||||
{% endif %}
|
||||
<div class="card-head"><h2>付款与交货跟进</h2><span class="badge track-{{ 'partial' if o.needs_prepayment else 'unknown' }}">{{ '需提前付款' if o.needs_prepayment else '正常付款' }}{{ '（待核对）' if o.fulfillment_stale else '' }}</span></div>
|
||||
{{ tasks(o) }}
|
||||
{% if o.fulfillment_stale or o.payment_stale %}<p class="hint">订单内容已变更，下面保留变更前记录，请对应经办人核对后保存确认。</p>{% endif %}
|
||||
{% if o.status != 'approved' %}<p class="muted">审批通过后可登记付款、收票和交货情况。已有跟进记录保留供查询。</p>{% endif %}
|
||||
{% if o.fulfillment_note %}<p>采购跟进备注：{{ o.fulfillment_note }}</p>{% endif %}
|
||||
{% if o.payment_note %}<p>付款备注：{{ o.payment_note }}</p>{% endif %}
|
||||
<div class="tracking-panels">
|
||||
<section class="tracking-panel">
|
||||
<h3>付款情况</h3>
|
||||
{{ progress(o, 'payment') }}
|
||||
{% if o.payment_date %}<p class="muted">实际付款日期：{{ o.payment_date }}</p>{% endif %}
|
||||
{% if o.payment_note %}<p class="follow-note">{{ o.payment_note }}</p>{% endif %}
|
||||
{% set log = recent.get('登记付款状态') %}
|
||||
<p class="update-meta">{% if log %}最近登记：{{ log.created_at.strftime('%Y-%m-%d %H:%M') }} · {{ log.user_name }}{% else %}尚无付款登记记录{% endif %}</p>
|
||||
</section>
|
||||
<section class="tracking-panel">
|
||||
<h3>交货与收票</h3>
|
||||
{{ progress(o, 'delivery') }}
|
||||
<p>收票：{{ invoice(o) }}</p>
|
||||
{% if o.fulfillment_note %}<p class="follow-note">{{ o.fulfillment_note }}</p>{% endif %}
|
||||
{% set log = recent.get('更新采购跟进') %}
|
||||
<p class="update-meta">{% if log %}最近跟进：{{ log.created_at.strftime('%Y-%m-%d %H:%M') }} · {{ log.user_name }}{% else %}尚无采购跟进记录{% endif %}</p>
|
||||
</section>
|
||||
</div>
|
||||
<div class="tracking-forms">
|
||||
{% if may_follow %}
|
||||
<form id="follow-up-form" method="post" action="{{ url_for('order_follow_up', oid=o.id) }}">
|
||||
<h3>制单员跟进</h3>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="row_version" value="{{ o.row_version }}">
|
||||
<div class="field"><label for="needs-prepayment">付款安排</label><select id="needs-prepayment" name="needs_prepayment"><option value="0" {{ 'selected' if not o.needs_prepayment else '' }}>正常付款</option><option value="1" {{ 'selected' if o.needs_prepayment else '' }}>需提前付款</option></select></div>
|
||||
<div class="form-grid two">
|
||||
<div class="field"><label for="invoice-status">收票情况</label><select id="invoice-status" name="invoice_status">{% for key, label in INVOICE_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.invoice_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
<div class="field"><label for="delivery-status">交货情况</label><select id="delivery-status" name="delivery_status">{% for key, label in DELIVERY_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.delivery_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
</div>
|
||||
<div class="field"><label for="fulfillment-note">跟进备注（选填）</label><textarea id="fulfillment-note" name="fulfillment_note" maxlength="500" placeholder="例如：先付30%预付款，已收到第一批货">{{ o.fulfillment_note }}</textarea></div>
|
||||
<div class="field"><label for="follow-up-reason">更正原因（回退状态时必填）</label><input id="follow-up-reason" name="reason" maxlength="500"></div>
|
||||
<button class="btn primary">保存采购跟进</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% if may_pay %}
|
||||
<form id="payment-form" method="post" action="{{ url_for('order_payment', oid=o.id) }}">
|
||||
<h3>审批员登记付款</h3>
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="row_version" value="{{ o.row_version }}">
|
||||
<div class="field"><label for="payment-status">付款状态</label><select id="payment-status" name="payment_status">{% for key, label in PAYMENT_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.payment_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
<div class="field"><label for="payment-date">实际付款日期（部分付款或已付款时必填）</label><input id="payment-date" type="date" name="payment_date" value="{{ o.payment_date }}"></div>
|
||||
<div class="field"><label for="payment-note">付款备注（选填）</label><textarea id="payment-note" name="payment_note" maxlength="500" placeholder="例如：已付首款，剩余尾款待交货后支付">{{ o.payment_note }}</textarea></div>
|
||||
<div class="field"><label for="payment-reason">更正原因（回退状态时必填）</label><input id="payment-reason" name="reason" maxlength="500"></div>
|
||||
<button class="btn primary">保存付款状态</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% if may_follow %}{{ form(o, 'follow-up') }}{% endif %}
|
||||
{% if may_pay %}{{ form(o, 'payment') }}{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -19,6 +19,8 @@
|
||||
<a class="btn" href="{{ url_for('orders') }}">返回列表</a>
|
||||
</div>
|
||||
|
||||
{% if o.status == 'approved' %}{% include 'order_tracking.html' %}{% endif %}
|
||||
|
||||
<div class="card">
|
||||
<h2>单据信息</h2>
|
||||
<p class="mobile-only muted">单据信息和物料明细可左右滑动查看。</p>
|
||||
@@ -81,7 +83,7 @@
|
||||
{% if o.note %}<p class="muted">补充说明：{{ o.note }}</p>{% endif %}
|
||||
</div>
|
||||
|
||||
{% include 'order_tracking.html' %}
|
||||
{% if o.status != 'approved' %}{% include 'order_tracking.html' %}{% endif %}
|
||||
|
||||
<div class="card">
|
||||
<h2>审批流程</h2>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{% extends "base.html" %}
|
||||
{% block body %}
|
||||
{% from 'tracking_macros.html' import progress, invoice, tasks, actions with context %}
|
||||
<h1 class="page">订单列表</h1>
|
||||
<div class="card">
|
||||
<form class="toolbar" method="get">
|
||||
@@ -23,41 +24,26 @@
|
||||
<option value="">全部跟进情况</option>
|
||||
{% for key, label in TRACKING_FILTERS.items() %}<option value="{{ key }}" {{ 'selected' if args.get('tracking') == key else '' }}>{{ label }}</option>{% endfor %}
|
||||
</select>
|
||||
<label class="completed-toggle"><input type="checkbox" name="show_completed" value="1" {{ 'checked' if args.get('show_completed') == '1' else '' }}> 显示全部完成订单</label>
|
||||
<button class="btn primary">查询</button>
|
||||
<span class="grow"></span>
|
||||
<a class="btn" href="{{ url_for('export_ledger') }}">导出 Excel 台账</a>
|
||||
{% if user.role in ['maker','admin'] %}<a class="btn primary" href="{{ url_for('order_new') }}">新建订单</a>{% endif %}
|
||||
</form>
|
||||
<table class="grid">
|
||||
<tr>
|
||||
<th>单号</th><th>类型</th><th>供应商</th><th>采购日期</th><th class="num">金额</th>
|
||||
<th>审批状态</th><th>付款与交货</th><th>制单</th><th>审批</th><th class="nowrap">操作</th>
|
||||
{% if not args.get('tracking') and args.get('show_completed') != '1' %}<p class="muted">已收起付款、交货、收票均完成的订单。勾选“显示全部完成订单”可查看。</p>{% endif %}
|
||||
<table class="grid orders-table order-cards">
|
||||
<thead><tr><th>订单 / 供应商</th><th>审批状态</th><th class="num">金额</th><th>付款进度</th><th>交货进度</th><th>收票 / 待办</th><th>操作</th></tr></thead>
|
||||
<tbody>{% for o in rows %}
|
||||
<tr data-order-id="{{ o.id }}">
|
||||
<td data-label="订单" class="order-identity"><a href="{{ url_for('order_view', oid=o.id) }}"><b>{{ o.order_no }}</b></a><div class="supplier-name">{{ o.supplier_name }}</div><div class="muted">{{ o.doc_type_text }} · {{ o.order_date }}</div><div class="muted">制单 {{ o.created_by_name }} · 审批 {{ o.approved_by or '—' }}</div>{% if o.needs_prepayment %}<span class="badge track-partial">需提前付款{{ '（待核对）' if o.fulfillment_stale else '' }}</span>{% endif %}</td>
|
||||
<td data-label="审批"><span class="badge {{ o.status }}">{{ o.status_text }}</span></td>
|
||||
<td data-label="订单金额" class="num">¥{{ '%.2f'|format(o.total_amount) }}</td>
|
||||
<td data-label="付款">{{ progress(o, 'payment') }}</td>
|
||||
<td data-label="交货">{{ progress(o, 'delivery') }}</td>
|
||||
<td data-label="收票 / 待办">{{ invoice(o) }}{{ tasks(o) }}</td>
|
||||
<td data-label="操作" class="order-next">{{ actions(o, user) }}<a class="tracking-detail-link" href="{{ url_for('order_pdf', oid=o.id) }}" target="_blank">下载 / 预览 PDF</a></td>
|
||||
</tr>
|
||||
{% for o in rows %}
|
||||
<tr>
|
||||
<td class="nowrap">{{ o.order_no }}</td>
|
||||
<td>{{ o.doc_type_text }}</td>
|
||||
<td>{{ o.supplier_name }}</td>
|
||||
<td class="nowrap">{{ o.order_date }}</td>
|
||||
<td class="num">{{ '%.2f'|format(o.total_amount) }}</td>
|
||||
<td><span class="badge {{ o.status }}">{{ o.status_text }}</span></td>
|
||||
<td>
|
||||
{% if o.needs_prepayment %}<span class="badge track-partial">需提前付款</span>{% endif %}
|
||||
<span class="badge track-{{ o.invoice_status }}">收票：{{ o.invoice_status_text }}</span>
|
||||
<span class="badge track-{{ o.payment_status }}">付款：{{ o.payment_status_text }}</span>
|
||||
<span class="badge track-{{ o.delivery_status }}">交货：{{ o.delivery_status_text }}</span>
|
||||
{% if o.fulfillment_stale or o.payment_stale %}<div class="tracking-warning">变更后待核对</div>{% endif %}
|
||||
</td>
|
||||
<td>{{ o.created_by_name }}</td>
|
||||
<td>{{ o.approved_by or '-' }}</td>
|
||||
<td class="nowrap">
|
||||
<a class="btn sm" href="{{ url_for('order_view', oid=o.id) }}">查看</a>
|
||||
<a class="btn sm" href="{{ url_for('order_pdf', oid=o.id) }}" target="_blank">PDF</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td colspan="10" class="center muted">没有符合条件的订单</td></tr>
|
||||
{% endfor %}
|
||||
{% else %}<tr class="empty-row"><td colspan="7" class="center muted">没有符合条件的订单</td></tr>{% endfor %}</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block body %}
|
||||
<h1 class="page">{{ '登记付款' if kind == 'payment' else '登记收票 / 交货' }}</h1>
|
||||
<div class="card tracking-editor-page">{% include 'tracking_editor_fragment.html' %}</div>
|
||||
<a class="btn" href="{{ url_for('order_view', oid=o.id) }}#order-tracking">返回订单</a>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,5 @@
|
||||
{% from 'tracking_macros.html' import form with context %}
|
||||
<div data-tracking-editor>
|
||||
<p class="editor-order"><b>{{ o.order_no }}</b><br>{{ o.supplier_name }} · ¥{{ '%.2f'|format(o.total_amount) }}</p>
|
||||
{{ form(o, kind) }}
|
||||
</div>
|
||||
@@ -0,0 +1,53 @@
|
||||
{% macro progress(o, kind) -%}
|
||||
{% set payment = kind == 'payment' %}
|
||||
{% set state = o.payment_status if payment else o.delivery_status %}
|
||||
{% set stale = o.payment_stale if payment else o.fulfillment_stale %}
|
||||
{% set steps = [('unpaid', '未付款'), ('partial', '部分付款'), ('paid', '全部付款')] if payment else [('pending', '未交货'), ('partial', '部分交货'), ('delivered', '全部交货')] %}
|
||||
<div class="order-progress {{ 'is-stale' if stale else '' }}" data-progress="{{ kind }}">
|
||||
{% if stale %}<span class="tracking-warning">变更前记录 · 待核对</span>{% elif state == 'unknown' %}<span class="badge track-unknown">未登记</span>{% endif %}
|
||||
<ol class="status-steps" aria-label="{{ '付款' if payment else '交货' }}状态{{ '（变更前，待核对）' if stale else '' }}">
|
||||
{% for value, label in steps %}<li class="{{ 'current track-' ~ state if state == value else '' }}" {% if state == value %}aria-current="step"{% endif %}>{{ label }}</li>{% endfor %}
|
||||
</ol>
|
||||
</div>
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro invoice(o) -%}
|
||||
<span class="badge track-{{ 'unknown' if o.fulfillment_stale else o.invoice_status }}">{{ o.invoice_status_text }}{{ '（待核对）' if o.fulfillment_stale else '' }}</span>
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro tasks(o) -%}
|
||||
<div class="tracking-tasks">{% for key, text in tracking_tasks(o) %}<span class="task-tag task-{{ key }}">{{ text }}</span>{% endfor %}</div>
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro actions(o, user) -%}
|
||||
<div class="tracking-actions">
|
||||
{% if can_follow(o, user) %}<a class="btn sm" data-quick-tracking href="{{ url_for('tracking_editor', oid=o.id, kind='follow-up') }}">登记收票 / 交货</a>{% endif %}
|
||||
{% if can_record_payment(o, user) %}<a class="btn sm primary" data-quick-tracking href="{{ url_for('tracking_editor', oid=o.id, kind='payment') }}">登记付款</a>{% endif %}
|
||||
<a class="tracking-detail-link" href="{{ url_for('order_view', oid=o.id) }}#order-tracking">详情与记录</a>
|
||||
</div>
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro form(o, kind) -%}
|
||||
{% set payment = kind == 'payment' %}
|
||||
<form id="{{ 'payment-form' if payment else 'follow-up-form' }}" method="post" action="{{ url_for('order_payment' if payment else 'order_follow_up', oid=o.id) }}">
|
||||
<h3>{{ '审批员登记付款' if payment else '制单员跟进' }}</h3>
|
||||
{% if (payment and o.payment_stale) or (not payment and o.fulfillment_stale) %}<p class="hint">订单内容已变更，请核对以下变更前记录。保存即确认本次订单的跟进情况。</p>{% endif %}
|
||||
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
|
||||
<input type="hidden" name="row_version" value="{{ o.row_version }}">
|
||||
{% if payment %}
|
||||
<div class="field"><label for="payment-status">付款状态</label><select id="payment-status" name="payment_status">{% for key, label in PAYMENT_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.payment_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
<div class="field"><label for="payment-date">实际付款日期（部分付款或已付款时必填）</label><input id="payment-date" type="date" name="payment_date" value="{{ o.payment_date }}"></div>
|
||||
<div class="field"><label for="payment-note">付款备注（选填）</label><textarea id="payment-note" name="payment_note" maxlength="500" placeholder="例如：已付首款，剩余尾款待交货后支付">{{ o.payment_note }}</textarea></div>
|
||||
<div class="field"><label for="payment-reason">更正原因（回退状态时必填）</label><input id="payment-reason" name="reason" maxlength="500"></div>
|
||||
{% else %}
|
||||
<div class="field"><label for="needs-prepayment">付款安排</label><select id="needs-prepayment" name="needs_prepayment"><option value="0" {{ 'selected' if not o.needs_prepayment else '' }}>正常付款</option><option value="1" {{ 'selected' if o.needs_prepayment else '' }}>需提前付款</option></select></div>
|
||||
<div class="form-grid two">
|
||||
<div class="field"><label for="invoice-status">收票情况</label><select id="invoice-status" name="invoice_status">{% for key, label in INVOICE_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.invoice_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
<div class="field"><label for="delivery-status">交货情况</label><select id="delivery-status" name="delivery_status">{% for key, label in DELIVERY_STATUS.items() %}<option value="{{ key }}" {{ 'selected' if o.delivery_status == key else '' }}>{{ label }}</option>{% endfor %}</select></div>
|
||||
</div>
|
||||
<div class="field"><label for="fulfillment-note">跟进备注（选填）</label><textarea id="fulfillment-note" name="fulfillment_note" maxlength="500" placeholder="例如：首批货已到，剩余预计周五交齐">{{ o.fulfillment_note }}</textarea></div>
|
||||
<div class="field"><label for="follow-up-reason">更正原因（回退状态时必填）</label><input id="follow-up-reason" name="reason" maxlength="500"></div>
|
||||
{% endif %}
|
||||
<button class="btn primary" type="submit">{{ '保存付款状态' if payment else '保存采购跟进' }}</button>
|
||||
</form>
|
||||
{%- endmacro %}
|
||||
Reference in New Issue
Block a user