From a3a32ccaaa9b0a4827f9ed374fb930eb5b7634f4 Mon Sep 17 00:00:00 2001 From: wuzilong <704541015@qq.com> Date: Fri, 16 Oct 2026 11:39:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(pl):=20show=20recharge=20type=20fuel=20as?= =?UTF-8?q?=20=E6=B2=B9=E5=8D=A1=20in=20API=20labels.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Cursor --- backend/app/api/pl/vehicle_recharge.py | 8 ++++---- backend/app/api/pl/vehicle_recharge_approval.py | 2 +- backend/app/services/bx/workflow.py | 2 +- backend/app/services/pl_vehicle_recharge_service.py | 4 ++-- backend/tests/test_pl_menu_badge_recharge.py | 2 +- backend/tests/test_pl_menu_badge_recharge_approval.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/app/api/pl/vehicle_recharge.py b/backend/app/api/pl/vehicle_recharge.py index 64f9daa80..f9d332a0f 100644 --- a/backend/app/api/pl/vehicle_recharge.py +++ b/backend/app/api/pl/vehicle_recharge.py @@ -1,4 +1,4 @@ -"""车辆 ETC/加油充值 API""" +"""车辆 ETC/油卡充值 API""" from datetime import date, datetime from typing import Any, List, Optional @@ -31,10 +31,10 @@ from app.schemas.pl.vehicle_recharge import ( ) from app.services import pl_vehicle_recharge_service as svc -apply_router = APIRouter(prefix="/vehicle-recharge-apply", tags=["运输计划-ETC加油申请"]) -record_router = APIRouter(prefix="/vehicle-recharge-record", tags=["运输计划-ETC加油发放"]) +apply_router = APIRouter(prefix="/vehicle-recharge-apply", tags=["运输计划-ETC油卡申请"]) +record_router = APIRouter(prefix="/vehicle-recharge-record", tags=["运输计划-ETC油卡发放"]) -RECHARGE_TYPE_LABELS = {"etc": "ETC", "fuel": "加油"} +RECHARGE_TYPE_LABELS = {"etc": "ETC", "fuel": "油卡"} RECHARGE_APPLY_STATUS_LABELS = { "draft": "草稿", "pending": "待发放", diff --git a/backend/app/api/pl/vehicle_recharge_approval.py b/backend/app/api/pl/vehicle_recharge_approval.py index 21e1bc2cd..7ae3695e9 100644 --- a/backend/app/api/pl/vehicle_recharge_approval.py +++ b/backend/app/api/pl/vehicle_recharge_approval.py @@ -17,7 +17,7 @@ from app.schemas.pl.vehicle_recharge import ( from app.services import pl_vehicle_recharge_approval_service as approval_svc approval_router = APIRouter( - prefix="/vehicle-recharge-approval", tags=["运输计划-ETC加油充值审批"] + prefix="/vehicle-recharge-approval", tags=["运输计划-ETC油卡充值审批"] ) diff --git a/backend/app/services/bx/workflow.py b/backend/app/services/bx/workflow.py index d99925e8c..4c322b5a8 100644 --- a/backend/app/services/bx/workflow.py +++ b/backend/app/services/bx/workflow.py @@ -21,7 +21,7 @@ _DEFAULT_WORKFLOWS = { "remark": "报销申请默认审批流程", }, "vehicle_recharge": { - "wf_name": "ETC/加油充值审批流程", + "wf_name": "ETC/油卡充值审批流程", "remark": "充值申请默认审批流程", }, } diff --git a/backend/app/services/pl_vehicle_recharge_service.py b/backend/app/services/pl_vehicle_recharge_service.py index b4c494faf..521e43017 100644 --- a/backend/app/services/pl_vehicle_recharge_service.py +++ b/backend/app/services/pl_vehicle_recharge_service.py @@ -1,4 +1,4 @@ -"""车辆 ETC/加油充值业务逻辑""" +"""车辆 ETC/油卡充值业务逻辑""" from __future__ import annotations from datetime import date, datetime @@ -456,7 +456,7 @@ def _resolve_apply_for_record( if apply.status == "in_approval": raise HTTPException( status_code=400, - detail="审批中的申请请在「ETC/加油充值审批」中完成发放登记", + detail="审批中的申请请在「ETC/油卡充值审批」中完成发放登记", ) if apply.status != "pending": raise HTTPException(status_code=400, detail="仅待发放申请可关联") diff --git a/backend/tests/test_pl_menu_badge_recharge.py b/backend/tests/test_pl_menu_badge_recharge.py index 324b1f6a7..ac47aa357 100644 --- a/backend/tests/test_pl_menu_badge_recharge.py +++ b/backend/tests/test_pl_menu_badge_recharge.py @@ -1,4 +1,4 @@ -"""首页「ETC/加油充值发放管理」角标统计全部待发放申请（ETC + 加油）。""" +"""首页「ETC/油卡充值发放管理」角标统计全部待发放申请（ETC + 油卡）。""" from datetime import date from sqlalchemy import create_engine diff --git a/backend/tests/test_pl_menu_badge_recharge_approval.py b/backend/tests/test_pl_menu_badge_recharge_approval.py index e9339f8e9..f9d3e836e 100644 --- a/backend/tests/test_pl_menu_badge_recharge_approval.py +++ b/backend/tests/test_pl_menu_badge_recharge_approval.py @@ -1,4 +1,4 @@ -"""首页「ETC/加油充值审批」角标：统计当前用户待审批单据数。""" +"""首页「ETC/油卡充值审批」角标：统计当前用户待审批单据数。""" from datetime import date from typing import Optional