feat(pl): 运费结算审批分流与车辆挂车号等 PL 能力完善

拆分运费审批/出款页面,补充结算发票附件与菜单 SQL,并同步前后端模型与车辆相关展示。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-06-28 21:00:31 +08:00
1 parent 66d5a8714b
commit 98aec80d71
37 files changed
+1362 -195

No files matched your search

+2
View File
@@ -56,6 +56,7 @@ class PlVehicle(Base):
carrier_id = Column(String(64), nullable=True, comment="承运商ID(类型为承运商时必填)")
carrier_name = Column(String(200), nullable=True, comment="承运商名称(冗余)")
license_plate = Column(String(20), nullable=False, unique=True, comment="车牌号")
trailer_no = Column(String(20), nullable=True, comment="挂车号")
default_driver_id = Column(String(64), nullable=True, comment="默认司机ID")
default_driver_name = Column(String(100), nullable=True, comment="默认司机姓名(冗余)")
load_capacity = Column(DECIMAL(10, 2), nullable=True, comment="载重(吨)")
@@ -533,6 +534,7 @@ class PlFreightSettlement(Base):
# 发票信息
invoice_no = Column(String(50), nullable=True, comment="发票号")
invoice_date = Column(Date, nullable=True, comment="开票日期")
invoice_attachment_urls = Column(Text, nullable=True, comment="发票附件URLs,逗号分隔")
# 结算状态
settlement_status = Column(String(20), nullable=False, default="pending", comment="结算状态 pending-待提交 submitted-已提交 approved-审核通过 confirmed-已确认")
+2
View File
@@ -92,6 +92,7 @@ class VehicleBase(BaseModel):
carrier_id: Optional[str] = Field(default=None, alias="carrierId", description="承运商ID")
carrier_name: Optional[str] = Field(default=None, max_length=200, alias="carrierName", description="承运商名称")
license_plate: str = Field(..., max_length=20, alias="licensePlate", description="车牌号")
trailer_no: Optional[str] = Field(default=None, max_length=20, alias="trailerNo", description="挂车号")
default_driver_id: Optional[str] = Field(default=None, alias="defaultDriverId", description="默认司机ID(只读兼容)")
default_driver_name: Optional[str] = Field(default=None, max_length=100, alias="defaultDriverName", description="默认司机姓名(只读兼容)")
load_capacity: Optional[Decimal] = Field(default=None, alias="loadCapacity", description="载重(吨)")
@@ -110,6 +111,7 @@ class VehicleUpdate(BaseModel):
carrier_id: Optional[str] = Field(default=None, alias="carrierId")
carrier_name: Optional[str] = Field(default=None, max_length=200, alias="carrierName")
license_plate: Optional[str] = Field(default=None, max_length=20, alias="licensePlate")
trailer_no: Optional[str] = Field(default=None, max_length=20, alias="trailerNo")
load_capacity: Optional[Decimal] = Field(default=None, alias="loadCapacity")
vehicle_status: Optional[str] = Field(default=None, max_length=20, alias="vehicleStatus")
remark: Optional[str] = None
+4
View File
@@ -16,6 +16,9 @@ class FreightSettlementBase(BaseModel):
invoice_amount: Optional[Decimal] = Field(default=None, alias="invoiceAmount", description="发票金额")
invoice_no: Optional[str] = Field(default=None, max_length=50, alias="invoiceNo", description="发票号")
invoice_date: Optional[date] = Field(default=None, alias="invoiceDate", description="开票日期")
invoice_attachment_urls: Optional[str] = Field(
default=None, alias="invoiceAttachmentUrls", description="发票附件URLs,逗号分隔"
)
settlement_status: str = Field(default="pending", alias="settlementStatus", description="结算状态")
remark: Optional[str] = None
@@ -36,6 +39,7 @@ class FreightSettlementUpdate(BaseModel):
invoice_amount: Optional[Decimal] = Field(default=None, alias="invoiceAmount")
invoice_no: Optional[str] = Field(default=None, max_length=50, alias="invoiceNo")
invoice_date: Optional[date] = Field(default=None, alias="invoiceDate")
invoice_attachment_urls: Optional[str] = Field(default=None, alias="invoiceAttachmentUrls")
remark: Optional[str] = None
model_config = {"populate_by_name": True}