整合合同费用并移除旧财务合同

backend/alembic/versions/20260527_02_add_contract_fee_basic_fields.py

@@ -0,0 +1,51 @@
+"""add contract fee basic fields
+
+Revision ID: 20260527_02
+Revises: 20260527_01
+Create Date: 2026-05-27 10:15:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+revision: str = "20260527_02"
+down_revision: Union[str, None] = "20260527_01"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def _column_exists(inspector: sa.Inspector, table_name: str, column_name: str) -> bool:
+    return column_name in {column["name"] for column in inspector.get_columns(table_name)}
+
+
+def upgrade() -> None:
+    bind = op.get_bind()
+    inspector = sa.inspect(bind)
+
+    if "contract_fees" not in inspector.get_table_names():
+        return
+
+    if not _column_exists(inspector, "contract_fees", "contract_no"):
+        op.add_column("contract_fees", sa.Column("contract_no", sa.String(length=100), nullable=True))
+    if not _column_exists(inspector, "contract_fees", "signed_date"):
+        op.add_column("contract_fees", sa.Column("signed_date", sa.Date(), nullable=True))
+    if not _column_exists(inspector, "contract_fees", "currency"):
+        op.add_column("contract_fees", sa.Column("currency", sa.String(length=10), server_default="CNY", nullable=False))
+    if not _column_exists(inspector, "contract_fees", "remark"):
+        op.add_column("contract_fees", sa.Column("remark", sa.Text(), nullable=True))
+
+
+def downgrade() -> None:
+    bind = op.get_bind()
+    inspector = sa.inspect(bind)
+
+    if "contract_fees" not in inspector.get_table_names():
+        return
+
+    for column_name in ("remark", "currency", "signed_date", "contract_no"):
+        if _column_exists(inspector, "contract_fees", column_name):
+            op.drop_column("contract_fees", column_name)

backend/alembic/versions/20260527_03_remove_legacy_finance_contracts.py

@@ -0,0 +1,124 @@
+"""remove legacy finance contracts
+
+Revision ID: 20260527_03
+Revises: 20260527_02
+Create Date: 2026-05-27 10:25:00.000000
+
+"""
+
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+
+revision: str = "20260527_03"
+down_revision: Union[str, None] = "20260527_02"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+LEGACY_KEYS = (
+    "finance_contracts:create",
+    "finance_contracts:list",
+    "finance_contracts:read",
+    "finance_contracts:update",
+    "finance_contracts:delete",
+    "fees_payments:create",
+    "fees_payments:update",
+    "fees_payments:delete",
+    "fees_attachments:create",
+    "fees_attachments:read",
+    "fees_attachments:delete",
+)
+
+
+def _table_exists(inspector: sa.Inspector, table_name: str) -> bool:
+    return table_name in inspector.get_table_names()
+
+
+def upgrade() -> None:
+    bind = op.get_bind()
+    inspector = sa.inspect(bind)
+
+    if _table_exists(inspector, "finance_contracts") and _table_exists(inspector, "contract_fees"):
+        op.execute(
+            """
+            UPDATE contract_fees cf
+            SET
+                contract_no = COALESCE(cf.contract_no, legacy.contract_no),
+                signed_date = COALESCE(cf.signed_date, legacy.signed_date),
+                currency = COALESCE(NULLIF(cf.currency, ''), legacy.currency, 'CNY'),
+                remark = COALESCE(cf.remark, legacy.remark)
+            FROM (
+                SELECT DISTINCT ON (fc.study_id, s.id)
+                    fc.study_id,
+                    s.id AS center_id,
+                    fc.contract_no,
+                    fc.signed_date,
+                    fc.currency,
+                    fc.remark
+                FROM finance_contracts fc
+                JOIN sites s
+                    ON s.study_id = fc.study_id
+                   AND s.name = fc.site_name
+                ORDER BY fc.study_id, s.id, fc.updated_at DESC, fc.created_at DESC
+            ) legacy
+            WHERE cf.project_id = legacy.study_id
+              AND cf.center_id = legacy.center_id
+            """
+        )
+
+    if _table_exists(inspector, "api_endpoint_permissions"):
+        quoted_keys = ", ".join(f"'{key}'" for key in LEGACY_KEYS)
+        op.execute(f"DELETE FROM api_endpoint_permissions WHERE endpoint_key IN ({quoted_keys})")
+
+    if _table_exists(inspector, "permission_templates"):
+        for key in LEGACY_KEYS:
+            op.execute(f"UPDATE permission_templates SET permissions = permissions::jsonb #- '{{PM,{key}}}'")
+            op.execute(f"UPDATE permission_templates SET permissions = permissions::jsonb #- '{{CRA,{key}}}'")
+            op.execute(f"UPDATE permission_templates SET permissions = permissions::jsonb #- '{{PV,{key}}}'")
+            op.execute(f"UPDATE permission_templates SET permissions = permissions::jsonb #- '{{QA,{key}}}'")
+            op.execute(f"UPDATE permission_templates SET permissions = permissions::jsonb #- '{{CTA,{key}}}'")
+
+    if _table_exists(inspector, "permission_template_versions"):
+        for key in LEGACY_KEYS:
+            op.execute(f"UPDATE permission_template_versions SET permissions = permissions::jsonb #- '{{PM,{key}}}'")
+            op.execute(f"UPDATE permission_template_versions SET permissions = permissions::jsonb #- '{{CRA,{key}}}'")
+            op.execute(f"UPDATE permission_template_versions SET permissions = permissions::jsonb #- '{{PV,{key}}}'")
+            op.execute(f"UPDATE permission_template_versions SET permissions = permissions::jsonb #- '{{QA,{key}}}'")
+            op.execute(f"UPDATE permission_template_versions SET permissions = permissions::jsonb #- '{{CTA,{key}}}'")
+
+    if _table_exists(inspector, "attachments"):
+        op.execute("DELETE FROM attachments WHERE entity_type = 'finance_contract'")
+
+    if _table_exists(inspector, "audit_logs"):
+        op.execute("DELETE FROM audit_logs WHERE entity_type = 'finance_contract'")
+
+    if _table_exists(inspector, "finance_contracts"):
+        op.drop_table("finance_contracts")
+
+
+def downgrade() -> None:
+    bind = op.get_bind()
+    inspector = sa.inspect(bind)
+
+    if not _table_exists(inspector, "finance_contracts"):
+        op.create_table(
+            "finance_contracts",
+            sa.Column("id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("study_id", postgresql.UUID(as_uuid=True), nullable=False),
+            sa.Column("site_name", sa.String(length=255), nullable=False),
+            sa.Column("contract_no", sa.String(length=100), nullable=False),
+            sa.Column("signed_date", sa.Date(), nullable=True),
+            sa.Column("amount", sa.Numeric(12, 2), nullable=False),
+            sa.Column("currency", sa.String(length=10), nullable=False),
+            sa.Column("remark", sa.Text(), nullable=True),
+            sa.Column("created_by", postgresql.UUID(as_uuid=True), nullable=True),
+            sa.Column("created_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+            sa.Column("updated_at", sa.DateTime(timezone=True), server_default=sa.func.now(), nullable=False),
+            sa.ForeignKeyConstraint(["created_by"], ["users.id"]),
+            sa.ForeignKeyConstraint(["study_id"], ["studies.id"]),
+            sa.PrimaryKeyConstraint("id"),
+        )
+        op.create_index("ix_finance_contracts_study_id", "finance_contracts", ["study_id"])

backend/app/api/v1/fees_contracts.py

@@ -109,7 +109,11 @@ async def list_contract_fees(
                 id=contract.id,
                 project_id=contract.project_id,
                 center_id=contract.center_id,
+                contract_no=contract.contract_no,
+                signed_date=contract.signed_date,
                 contract_amount=contract_amount_decimal,
+                currency=contract.currency,
+                remark=contract.remark,
                 contract_cases=contract.contract_cases,
                 actual_cases=contract.actual_cases,
                 settlement_amount=_to_decimal(contract.settlement_amount) if contract.settlement_amount else None,
@@ -191,7 +195,11 @@ async def get_contract_fee(
         id=contract.id,
         project_id=contract.project_id,
         center_id=contract.center_id,
+        contract_no=contract.contract_no,
+        signed_date=contract.signed_date,
         contract_amount=_to_decimal(contract.contract_amount),
+        currency=contract.currency,
+        remark=contract.remark,
         contract_cases=contract.contract_cases,
         actual_cases=contract.actual_cases,
         settlement_amount=_to_decimal(contract.settlement_amount) if contract.settlement_amount else None,
@@ -314,7 +322,7 @@ async def create_contract_payment(
     contract = await contract_fee_crud.get_contract_fee(db, contract_id)
     if not contract:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
-    await _ensure_project_access(db, contract.project_id, current_user, "fees_payments:create")
+    await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:update")
     _validate_payment_rules(payment_in)
     payment = await payment_crud.create_payment(db, contract_id, payment_in)
     await audit_crud.log_action(
@@ -347,7 +355,7 @@ async def update_contract_payment(
     contract = await contract_fee_crud.get_contract_fee(db, payment.contract_fee_id)
     if not contract:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
-    await _ensure_project_access(db, contract.project_id, current_user, "fees_payments:update")
+    await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:update")
     merged_payment = ContractFeePaymentCreate(
         amount=payment_in.amount if payment_in.amount is not None else payment.amount,
         paid_date=payment_in.paid_date if payment_in.paid_date is not None else payment.paid_date,
@@ -387,7 +395,7 @@ async def delete_contract_payment(
     contract = await contract_fee_crud.get_contract_fee(db, payment.contract_fee_id)
     if not contract:
         raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同费用不存在")
-    await _ensure_project_access(db, contract.project_id, current_user, "fees_payments:delete")
+    await _ensure_project_access(db, contract.project_id, current_user, "fees_contracts:update")
     await payment_crud.delete_payment(db, payment)
     await payment_crud.resequence_payments(db, contract.id)
     await audit_crud.log_action(

backend/app/api/v1/finance_contracts.py

@@ -1,177 +0,0 @@
-import uuid
-
-from fastapi import APIRouter, Depends, HTTPException, status
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.core.deps import get_cra_site_scope, get_current_user, get_db_session, require_study_not_locked, require_api_permission
-from app.crud import audit as audit_crud
-from app.crud import finance_contract as contract_crud
-from app.crud import site as site_crud
-from app.crud import study as study_crud
-from app.schemas.finance_contract import FinanceContractCreate, FinanceContractRead, FinanceContractUpdate
-
-router = APIRouter()
-
-
-async def _ensure_study_exists(db: AsyncSession, study_id: uuid.UUID):
-    study = await study_crud.get(db, study_id)
-    if not study:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="项目不存在")
-    return study
-
-
-async def _ensure_site_name_active(db: AsyncSession, study_id: uuid.UUID, site_name: str | None):
-    if not site_name:
-        return
-    active_names = await site_crud.list_active_names(db, study_id)
-    if site_name not in active_names:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="中心已停用")
-
-
-@router.post(
-    "/contracts",
-    response_model=FinanceContractRead,
-    status_code=status.HTTP_201_CREATED,
-    dependencies=[Depends(require_api_permission("finance_contracts:create")), Depends(require_study_not_locked())],
-)
-async def create_contract(
-    study_id: uuid.UUID,
-    contract_in: FinanceContractCreate,
-    db: AsyncSession = Depends(get_db_session),
-    current_user=Depends(get_current_user),
-) -> FinanceContractRead:
-    await _ensure_study_exists(db, study_id)
-    cra_scope = await get_cra_site_scope(db, study_id, current_user)
-    if cra_scope and contract_in.site_name not in cra_scope[1]:
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
-    await _ensure_site_name_active(db, study_id, contract_in.site_name)
-    contract = await contract_crud.create_contract(db, study_id, contract_in, created_by=current_user.id)
-    await audit_crud.log_action(
-        db,
-        study_id=study_id,
-        entity_type="finance_contract",
-        entity_id=contract.id,
-        action="CREATE_FINANCE_CONTRACT",
-        detail=f"合同费用 {contract.contract_no} 已创建",
-        operator_id=current_user.id,
-        operator_role=current_user.role,
-    )
-    return FinanceContractRead.model_validate(contract)
-
-
-@router.get(
-    "/contracts",
-    response_model=list[FinanceContractRead],
-    dependencies=[Depends(require_api_permission("finance_contracts:read"))],
-)
-async def list_contracts(
-    study_id: uuid.UUID,
-    site_name: str | None = None,
-    contract_no: str | None = None,
-    skip: int = 0,
-    limit: int = 100,
-    db: AsyncSession = Depends(get_db_session),
-    current_user=Depends(get_current_user),
-) -> list[FinanceContractRead]:
-    await _ensure_study_exists(db, study_id)
-    cra_scope = await get_cra_site_scope(db, study_id, current_user)
-    site_names = cra_scope[1] if cra_scope else None
-    if site_name and site_names is not None and site_name not in site_names:
-        return []
-    items = await contract_crud.list_contracts(
-        db,
-        study_id,
-        site_name=site_name,
-        site_names=site_names,
-        contract_no=contract_no,
-        skip=skip,
-        limit=limit,
-    )
-    return [FinanceContractRead.model_validate(item) for item in items]
-
-
-@router.get(
-    "/contracts/{contract_id}",
-    response_model=FinanceContractRead,
-    dependencies=[Depends(require_api_permission("finance_contracts:read"))],
-)
-async def get_contract(
-    study_id: uuid.UUID,
-    contract_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db_session),
-    current_user=Depends(get_current_user),
-) -> FinanceContractRead:
-    await _ensure_study_exists(db, study_id)
-    contract = await contract_crud.get_contract(db, contract_id)
-    if not contract or contract.study_id != study_id:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
-    cra_scope = await get_cra_site_scope(db, study_id, current_user)
-    if cra_scope and contract.site_name not in cra_scope[1]:
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
-    return FinanceContractRead.model_validate(contract)
-
-
-@router.patch(
-    "/contracts/{contract_id}",
-    response_model=FinanceContractRead,
-    dependencies=[Depends(require_api_permission("finance_contracts:update")), Depends(require_study_not_locked())],
-)
-async def update_contract(
-    study_id: uuid.UUID,
-    contract_id: uuid.UUID,
-    contract_in: FinanceContractUpdate,
-    db: AsyncSession = Depends(get_db_session),
-    current_user=Depends(get_current_user),
-) -> FinanceContractRead:
-    await _ensure_study_exists(db, study_id)
-    contract = await contract_crud.get_contract(db, contract_id)
-    if not contract or contract.study_id != study_id:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
-    cra_scope = await get_cra_site_scope(db, study_id, current_user)
-    if cra_scope and contract.site_name not in cra_scope[1]:
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
-    await _ensure_site_name_active(db, study_id, contract.site_name)
-    contract = await contract_crud.update_contract(db, contract, contract_in)
-    await audit_crud.log_action(
-        db,
-        study_id=study_id,
-        entity_type="finance_contract",
-        entity_id=contract_id,
-        action="UPDATE_FINANCE_CONTRACT",
-        detail=f"合同费用 {contract_id} 已更新",
-        operator_id=current_user.id,
-        operator_role=current_user.role,
-    )
-    return FinanceContractRead.model_validate(contract)
-
-
-@router.delete(
-    "/contracts/{contract_id}",
-    status_code=status.HTTP_204_NO_CONTENT,
-    dependencies=[Depends(require_api_permission("finance_contracts:delete")), Depends(require_study_not_locked())],
-)
-async def delete_contract(
-    study_id: uuid.UUID,
-    contract_id: uuid.UUID,
-    db: AsyncSession = Depends(get_db_session),
-    current_user=Depends(get_current_user),
-) -> None:
-    await _ensure_study_exists(db, study_id)
-    contract = await contract_crud.get_contract(db, contract_id)
-    if not contract or contract.study_id != study_id:
-        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="合同不存在")
-    cra_scope = await get_cra_site_scope(db, study_id, current_user)
-    if cra_scope and contract.site_name not in cra_scope[1]:
-        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="权限不足")
-    await _ensure_site_name_active(db, study_id, contract.site_name)
-    await contract_crud.delete_contract(db, contract)
-    await audit_crud.log_action(
-        db,
-        study_id=study_id,
-        entity_type="finance_contract",
-        entity_id=contract_id,
-        action="DELETE_FINANCE_CONTRACT",
-        detail=f"合同费用 {contract_id} 已删除",
-        operator_id=current_user.id,
-        operator_role=current_user.role,
-    )

backend/app/crud/contract_fee.py

@@ -18,7 +18,11 @@ async def create_contract_fee(
     contract = ContractFee(
         project_id=contract_in.project_id,
         center_id=contract_in.center_id,
+        contract_no=contract_in.contract_no,
+        signed_date=contract_in.signed_date,
         contract_amount=contract_in.contract_amount,
+        currency=contract_in.currency,
+        remark=contract_in.remark,
         contract_cases=contract_in.contract_cases,
         actual_cases=contract_in.actual_cases,
         settlement_amount=contract_in.settlement_amount,

backend/app/crud/finance_contract.py

@@ -1,77 +0,0 @@
-import uuid
-from typing import Sequence
-
-from sqlalchemy import select
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.models.finance_contract import FinanceContract
-from app.schemas.finance_contract import FinanceContractCreate, FinanceContractUpdate
-
-
-async def create_contract(
-    db: AsyncSession,
-    study_id: uuid.UUID,
-    contract_in: FinanceContractCreate,
-    created_by: uuid.UUID | None,
-) -> FinanceContract:
-    contract = FinanceContract(
-        study_id=study_id,
-        site_name=contract_in.site_name,
-        contract_no=contract_in.contract_no,
-        signed_date=contract_in.signed_date,
-        amount=contract_in.amount,
-        currency=contract_in.currency,
-        remark=contract_in.remark,
-        created_by=created_by,
-    )
-    db.add(contract)
-    await db.commit()
-    await db.refresh(contract)
-    return contract
-
-
-async def get_contract(db: AsyncSession, contract_id: uuid.UUID) -> FinanceContract | None:
-    result = await db.execute(select(FinanceContract).where(FinanceContract.id == contract_id))
-    return result.scalar_one_or_none()
-
-
-async def list_contracts(
-    db: AsyncSession,
-    study_id: uuid.UUID,
-    site_name: str | None = None,
-    site_names: set[str] | None = None,
-    contract_no: str | None = None,
-    skip: int = 0,
-    limit: int = 100,
-) -> Sequence[FinanceContract]:
-    stmt = (
-        select(FinanceContract)
-        .where(FinanceContract.study_id == study_id)
-    )
-    if site_names is not None:
-        if not site_names:
-            return []
-        stmt = stmt.where(FinanceContract.site_name.in_(site_names))
-    if site_name:
-        stmt = stmt.where(FinanceContract.site_name.ilike(f"%{site_name}%"))
-    if contract_no:
-        stmt = stmt.where(FinanceContract.contract_no.ilike(f"%{contract_no}%"))
-    stmt = stmt.order_by(FinanceContract.created_at.desc()).offset(skip).limit(limit)
-    result = await db.execute(stmt)
-    return result.scalars().all()
-
-
-async def update_contract(
-    db: AsyncSession, contract: FinanceContract, contract_in: FinanceContractUpdate
-) -> FinanceContract:
-    update_data = contract_in.model_dump(exclude_unset=True)
-    for key, value in update_data.items():
-        setattr(contract, key, value)
-    await db.commit()
-    await db.refresh(contract)
-    return contract
-
-
-async def delete_contract(db: AsyncSession, contract: FinanceContract) -> None:
-    await db.delete(contract)
-    await db.commit()

backend/app/models/contract_fee.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 from typing import Optional
 
 import uuid
-from datetime import datetime
+from datetime import date, datetime
 from decimal import Decimal
 
-from sqlalchemy import DateTime, ForeignKey, Integer, Numeric, UniqueConstraint, func
+from sqlalchemy import Date, DateTime, ForeignKey, Integer, Numeric, String, Text, UniqueConstraint, func
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import Mapped, mapped_column
 
@@ -21,11 +21,15 @@ class ContractFee(Base):
     id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     project_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("studies.id"), index=True, nullable=False)
     center_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("sites.id"), index=True, nullable=False)
+    contract_no: Mapped[Optional[str]] = mapped_column(String(100), nullable=True)
+    signed_date: Mapped[Optional[date]] = mapped_column(Date, nullable=True)
     contract_amount: Mapped[Decimal] = mapped_column(Numeric(12, 2), nullable=False)
+    currency: Mapped[str] = mapped_column(String(10), nullable=False, default="CNY")
+    remark: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
     contract_cases: Mapped[int] = mapped_column(Integer, nullable=False)
     actual_cases: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
-    settlement_amount: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
+    settlement_amount: Mapped[Optional[Decimal]] = mapped_column(Numeric(12, 2), nullable=True)
-    final_payment_amount: Mapped[Decimal | None] = mapped_column(Numeric(12, 2), nullable=True)
+    final_payment_amount: Mapped[Optional[Decimal]] = mapped_column(Numeric(12, 2), nullable=True)
     created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, server_default=func.now())
     updated_at: Mapped[datetime] = mapped_column(
         DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()

backend/app/models/finance_contract.py

@@ -1,29 +0,0 @@
-from __future__ import annotations
-from typing import Optional
-
-import uuid
-from datetime import date, datetime
-
-from sqlalchemy import Date, DateTime, ForeignKey, Numeric, String, Text, func
-from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm import Mapped, mapped_column
-
-from app.db.base_class import Base
-
-
-class FinanceContract(Base):
-    __tablename__ = "finance_contracts"
-
-    id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
-    study_id: Mapped[uuid.UUID] = mapped_column(UUID(as_uuid=True), ForeignKey("studies.id"), index=True, nullable=False)
-    site_name: Mapped[str] = mapped_column(String(255), nullable=False)
-    contract_no: Mapped[str] = mapped_column(String(100), nullable=False)
-    signed_date: Mapped[Optional[date]] = mapped_column(Date, nullable=True)
-    amount: Mapped[float] = mapped_column(Numeric(12, 2), nullable=False)
-    currency: Mapped[str] = mapped_column(String(10), nullable=False, default="CNY")
-    remark: Mapped[Optional[str]] = mapped_column(Text, nullable=True)
-    created_by: Mapped[Optional[uuid.UUID]] = mapped_column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
-    created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), nullable=False, server_default=func.now())
-    updated_at: Mapped[datetime] = mapped_column(
-        DateTime(timezone=True), nullable=False, server_default=func.now(), onupdate=func.now()
-    )

backend/app/schemas/contract_fee.py

@@ -12,7 +12,11 @@ from app.schemas.fee_attachment import FeeAttachmentRead
 class ContractFeeCreate(BaseModel):
     project_id: uuid.UUID
     center_id: uuid.UUID
+    contract_no: Optional[str] = None
+    signed_date: Optional[date] = None
     contract_amount: Decimal = Field(ge=0)
+    currency: str = "CNY"
+    remark: Optional[str] = None
     contract_cases: int = Field(ge=0)
     actual_cases: Optional[int] = Field(default=None, ge=0)
     settlement_amount: Optional[Decimal] = Field(default=None, ge=0)
@@ -20,7 +24,11 @@ class ContractFeeCreate(BaseModel):
 
 
 class ContractFeeUpdate(BaseModel):
+    contract_no: Optional[str] = None
+    signed_date: Optional[date] = None
     contract_amount: Optional[Decimal] = Field(default=None, ge=0)
+    currency: Optional[str] = None
+    remark: Optional[str] = None
     contract_cases: Optional[int] = Field(default=None, ge=0)
     actual_cases: Optional[int] = Field(default=None, ge=0)
     settlement_amount: Optional[Decimal] = Field(default=None, ge=0)
@@ -31,7 +39,11 @@ class ContractFeeRead(BaseModel):
     id: uuid.UUID
     project_id: uuid.UUID
     center_id: uuid.UUID
+    contract_no: Optional[str]
+    signed_date: Optional[date]
     contract_amount: Decimal
+    currency: str
+    remark: Optional[str]
     contract_cases: int
     actual_cases: Optional[int]
     settlement_amount: Optional[Decimal]

backend/app/schemas/finance_contract.py

@@ -1,40 +0,0 @@
-import uuid
-from datetime import date, datetime
-from decimal import Decimal
-from typing import Optional
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class FinanceContractCreate(BaseModel):
-    site_name: str
-    contract_no: str
-    signed_date: Optional[date] = None
-    amount: Decimal = Field(gt=0)
-    currency: str = "CNY"
-    remark: Optional[str] = None
-
-
-class FinanceContractUpdate(BaseModel):
-    site_name: Optional[str] = None
-    contract_no: Optional[str] = None
-    signed_date: Optional[date] = None
-    amount: Optional[Decimal] = Field(default=None, gt=0)
-    currency: Optional[str] = None
-    remark: Optional[str] = None
-
-
-class FinanceContractRead(BaseModel):
-    id: uuid.UUID
-    study_id: uuid.UUID
-    site_name: str
-    contract_no: str
-    signed_date: Optional[date]
-    amount: Decimal
-    currency: str
-    remark: Optional[str]
-    created_by: Optional[uuid.UUID]
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = ConfigDict(from_attributes=True)

backend/tests/test_contract_fee_basic_fields.py

@@ -0,0 +1,50 @@
+"""合同费用基础字段测试"""
+
+from datetime import date
+from decimal import Decimal
+import uuid
+
+from app.models.contract_fee import ContractFee
+from app.schemas.contract_fee import ContractFeeCreate, ContractFeeRead, ContractFeeUpdate
+
+
+def test_contract_fee_schema_includes_contract_basic_fields():
+    """合同费用应包含合同基础信息字段。"""
+    project_id = uuid.uuid4()
+    center_id = uuid.uuid4()
+
+    payload = ContractFeeCreate(
+        project_id=project_id,
+        center_id=center_id,
+        contract_no="CT-001",
+        signed_date=date(2026, 5, 27),
+        contract_amount=Decimal("120000.00"),
+        currency="CNY",
+        remark="首版合同",
+        contract_cases=12,
+    )
+
+    assert payload.contract_no == "CT-001"
+    assert payload.signed_date == date(2026, 5, 27)
+    assert payload.currency == "CNY"
+    assert payload.remark == "首版合同"
+
+    update_payload = ContractFeeUpdate(contract_no="CT-002", currency="USD", remark="变更合同信息")
+    assert update_payload.model_dump(exclude_unset=True) == {
+        "contract_no": "CT-002",
+        "currency": "USD",
+        "remark": "变更合同信息",
+    }
+
+    for field in ("contract_no", "signed_date", "currency", "remark"):
+        assert field in ContractFeeRead.model_fields
+
+
+def test_contract_fee_model_includes_contract_basic_columns():
+    """合同费用模型应持久化合同基础信息。"""
+    columns = ContractFee.__table__.columns
+
+    assert "contract_no" in columns
+    assert "signed_date" in columns
+    assert "currency" in columns
+    assert "remark" in columns

backend/tests/test_remove_legacy_finance_contracts.py

@@ -0,0 +1,25 @@
+"""旧合同基础信息模块移除测试"""
+
+from pathlib import Path
+
+
+ROOT = Path(__file__).resolve().parents[1]
+
+
+def test_api_router_no_longer_registers_legacy_finance_contracts():
+    router_source = (ROOT / "app" / "api" / "v1" / "router.py").read_text()
+
+    assert "finance_contracts" not in router_source
+    assert "finance-contracts" not in router_source
+
+
+def test_active_backend_code_no_longer_imports_finance_contract_model():
+    checked_paths = [
+        ROOT / "app" / "db" / "base.py",
+        ROOT / "app" / "crud" / "study.py",
+        ROOT / "app" / "crud" / "site.py",
+        ROOT / "app" / "crud" / "overview.py",
+    ]
+
+    for path in checked_paths:
+        assert "FinanceContract" not in path.read_text()

frontend/src/api/feeContracts.ts

@@ -4,19 +4,23 @@ import type { FeeApiResponse } from "../types/api";
 export interface ContractFeePayload {
   project_id: string;
   center_id: string;
+  contract_no?: string | null;
+  signed_date?: string | null;
   contract_amount: number;
+  currency?: string;
+  remark?: string | null;
   contract_cases: number;
   actual_cases?: number | null;
-  settlement_amount?: number | null;
-  final_payment_amount?: number | null;
 }
 
 export interface ContractFeeUpdatePayload {
+  contract_no?: string | null;
+  signed_date?: string | null;
   contract_amount?: number;
+  currency?: string;
+  remark?: string | null;
   contract_cases?: number;
   actual_cases?: number | null;
-  settlement_amount?: number | null;
-  final_payment_amount?: number | null;
 }
 
 export interface ContractPaymentPayload {

frontend/src/api/financeContracts.ts

@@ -1,16 +0,0 @@
-import { apiDelete, apiGet, apiPatch, apiPost } from "./axios";
-
-export const listFinanceContracts = (studyId: string, params?: Record<string, any>) =>
-  apiGet(`/api/v1/studies/${studyId}/finance/contracts`, { params });
-
-export const getFinanceContract = (studyId: string, contractId: string) =>
-  apiGet(`/api/v1/studies/${studyId}/finance/contracts/${contractId}`);
-
-export const createFinanceContract = (studyId: string, payload: Record<string, any>) =>
-  apiPost(`/api/v1/studies/${studyId}/finance/contracts`, payload);
-
-export const updateFinanceContract = (studyId: string, contractId: string, payload: Record<string, any>) =>
-  apiPatch(`/api/v1/studies/${studyId}/finance/contracts/${contractId}`, payload);
-
-export const deleteFinanceContract = (studyId: string, contractId: string) =>
-  apiDelete(`/api/v1/studies/${studyId}/finance/contracts/${contractId}`);

frontend/src/views/fees/ContractFeeDetail.vue

@@ -12,7 +12,7 @@
       <el-card class="detail-card unified-shell" shadow="never">
         <template #header>
           <div class="card-header actions-header">
-            <span class="header-title">{{ TEXT.common.labels.basicInfo }}</span>
+            <span class="header-title">{{ TEXT.modules.feeContracts.contractInfoTitle }}</span>
             <div class="actions">
               <el-button type="primary" :disabled="!canWrite || isReadOnly" @click="goEdit" class="header-action-btn copy-btn">
                 <el-icon class="el-icon--left"><Edit /></el-icon>
@@ -24,10 +24,16 @@
             </div>
           </div>
         </template>
-        <el-descriptions :column="2" border class="custom-descriptions">
+        <el-descriptions :column="4" border class="custom-descriptions">
           <el-descriptions-item :label="TEXT.common.fields.site" label-class-name="desc-label">
             {{ centerName || TEXT.common.fallback }}
           </el-descriptions-item>
+          <el-descriptions-item :label="TEXT.common.fields.contractNo" label-class-name="desc-label">
+            {{ detail.contract_no || TEXT.common.fallback }}
+          </el-descriptions-item>
+          <el-descriptions-item :label="TEXT.common.fields.signedDate" label-class-name="desc-label">
+            {{ displayDate(detail.signed_date) }}
+          </el-descriptions-item>
           <el-descriptions-item :label="TEXT.modules.feeContracts.contractAmount" label-class-name="desc-label">
             <span class="amount-text">{{ formatAmountWan(detail.contract_amount) }}</span>
           </el-descriptions-item>
@@ -37,11 +43,11 @@
           <el-descriptions-item :label="TEXT.modules.feeContracts.actualCases" label-class-name="desc-label">
             {{ detail.actual_cases ?? TEXT.common.fallback }}
           </el-descriptions-item>
-          <el-descriptions-item :label="TEXT.modules.feeContracts.settlementAmount" label-class-name="desc-label">
+          <el-descriptions-item :label="TEXT.common.fields.currency" label-class-name="desc-label">
-            <span class="amount-text">{{ formatAmountWan(detail.settlement_amount) }}</span>
+            {{ detail.currency || TEXT.common.fields.currencyDefault }}
           </el-descriptions-item>
-          <el-descriptions-item :label="TEXT.modules.feeContracts.finalPaymentAmount" label-class-name="desc-label">
+          <el-descriptions-item :label="TEXT.common.fields.remark" label-class-name="desc-label" :span="4">
-            <span class="amount-text">{{ formatAmountWan(detail.final_payment_amount) }}</span>
+            {{ detail.remark || TEXT.common.fallback }}
           </el-descriptions-item>
         </el-descriptions>
       </el-card>
@@ -133,11 +139,13 @@ const contractId = route.params.contractId as string;
 const loading = ref(false);
 const errorMessage = ref("");
 const detail = reactive<any>({
+  contract_no: "",
+  signed_date: "",
   contract_amount: 0,
+  currency: "CNY",
+  remark: "",
   contract_cases: 0,
   actual_cases: null,
-  settlement_amount: null,
-  final_payment_amount: null,
   payments: [],
 });
 const sites = ref<any[]>([]);

frontend/src/views/fees/ContractFeeForm.test.ts

@@ -0,0 +1,33 @@
+import { describe, expect, it } from "vitest";
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
+
+const readSource = () => readFileSync(resolve(__dirname, "./ContractFeeForm.vue"), "utf8");
+
+describe("ContractFeeForm.vue", () => {
+  it("keeps contract fields in a four-column contract info section", () => {
+    const source = readSource();
+
+    expect(source).toContain("contractInfoTitle");
+    expect(source).not.toContain("feeSettlementTitle");
+    expect(source).not.toContain("settlement_amount");
+    expect(source).not.toContain("final_payment_amount");
+    expect(source).toContain(':lg="6"');
+    expect(source).toContain('prop="contract_no"');
+    expect(source).toContain('prop="signed_date"');
+    expect(source).toContain('prop="currency"');
+    expect(source).toContain('prop="remark"');
+    expect(source).toContain("form.contract_no");
+    expect(source).toContain("form.signed_date");
+    expect(source).toContain("form.currency");
+    expect(source).toContain("form.remark");
+  });
+
+  it("allows system admins to edit without project permission matrix entries", () => {
+    const source = readSource();
+
+    expect(source).toContain("useAuthStore");
+    expect(source).toContain("isSystemAdmin");
+    expect(source).toContain("if (isAdmin.value) return true;");
+  });
+});

frontend/src/views/fees/ContractFeeForm.vue

@@ -13,12 +13,12 @@
           <el-card class="form-card unified-shell" shadow="never">
           <template #header>
             <div class="card-header actions-header">
-              <span class="header-title">{{ TEXT.common.labels.basicInfo }}</span>
+              <span class="header-title">{{ TEXT.modules.feeContracts.contractInfoTitle }}</span>
               <el-button @click="goBack">{{ TEXT.common.actions.back }}</el-button>
             </div>
           </template>
           <el-row :gutter="24">
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item :label="TEXT.common.fields.site" prop="center_id" required>
                 <el-select
                   v-model="form.center_id"
@@ -36,7 +36,24 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item :label="TEXT.common.fields.contractNo" prop="contract_no">
+                <el-input v-model="form.contract_no" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.input" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item :label="TEXT.common.fields.signedDate" prop="signed_date">
+                <el-date-picker
+                  v-model="form.signed_date"
+                  :disabled="isReadOnly"
+                  type="date"
+                  value-format="YYYY-MM-DD"
+                  :placeholder="TEXT.common.placeholders.select"
+                  class="full-width"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item :label="TEXT.modules.feeContracts.contractAmount" prop="contract_amount" required>
                 <el-input-number
                   v-model="form.contract_amount"
@@ -49,40 +66,28 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item :label="TEXT.modules.feeContracts.contractCases" prop="contract_cases" required>
                 <el-input-number v-model="form.contract_cases" :disabled="isReadOnly" :min="0" :step="1" class="full-width" controls-position="right" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item :label="TEXT.modules.feeContracts.actualCases" prop="actual_cases">
                 <el-input-number v-model="form.actual_cases" :disabled="isReadOnly" :min="0" :step="1" class="full-width" controls-position="right" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item :label="TEXT.modules.feeContracts.settlementAmount" prop="settlement_amount">
+              <el-form-item :label="TEXT.common.fields.currency" prop="currency">
-                <el-input-number
+                <el-select v-model="form.currency" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.select" class="full-width">
-                  v-model="form.settlement_amount"
+                  <el-option label="CNY" value="CNY" />
-                  :disabled="isReadOnly"
+                  <el-option label="USD" value="USD" />
-                  :min="0"
+                  <el-option label="EUR" value="EUR" />
-                  :precision="2"
+                </el-select>
-                  :step="1000"
-                  class="full-width"
-                  controls-position="right"
-                />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
-              <el-form-item :label="TEXT.modules.feeContracts.finalPaymentAmount" prop="final_payment_amount">
+              <el-form-item :label="TEXT.common.fields.remark" prop="remark">
-                <el-input-number
+                <el-input v-model="form.remark" :disabled="isReadOnly" type="textarea" :rows="2" :placeholder="TEXT.common.placeholders.input" />
-                  v-model="form.final_payment_amount"
-                  :disabled="isReadOnly"
-                  :min="0"
-                  :precision="2"
-                  :step="1000"
-                  class="full-width"
-                  controls-position="right"
-                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -100,7 +105,7 @@
           </template>
 
           <div v-if="payments.length === 0" class="section-empty">
-            <StateEmpty :description="TEXT.modules.feeContracts.paymentEmpty" />
+            {{ TEXT.modules.feeContracts.paymentEmpty }}
           </div>
           
           <div v-else class="payment-list">
@@ -217,16 +222,19 @@ import {
 } from "../../api/feeContracts";
 import { fetchSites } from "../../api/sites";
 import { useStudyStore } from "../../store/study";
+import { useAuthStore } from "../../store/auth";
 import StateEmpty from "../../components/StateEmpty.vue";
 import StateError from "../../components/StateError.vue";
 import StateLoading from "../../components/StateLoading.vue";
 import FeeAttachmentPanel from "../../components/fees/FeeAttachmentPanel.vue";
 import { TEXT } from "../../locales";
 import { isApiPermissionAllowed } from "../../utils/apiPermissionValue";
+import { isSystemAdmin } from "../../utils/roles";
 
 const route = useRoute();
 const router = useRouter();
 const study = useStudyStore();
+const auth = useAuthStore();
 
 const loading = ref(false);
 const saving = ref(false);
@@ -244,11 +252,13 @@ const form = reactive({
   id: "",
   project_id: "",
   center_id: "",
+  contract_no: "",
+  signed_date: "",
   contract_amount: 0,
+  currency: "CNY",
+  remark: "",
   contract_cases: 0,
   actual_cases: null as number | null,
-  settlement_amount: null as number | null,
-  final_payment_amount: null as number | null,
 });
 
 const payments = ref<any[]>([]);
@@ -258,7 +268,9 @@ const paymentErrors = ref<Record<string, string>[]>([]);
 const contractId = computed(() => route.params.contractId as string | undefined);
 const isEdit = computed(() => !!contractId.value);
 const projectRole = computed(() => study.currentStudyRole || (study.currentStudy as any)?.role_in_study || "");
+const isAdmin = computed(() => isSystemAdmin(auth.user));
 const canMutate = computed(() => {
+  if (isAdmin.value) return true;
   const operationKey = isEdit.value ? "fees_contracts:update" : "fees_contracts:create";
   return isApiPermissionAllowed(study.currentPermissions?.[projectRole.value]?.[operationKey]);
 });
@@ -315,11 +327,13 @@ const loadDetail = async () => {
       id: detail.id || contractId.value,
       project_id: detail.project_id || study.currentStudy?.id || "",
       center_id: detail.center_id || "",
+      contract_no: detail.contract_no || "",
+      signed_date: detail.signed_date || "",
       contract_amount: Number(detail.contract_amount || 0) / 10000,
+      currency: detail.currency || "CNY",
+      remark: detail.remark || "",
       contract_cases: Number(detail.contract_cases || 0),
       actual_cases: detail.actual_cases ?? null,
-      settlement_amount: detail.settlement_amount !== null && detail.settlement_amount !== undefined ? Number(detail.settlement_amount) / 10000 : null,
-      final_payment_amount: detail.final_payment_amount !== null && detail.final_payment_amount !== undefined ? Number(detail.final_payment_amount) / 10000 : null,
     });
     payments.value = (detail.payments || []).map((payment: any) => ({
       id: payment.id,
@@ -437,18 +451,22 @@ const submit = async () => {
     const payload = {
       project_id: study.currentStudy.id,
       center_id: form.center_id,
+      contract_no: form.contract_no || null,
+      signed_date: form.signed_date || null,
       contract_amount: Number(form.contract_amount || 0) * 10000,
+      currency: form.currency || "CNY",
+      remark: form.remark || null,
       contract_cases: Number(form.contract_cases || 0),
       actual_cases: form.actual_cases === null ? null : Number(form.actual_cases),
-      settlement_amount: form.settlement_amount === null ? null : Number(form.settlement_amount) * 10000,
-      final_payment_amount: form.final_payment_amount === null ? null : Number(form.final_payment_amount) * 10000,
     };
     const updatePayload = {
       contract_amount: payload.contract_amount,
+      contract_no: payload.contract_no,
+      signed_date: payload.signed_date,
+      currency: payload.currency,
+      remark: payload.remark,
       contract_cases: payload.contract_cases,
       actual_cases: payload.actual_cases,
-      settlement_amount: payload.settlement_amount,
-      final_payment_amount: payload.final_payment_amount,
     };
 
     let savedId = contractId.value || form.id;
@@ -553,9 +571,12 @@ onMounted(async () => {
 }
 
 .section-empty {
-  padding: 24px 0;
+  padding: 28px 0;
   display: flex;
   justify-content: center;
+  color: #8a97ab;
+  font-size: 14px;
+  line-height: 1.6;
 }
 
 .payment-list {

frontend/src/views/finance/ContractDetail.vue

@@ -1,120 +0,0 @@
-<template>
-  <div class="page">
-    <div class="unified-shell">
-      <section class="unified-section" v-loading="loading">
-        <div class="unified-section-header">
-          <div class="ctms-section-title">{{ TEXT.modules.financeContracts.detailTitle }}</div>
-          <div class="ctms-section-actions">
-            <el-button type="primary" :disabled="isReadOnly" @click="goEdit">{{ TEXT.common.actions.edit }}</el-button>
-            <el-button @click="goBack">{{ TEXT.common.actions.back }}</el-button>
-          </div>
-        </div>
-        <el-descriptions :column="2" border>
-          <el-descriptions-item :label="TEXT.common.fields.site">{{ detail.site_name || TEXT.common.fallback }}</el-descriptions-item>
-          <el-descriptions-item :label="TEXT.common.fields.contractNo">{{ detail.contract_no || TEXT.common.fallback }}</el-descriptions-item>
-          <el-descriptions-item :label="TEXT.common.fields.signedDate">{{ displayDate(detail.signed_date) }}</el-descriptions-item>
-          <el-descriptions-item :label="TEXT.common.fields.amount">
-            {{ detail.amount }} {{ detail.currency || TEXT.common.fields.currencyDefault }}
-          </el-descriptions-item>
-          <el-descriptions-item :label="TEXT.common.fields.remark" :span="2">{{ detail.remark || TEXT.common.fallback }}</el-descriptions-item>
-        </el-descriptions>
-      </section>
-      <section class="unified-section attachment-section">
-        <AttachmentList
-          v-if="contractId"
-          :study-id="studyId"
-          entity-type="finance_contract"
-          :entity-id="contractId"
-          :readonly="isReadOnly"
-        />
-      </section>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, reactive, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
-import { useStudyStore } from "../../store/study";
-import { getFinanceContract } from "../../api/financeContracts";
-import { fetchSites } from "../../api/sites";
-import { displayDate } from "../../utils/display";
-import AttachmentList from "../../components/attachments/AttachmentList.vue";
-import { TEXT } from "../../locales";
-
-const route = useRoute();
-const router = useRouter();
-const study = useStudyStore();
-const loading = ref(false);
-const contractId = route.params.contractId as string;
-const studyId = study.currentStudy?.id || "";
-const sites = ref<any[]>([]);
-
-const detail = reactive<any>({
-  site_name: "",
-  contract_no: "",
-  signed_date: "",
-  amount: "",
-  currency: "",
-  remark: "",
-});
-
-const siteActiveMap = computed(() => {
-  const map: Record<string, boolean> = {};
-  sites.value.forEach((site) => {
-    if (site?.name) map[site.name] = !!site.is_active;
-  });
-  return map;
-});
-const isReadOnly = computed(() => !!detail.site_name && siteActiveMap.value[detail.site_name] === false);
-
-const loadSites = async () => {
-  if (!studyId) return;
-  try {
-    const { data } = await fetchSites(studyId, { limit: 500 });
-    sites.value = Array.isArray(data) ? data : data.items || [];
-  } catch {
-    sites.value = [];
-  }
-};
-
-const load = async () => {
-  if (!studyId || !contractId) return;
-  loading.value = true;
-  try {
-    const { data } = await getFinanceContract(studyId, contractId);
-    Object.assign(detail, data);
-  } catch (e: any) {
-    ElMessage.error(e?.response?.data?.message || TEXT.common.messages.loadFailed);
-  } finally {
-    loading.value = false;
-  }
-};
-
-const goEdit = () => {
-  if (isReadOnly.value) {
-    ElMessage.warning("中心已停用");
-    return;
-  }
-  router.push(`/finance/contracts/${contractId}/edit`);
-};
-const goBack = () => router.push("/finance/contracts");
-
-onMounted(async () => {
-  await loadSites();
-  load();
-});
-</script>
-
-<style scoped>
-.page {
-  display: flex;
-  flex-direction: column;
-  gap: 0;
-}
-
-.attachment-section {
-  padding: 0;
-}
-</style>

frontend/src/views/finance/ContractForm.vue

@@ -1,184 +0,0 @@
-<template>
-  <div class="page">
-    <div class="unified-shell">
-      <section class="unified-section">
-        <div class="unified-section-header">
-          <div class="ctms-section-title">{{ isEdit ? TEXT.modules.financeContracts.editTitle : TEXT.modules.financeContracts.newTitle }}</div>
-          <div class="ctms-section-actions">
-            <el-button @click="goBack">{{ TEXT.common.actions.back }}</el-button>
-          </div>
-        </div>
-        <el-form ref="formRef" :model="form" label-width="110px">
-          <el-form-item :label="TEXT.common.fields.site" prop="site_name" required>
-            <el-input v-model="form.site_name" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.input + TEXT.common.fields.site" />
-          </el-form-item>
-          <el-form-item :label="TEXT.common.fields.contractNo" prop="contract_no" required>
-            <el-input v-model="form.contract_no" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.input + TEXT.common.fields.contractNo" />
-          </el-form-item>
-          <el-form-item :label="TEXT.common.fields.signedDate">
-            <el-date-picker v-model="form.signed_date" :disabled="isReadOnly" type="date" value-format="YYYY-MM-DD" :placeholder="TEXT.common.placeholders.select" />
-          </el-form-item>
-          <el-form-item :label="TEXT.common.fields.amount" prop="amount" required>
-            <el-input-number v-model="form.amount" :disabled="isReadOnly" :min="0" :precision="2" :step="1000" />
-          </el-form-item>
-          <el-form-item :label="TEXT.common.fields.currency">
-            <el-select v-model="form.currency" :disabled="isReadOnly" :placeholder="TEXT.common.placeholders.select">
-              <el-option label="CNY" value="CNY" />
-              <el-option label="USD" value="USD" />
-              <el-option label="EUR" value="EUR" />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="TEXT.common.fields.remark">
-            <el-input v-model="form.remark" :disabled="isReadOnly" type="textarea" :rows="3" :placeholder="TEXT.common.placeholders.input" />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" :loading="saving" :disabled="isReadOnly" @click="submit">{{ TEXT.common.actions.save }}</el-button>
-            <el-button @click="goBack">{{ TEXT.common.actions.cancel }}</el-button>
-          </el-form-item>
-        </el-form>
-      </section>
-      <section class="unified-section">
-        <AttachmentList
-          v-if="isEdit && contractId"
-          :study-id="studyId"
-          entity-type="finance_contract"
-          :entity-id="contractId"
-          :readonly="isReadOnly"
-        />
-        <StateEmpty v-else :description="TEXT.modules.financeContracts.uploadHint" />
-      </section>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, reactive, ref } from "vue";
-import { useRoute, useRouter } from "vue-router";
-import { ElMessage } from "element-plus";
-import { useStudyStore } from "../../store/study";
-import { createFinanceContract, getFinanceContract, updateFinanceContract } from "../../api/financeContracts";
-import { fetchSites } from "../../api/sites";
-import AttachmentList from "../../components/attachments/AttachmentList.vue";
-import StateEmpty from "../../components/StateEmpty.vue";
-import { TEXT } from "../../locales";
-import { isApiPermissionAllowed } from "../../utils/apiPermissionValue";
-
-const route = useRoute();
-const router = useRouter();
-const study = useStudyStore();
-const saving = ref(false);
-const sites = ref<any[]>([]);
-
-const contractId = computed(() => route.params.contractId as string | undefined);
-const isEdit = computed(() => !!contractId.value);
-const studyId = computed(() => study.currentStudy?.id || "");
-const projectRole = computed(() => study.currentStudyRole || (study.currentStudy as any)?.role_in_study || "");
-const canMutate = computed(() => {
-  const operationKey = isEdit.value ? "finance_contracts:update" : "finance_contracts:create";
-  return isApiPermissionAllowed(study.currentPermissions?.[projectRole.value]?.[operationKey]);
-});
-
-const form = reactive({
-  site_name: "",
-  contract_no: "",
-  signed_date: "",
-  amount: 0,
-  currency: "CNY",
-  remark: "",
-});
-
-const siteActiveMap = computed(() => {
-  const map: Record<string, boolean> = {};
-  sites.value.forEach((site) => {
-    if (site?.name) map[site.name] = !!site.is_active;
-  });
-  return map;
-});
-const isReadOnly = computed(() => !canMutate.value || (isEdit.value && !!form.site_name && siteActiveMap.value[form.site_name] === false));
-
-const loadSites = async () => {
-  if (!studyId.value) return;
-  try {
-    const { data } = await fetchSites(studyId.value, { limit: 500 });
-    sites.value = Array.isArray(data) ? data : data.items || [];
-  } catch {
-    sites.value = [];
-  }
-};
-
-const load = async () => {
-  if (!isEdit.value || !studyId.value || !contractId.value) return;
-  try {
-    const { data } = await getFinanceContract(studyId.value, contractId.value);
-    Object.assign(form, {
-      site_name: data.site_name || "",
-      contract_no: data.contract_no || "",
-      signed_date: data.signed_date || "",
-      amount: Number(data.amount || 0),
-      currency: data.currency || "CNY",
-      remark: data.remark || "",
-    });
-  } catch (e: any) {
-    ElMessage.error(e?.response?.data?.message || TEXT.common.messages.loadFailed);
-  }
-};
-
-const submit = async () => {
-  if (!studyId.value) return;
-  if (!canMutate.value) {
-    ElMessage.warning("权限不足");
-    return;
-  }
-  if (isReadOnly.value) {
-    ElMessage.warning("中心已停用");
-    return;
-  }
-  if (!form.site_name) {
-    ElMessage.warning(TEXT.common.messages.required);
-    return;
-  }
-  if (siteActiveMap.value[form.site_name] === false) {
-    ElMessage.warning("中心已停用");
-    return;
-  }
-  saving.value = true;
-  try {
-    const payload = {
-      site_name: form.site_name,
-      contract_no: form.contract_no,
-      signed_date: form.signed_date || null,
-      amount: form.amount,
-      currency: form.currency,
-      remark: form.remark || null,
-    };
-    if (isEdit.value && contractId.value) {
-      await updateFinanceContract(studyId.value, contractId.value, payload);
-      ElMessage.success(TEXT.common.messages.saveSuccess);
-      router.push(`/finance/contracts/${contractId.value}`);
-    } else {
-      const { data } = await createFinanceContract(studyId.value, payload);
-      ElMessage.success(TEXT.common.messages.createSuccess);
-      router.push(`/finance/contracts/${data.id}`);
-    }
-  } catch (e: any) {
-    ElMessage.error(e?.response?.data?.message || TEXT.common.messages.saveFailed);
-  } finally {
-    saving.value = false;
-  }
-};
-
-const goBack = () => router.push("/finance/contracts");
-
-onMounted(async () => {
-  await loadSites();
-  load();
-});
-</script>
-
-<style scoped>
-.page {
-  display: flex;
-  flex-direction: column;
-  gap: 0;
-}
-</style>

frontend/src/views/ia/FinanceContracts.vue

@@ -1,249 +0,0 @@
-<template>
-  <div class="page">
-    <div class="main-content-flat unified-shell">
-      <div class="filter-container unified-action-bar">
-        <el-form :inline="true" :model="filters" class="filter-form">
-          <div class="filter-item-form">
-            <el-input 
-              v-model="filters.site_name" 
-              :placeholder="TEXT.common.fields.site" 
-              clearable 
-              class="filter-input-comp"
-            />
-          </div>
-          <div class="filter-item-form">
-            <el-input 
-              v-model="filters.contract_no" 
-              :placeholder="TEXT.common.fields.contractNo" 
-              clearable 
-              class="filter-input-comp"
-            />
-          </div>
-          <div class="filter-item-form">
-            <el-button @click="resetFilters">{{ TEXT.common.actions.reset }}</el-button>
-          </div>
-          <div class="filter-spacer"></div>
-          <el-button type="primary" @click="goNew">
-            {{ TEXT.modules.financeContracts.newTitle }}
-          </el-button>
-        </el-form>
-      </div>
-      <div class="unified-section table-section">
-        <el-table
-          :data="sortedItems"
-          v-loading="loading"
-          style="width: 100%"
-          class="ctms-table"
-          @row-click="onRowClick"
-          :row-class-name="contractRowClass"
-          table-layout="fixed"
-        >
-          <el-table-column prop="site_name" :label="TEXT.common.fields.site" show-overflow-tooltip />
-          <el-table-column prop="contract_no" :label="TEXT.common.fields.contractNo" show-overflow-tooltip />
-          <el-table-column prop="signed_date" :label="TEXT.common.fields.signedDate">
-            <template #default="scope">
-              {{ displayDate(scope.row.signed_date) }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="TEXT.common.fields.amount">
-            <template #default="scope">
-              {{ scope.row.amount }} {{ scope.row.currency || TEXT.common.fields.currencyDefault }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="updated_at" :label="TEXT.common.labels.updatedAt" show-overflow-tooltip>
-            <template #default="scope">
-              {{ displayDateTime(scope.row.updated_at) }}
-            </template>
-          </el-table-column>
-          <el-table-column :label="TEXT.common.labels.actions" width="120">
-            <template #default="scope">
-              <el-button
-                link
-                type="danger"
-                size="small"
-                :disabled="isInactiveSite(scope.row.site_name)"
-                @click.stop="remove(scope.row)"
-              >
-                {{ TEXT.common.actions.delete }}
-              </el-button>
-            </template>
-          </el-table-column>
-          <template #empty>
-            <div v-if="!loading" class="table-empty">{{ TEXT.modules.financeContracts.empty }}</div>
-          </template>
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted, reactive, ref } from "vue";
-import { useRouter } from "vue-router";
-import { ElMessage, ElMessageBox } from "element-plus";
-import { useStudyStore } from "../../store/study";
-import { listFinanceContracts, deleteFinanceContract } from "../../api/financeContracts";
-import { fetchSites } from "../../api/sites";
-import { displayDate, displayDateTime } from "../../utils/display";
-import { TEXT } from "../../locales";
-
-const router = useRouter();
-const study = useStudyStore();
-const loading = ref(false);
-const items = ref<any[]>([]);
-const sites = ref<any[]>([]);
-const filters = reactive({
-  site_name: "",
-  contract_no: "",
-});
-
-const siteActiveMap = computed(() => {
-  const map: Record<string, boolean> = {};
-  sites.value.forEach((site) => {
-    if (site?.name) map[site.name] = !!site.is_active;
-  });
-  return map;
-});
-const isInactiveSite = (siteName?: string) => !!siteName && siteActiveMap.value[siteName] === false;
-const contractRowClass = ({ row }: { row: any }) =>
-  `${row?.id ? "clickable-row" : ""}${isInactiveSite(row?.site_name) ? " row-inactive" : ""}`.trim();
-const filteredItems = computed(() => {
-  const siteKeyword = filters.site_name.trim().toLowerCase();
-  const contractKeyword = filters.contract_no.trim().toLowerCase();
-  return items.value.filter((item) => {
-    if (siteKeyword && !String(item?.site_name || "").toLowerCase().includes(siteKeyword)) return false;
-    if (contractKeyword && !String(item?.contract_no || "").toLowerCase().includes(contractKeyword)) return false;
-    return true;
-  });
-});
-const sortedItems = computed(() =>
-  [...filteredItems.value].sort((a, b) => Number(isInactiveSite(a?.site_name)) - Number(isInactiveSite(b?.site_name)))
-);
-
-const loadSites = async () => {
-  const studyId = study.currentStudy?.id;
-  if (!studyId) return;
-  try {
-    const { data } = await fetchSites(studyId, { limit: 500 });
-    sites.value = Array.isArray(data) ? data : data.items || [];
-  } catch {
-    sites.value = [];
-  }
-};
-
-const load = async () => {
-  const studyId = study.currentStudy?.id;
-  if (!studyId) return;
-  loading.value = true;
-  try {
-    const { data } = await listFinanceContracts(studyId, {}) as any;
-    items.value = Array.isArray(data) ? data : data.items || [];
-  } catch (e: any) {
-    ElMessage.error(e?.response?.data?.message || TEXT.common.messages.loadFailed);
-  } finally {
-    loading.value = false;
-  }
-};
-
-const resetFilters = () => {
-  filters.site_name = "";
-  filters.contract_no = "";
-};
-
-const goNew = () => router.push("/finance/contracts/new");
-const goDetail = (id: string) => router.push(`/finance/contracts/${id}`);
-const onRowClick = (row: any) => {
-  if (!row?.id) return;
-  goDetail(row.id);
-};
-
-const remove = async (row: any) => {
-  const studyId = study.currentStudy?.id;
-  if (!studyId) return;
-  if (isInactiveSite(row?.site_name)) {
-    ElMessage.warning("中心已停用");
-    return;
-  }
-  const ok = await ElMessageBox.confirm(TEXT.common.confirm.delete, TEXT.common.labels.tips).catch(() => null);
-  if (!ok) return;
-  try {
-    await deleteFinanceContract(studyId, row.id);
-    ElMessage.success(TEXT.common.messages.deleteSuccess);
-    load();
-  } catch (e: any) {
-    ElMessage.error(e?.response?.data?.message || TEXT.common.messages.deleteFailed);
-  }
-};
-
-onMounted(async () => {
-  await loadSites();
-  load();
-});
-</script>
-
-<style scoped>
-.page {
-  display: flex;
-  flex-direction: column;
-}
-
-.main-content-flat {
-  background: transparent;
-  border: 0;
-  border-radius: 0;
-  box-shadow: none;
-  padding: 0;
-}
-
-.filter-form {
-  display: flex;
-  width: 100%;
-  gap: 8px;
-  align-items: center;
-}
-
-.filter-item-form {
-  margin-bottom: 0 !important;
-  margin-right: 0 !important;
-}
-
-.filter-input-comp {
-  width: 160px;
-}
-
-.filter-spacer {
-  flex: 1;
-}
-
-.table-section {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-.ctms-table :deep(.el-table__inner-wrapper::before) {
-  display: none;
-}
-
-
-.table-empty {
-  min-height: 220px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: #8a97ab;
-  font-size: 14px;
-  font-weight: 500;
-  letter-spacing: 0.02em;
-}
-</style>
-
-<style>
-.row-inactive td {
-  color: var(--ctms-text-secondary);
-  background-color: #fff7d6 !important;
-}
-
-.row-inactive .el-tag {
-  opacity: 0.6;
-}
-</style>