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

po_app/templates/orders.html

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