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('')