From 54ecbc352f4da16a9544f793792dc7a7ee9cddf0 Mon Sep 17 00:00:00 2001 From: kkfluous Date: Thu, 2 Apr 2026 17:00:27 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BD=A6=E8=BE=86=E8=80=83=E6=A0=B8?= =?UTF-8?q?=E8=BF=BD=E8=B8=AAsheet=E4=B8=9A=E5=8A=A1=E5=91=98=E5=90=8D?= =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 考核明细和发放明细中的业务员统一显示为"X部-姓名"格式。 Co-Authored-By: Claude Opus 4.6 (1M context) --- excel_writer.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/excel_writer.py b/excel_writer.py index e84807c..105086b 100644 --- a/excel_writer.py +++ b/excel_writer.py @@ -383,7 +383,8 @@ def write_vehicle_tracking_sheet(wb, settle_month, G, master_vehicles, vehicle_p t=g['应考核']; a=g['实际'] cum_t+=t; cum_a+=a q='达标' if g['有达标'] else '未达标' - lines.append(f"{g['销售']}: {R(a,0)}/{R(t,0)} {q}") + sd = g['部门'].replace('业务','') if '业务' in g.get('部门','') else g.get('部门','') + lines.append(f"{sd}-{g['销售']}: {R(a,0)}/{R(t,0)} {q}") row.append('\n'.join(lines)) else: row.append('') @@ -397,7 +398,8 @@ def write_vehicle_tracking_sheet(wb, settle_month, G, master_vehicles, vehicle_p if tp: pay_lines = [] for p in sorted(tp, key=lambda x: x['业务员']): - pay_lines.append(f"{p['业务员']}: {R(p['金额'])}({p['类型']})") + pd = p.get('部门','').replace('业务','') if '业务' in p.get('部门','') else p.get('部门','') + pay_lines.append(f"{pd}-{p['业务员']}: {R(p['金额'])}({p['类型']})") row.append('\n'.join(pay_lines)) else: row.append('')