优化付款交货待办展示并支持列表快捷登记

po_app/templates/index.html

@@ -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 %}