新增订单收票付款交货跟进并完善使用升级手册
增加部分付款和部分交货状态、工作台筛选、权限校验、跟进记录及 v4 数据迁移;补充 Windows EXE 构建与验收脚本。附 16 页 PDF 使用升级手册及企业微信详细配置说明、生成脚本和测试截图。验证:76 项回归测试、EXE 浏览器验收与 PDF 逐页校验通过。
This commit is contained in:
@@ -19,6 +19,10 @@
|
||||
<input type="date" name="date_from" value="{{ args.get('date_from','') }}" style="width:150px;">
|
||||
<span>~</span>
|
||||
<input type="date" name="date_to" value="{{ args.get('date_to','') }}" style="width:150px;">
|
||||
<select name="tracking" aria-label="付款与交货筛选" style="width:170px;">
|
||||
<option value="">全部跟进情况</option>
|
||||
{% for key, label in TRACKING_FILTERS.items() %}<option value="{{ key }}" {{ 'selected' if args.get('tracking') == key else '' }}>{{ label }}</option>{% endfor %}
|
||||
</select>
|
||||
<button class="btn primary">查询</button>
|
||||
<span class="grow"></span>
|
||||
<a class="btn" href="{{ url_for('export_ledger') }}">导出 Excel 台账</a>
|
||||
@@ -27,7 +31,7 @@
|
||||
<table class="grid">
|
||||
<tr>
|
||||
<th>单号</th><th>类型</th><th>供应商</th><th>采购日期</th><th class="num">金额</th>
|
||||
<th>状态</th><th>制单</th><th>审批</th><th class="nowrap">操作</th>
|
||||
<th>审批状态</th><th>付款与交货</th><th>制单</th><th>审批</th><th class="nowrap">操作</th>
|
||||
</tr>
|
||||
{% for o in rows %}
|
||||
<tr>
|
||||
@@ -37,6 +41,13 @@
|
||||
<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">
|
||||
@@ -45,7 +56,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
<tr><td colspan="9" class="center muted">没有符合条件的订单</td></tr>
|
||||
<tr><td colspan="10" class="center muted">没有符合条件的订单</td></tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user