refactor(finance): 人工成本收敛为「人工录单 → 扣备用金 → 写快照」

公司人工支出登记单与审批报销状态机整链下线，人工成本只留一条链路。口径调整（2026-10-23 确认）： - 历史人工支出找不回来，直接放弃：不补录、不做样本校准、不做均价估算，只保证上线后的新单不丢。 - 人工成本逐单按实际金额，从客服备用金扣款，客服只能用本人账户；没有登记单、没有审批、没有报销，录入即计入毛利。后端： - 新增 services/finance/manual-order-cost-service.ts：扣备用金 + 写 actual 成本快照，同一事务，余额不足直接拒绝不允许负余额。 - 成本快照主体从「人工支出登记单 id」改为「客服备用金支出单 id」（subject_type='manual_case'，subject_id=manual_expenses.id）。 - 删除 services/finance/manual-expense-service.ts（1263 行）与 routes/admin/finance.ts 下 /finance/manual-expenses* 全套接口。前端： - 删除 AdminManualExpensePage.tsx（778 行）与 /admin/manual-expenses 菜单页。 - ManualOrderCostModal 去掉「提交审核 / 立即计入成本」开关，录入即生效。 - 新增 services/admin/manual-order-cost.ts。迁移： - 106_manual_expense_records.sql → 106_fund_account_no_readable.sql，只保留备用金账户编号可读化。 - 108_drop_manual_expense_records.sql：删除 manual_expense_records 与 manual_expense_events 两张表。 - 109_isolate_legacy_manual_snapshots.sql：把来源为旧登记链的历史孤儿快照 subject_id 改为负数，与 manual_expenses.id 彻底隔离。踩坑修复（E2E 实测发现）：主体 id 换空间后与历史孤儿快照撞唯一索引 uq_cost_snapshots_active_subject_item，INSERT ... ON CONFLICT DO NOTHING 静默跳过，导致「钱从备用金扣了、成本快照却没写成」。修法是迁移 109 隔离 legacy 主体 + 后端快照写失败必须抛错回滚（409），杜绝账实不符。文档：现行 5 篇 + README 基线校准为 dev @ 43f402cf + 迁移 103–109，修正已删除的旧迁移号，删除「人工支出登记 + 审批 + 报销」口径，已作废 DDL 草案移入 docs/archive/2026-10-23/。校验：后端 765 项 / 0 失败（含 check:sql 迁移护栏），前端 143 项全通过； E2E 实测两笔同订单项各自独立主体、余额扣减与快照金额一一对应；本地库迁移 108/109 执行后数据量与改造前完全一致。 Co-Authored-By: Claude Opus 4.5 (1M context) <noreply@anthropic.com>
2026-10-24 11:31:29 +08:00
parent 43f402cf72
commit fb679d76f6
25 changed files with 953 additions and 2739 deletions
@@ -22,7 +22,6 @@ import WorkerLayout from '@/layouts/WorkerLayout'
 const AdminDashboardPage = lazy(() => import('@/pages/admin/AdminDashboardPage'))
 const AdminFinancePage = lazy(() => import('@/pages/admin/AdminFinancePage'))
 const AdminSalesProfitPage = lazy(() => import('@/pages/admin/AdminSalesProfitPage'))
-const AdminManualExpensePage = lazy(() => import('@/pages/admin/AdminManualExpensePage'))
 const AdminCostCenterPage = lazy(() => import('@/pages/admin/AdminCostCenterPage'))
 const AdminFundPage = lazy(() => import('@/pages/admin/AdminFundPage'))
 const AdminAuditLogsPage = lazy(() => import('@/pages/admin/AdminAuditLogsPage'))
@@ -153,7 +152,6 @@ function AdminApplication() {
              </Route>
              <Route element={<RequireRole roles={['admin', 'operator', 'support', 'finance']} />}>
                <Route path="fund" element={<AdminFundPage />} />
-                <Route path="manual-expenses" element={<AdminManualExpensePage />} />
              </Route>
              <Route path="worker-platform" element={<AdminWorkerPlatformPage />} />
              <Route element={<RequireRole roles={['admin', 'operator', 'support']} />}>
@@ -1,10 +1,10 @@
-import { App, Alert, Form, Input, InputNumber, Modal, Select, Switch } from 'antd'
+import { App, Alert, Form, Input, InputNumber, Modal, Select } from 'antd'
 import type { FormInstance } from 'antd'
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { useEffect, useState } from 'react'

 import { createAdminManualOrderCost, fetchAdminFundAccounts } from '@/services/admin'
-import { getAdminRole, hasAdminPermission } from '@/utils/admin-auth'
+import { getAdminRole } from '@/utils/admin-auth'

 export type ManualOrderCostItem = {
  orderItemId: number
@@ -31,7 +31,6 @@ type ManualOrderCostFormValues = {
  paymentMethod?: string
  evidence?: string
  note?: string
-  effective?: boolean
 }

 const CATEGORY_OPTIONS = [
@@ -68,7 +67,6 @@ export default function ManualOrderCostModal({
  const { message } = App.useApp()
  const queryClient = useQueryClient()
  const [form] = Form.useForm<ManualOrderCostFormValues>()
-  const [canApprove, setCanApprove] = useState(false)
  const fundAccountsQuery = useQuery({
    queryKey: ['admin-fund-accounts', 'agent'],
    queryFn: () =>
@@ -82,7 +80,6 @@ export default function ManualOrderCostModal({

  useEffect(() => {
    if (!open) return
-    setCanApprove(hasAdminPermission('finance.review'))
    form.resetFields()
    form.setFieldsValue({
      orderItemId: items.length === 1 ? items[0].orderItemId : undefined,
@@ -90,7 +87,6 @@ export default function ManualOrderCostModal({
      amountYuan: undefined,
      expenseCategory: 'service_fee',
      paymentMethod: 'other',
-      effective: hasAdminPermission('finance.review'),
    })
  }, [form, items, open, soleFundAccountId])

@@ -108,19 +104,16 @@ export default function ManualOrderCostModal({
        evidenceJson: values.evidence
          ? { reference: values.evidence }
          : { note: values.note || '订单页人工录单' },
-        effective: canApprove ? values.effective !== false : false,
      }),
    onSuccess: (response) => {
      const result = response.data
-      if (result.effective) {
-        message.success(`已计入订单成本，支出单号 ${result.record.expenseNo}`)
-      } else if (result.reason === 'approval_failed') {
-        message.warning(result.message || '已提交，但自动生效失败，请到人工支出页审核')
+      if (result.warning) {
+        message.warning(result.warning)
      } else {
-        message.success(`已提交人工支出 ${result.record.expenseNo}，财务审核后计入毛利`)
+        message.success(`已计入订单成本，支出单号 ${result.expenseNo}`)
      }
-      void queryClient.invalidateQueries({ queryKey: ['admin-manual-expenses'] })
      void queryClient.invalidateQueries({ queryKey: ['admin-fund-accounts'] })
+      void queryClient.invalidateQueries({ queryKey: ['admin-fund-expenses'] })
      void queryClient.invalidateQueries({ queryKey: ['admin-sales-profit-overview'] })
      void queryClient.invalidateQueries({ queryKey: ['admin-sales-facts'] })
      void queryClient.invalidateQueries({ queryKey: ['admin-order-detail', String(orderId)] })
@@ -140,7 +133,7 @@ export default function ManualOrderCostModal({
    <Modal
      open={open}
      title="人工录单 / 录入订单成本"
-      okText={canApprove ? '确认录入并计入成本' : '提交审核'}
+      okText="确认录入并计入成本"
      cancelText="取消"
      confirmLoading={mutation.isPending}
      onOk={() => void submit()}
@@ -158,7 +151,7 @@ export default function ManualOrderCostModal({
          showIcon
          style={{ marginBottom: 14 }}
          message="每一单单独录实际金额，不按小时、不按单量套模板"
-          description="成本会从所选客服备用金账户扣减，并关联到订单号；只有一笔订单项时自动带入，多笔时需要选择具体订单项。审核通过后写入成本快照，并计入销售毛利。"
+          description="成本会从所选客服备用金账户扣减，并关联到订单号；只有一笔订单项时自动带入，多笔时需要选择具体订单项。录入即写入成本快照并计入销售毛利，没有审批与报销环节。"
        />
        <Form.Item label="订单号">
          <Input value={orderNo} readOnly />
@@ -272,23 +265,6 @@ export default function ManualOrderCostModal({
            placeholder="这一单实际做了什么、为什么是这个金额"
          />
        </Form.Item>
-        {canApprove ? (
-          <Form.Item
-            name="effective"
-            label="立即计入成本"
-            valuePropName="checked"
-            extra="关闭后先提交，等财务在人工支出页审核通过再计入毛利。"
-          >
-            <Switch />
-          </Form.Item>
-        ) : (
-          <Alert
-            type="warning"
-            showIcon
-            message="提交后需要财务审核"
-            description="当前账号没有 finance.review 权限，录入后状态为待审核，审核通过才会写入成本快照。"
-          />
-        )}
      </Form>
    </Modal>
  )
@@ -6,7 +6,6 @@ import {
  BugOutlined,
  DashboardOutlined,
  FileSearchOutlined,
-  FileTextOutlined,
  LogoutOutlined,
  LineChartOutlined,
  MenuFoldOutlined,
@@ -135,7 +134,6 @@ export default function AdminLayout() {
        ? [
            { key: '/admin/finance', icon: <AccountBookOutlined />, label: '财务' },
            { key: '/admin/sales-profit', icon: <LineChartOutlined />, label: '销售毛利' },
-            { key: '/admin/manual-expenses', icon: <FileTextOutlined />, label: '人工支出' },
            { key: '/admin/cost-center', icon: <ApartmentOutlined />, label: '商品与成本' },
            { key: '/admin/fund', icon: <WalletOutlined />, label: '备用金' },
            { key: '/admin/worker-platform', icon: <TrophyOutlined />, label: '资金审核' },
@@ -148,11 +146,6 @@ export default function AdminLayout() {
              icon: <WalletOutlined />,
              label: role === 'support' ? '我的备用金' : '备用金',
            },
-            {
-              key: '/admin/manual-expenses',
-              icon: <FileTextOutlined />,
-              label: '人工支出',
-            },
            ...(role === 'support'
              ? []
              : [
@@ -1,778 +0,0 @@
-import {
-  CheckOutlined,
-  CloseOutlined,
-  PlusOutlined,
-  ReloadOutlined,
-  SearchOutlined,
-  WalletOutlined,
-} from '@ant-design/icons'
-import { useQuery, useQueryClient } from '@tanstack/react-query'
-import {
-  Alert,
-  App,
-  Button,
-  Card,
-  Col,
-  DatePicker,
-  Form,
-  Input,
-  InputNumber,
-  Modal,
-  Row,
-  Select,
-  Space,
-  Statistic,
-  Table,
-  Tag,
-  Typography,
-} from 'antd'
-import type { TableColumnsType } from 'antd'
-import type { Dayjs } from 'dayjs'
-import { useEffect, useState } from 'react'
-import { useSearchParams } from 'react-router'
-
-import { AdminRangePicker } from '@/components/admin/AdminDatePicker'
-import PageHeader from '@/components/admin/PageHeader'
-import dayjs from '@/lib/dayjs'
-import {
-  approveAdminManualExpense,
-  createAdminManualExpense,
-  fetchAdminFundAccounts,
-  fetchAdminManualExpenseCostItems,
-  fetchAdminManualExpenseOverview,
-  fetchAdminManualExpenses,
-  rejectAdminManualExpense,
-  reimburseAdminManualExpense,
-} from '@/services/admin'
-import type { AdminManualExpense, AdminManualExpenseStatus } from '@/types/admin'
-import { ADMIN_DEFAULT_PAGE_SIZE, buildAdminTablePagination } from '@/utils/admin-pagination'
-import { hasAdminPermission, getAdminRole } from '@/utils/admin-auth'
-import { formatAdminDateTime } from '@/utils/admin-time'
-import { formatMoney } from './panels/shared'
-
-type FilterForm = { dateRange?: unknown; status?: string; keyword?: string }
-
-type ExpenseForm = {
-  orderId?: number
-  orderItemId?: number
-  fundAccountId?: number
-  costItemId?: number
-  amountYuan?: number
-  expenseCategory: string
-  payeeType: string
-  payeeName: string
-  payeeAccount?: string
-  paymentMethod: string
-  paidAt?: unknown
-  evidenceReference: string
-  note?: string
-}
-
-const STATUS_META: Record<AdminManualExpenseStatus, { label: string; color: string }> = {
-  draft: { label: '草稿', color: 'default' },
-  submitted: { label: '待审核', color: 'orange' },
-  approved: { label: '已通过', color: 'green' },
-  rejected: { label: '已驳回', color: 'red' },
-  reimbursed: { label: '已报销', color: 'blue' },
-  reversed: { label: '已冲正', color: 'purple' },
-}
-
-const CATEGORY_OPTIONS = [
-  { value: 'goods_purchase', label: '采购拿货' },
-  { value: 'compensation', label: '客户赔偿' },
-  { value: 'refund_advance', label: '退款垫付' },
-  { value: 'service_fee', label: '服务费' },
-  { value: 'freight', label: '运费' },
-  { value: 'recharge', label: '平台充值' },
-  { value: 'other', label: '其他' },
-]
-
-const PAYEE_TYPE_OPTIONS = [
-  { value: 'worker', label: '打手' },
-  { value: 'upstream', label: '上游/供货' },
-  { value: 'customer', label: '客户' },
-  { value: 'platform', label: '平台' },
-  { value: 'other', label: '其他' },
-]
-
-const PAYMENT_METHOD_OPTIONS = [
-  { value: 'wechat', label: '微信' },
-  { value: 'alipay', label: '支付宝' },
-  { value: 'bank', label: '银行卡' },
-  { value: 'cash', label: '现金' },
-  { value: 'platform_balance', label: '平台余额' },
-  { value: 'other', label: '其他' },
-]
-
-export default function AdminManualExpensePage() {
-  const { message, modal } = App.useApp()
-  const queryClient = useQueryClient()
-  const [searchParams] = useSearchParams()
-  const [filterForm] = Form.useForm<FilterForm>()
-  const [expenseForm] = Form.useForm<ExpenseForm>()
-  const canReview = hasAdminPermission('finance.review')
-  const canCreate = hasAdminPermission('fund.expense') || hasAdminPermission('finance.config')
-
-  const [filters, setFilters] = useState({
-    dateFrom: '',
-    dateTo: '',
-    status: '',
-    keyword: '',
-  })
-  const [page, setPage] = useState(1)
-  const [pageSize, setPageSize] = useState(ADMIN_DEFAULT_PAGE_SIZE)
-  const [createOpen, setCreateOpen] = useState(false)
-  const [creating, setCreating] = useState(false)
-  const [actionId, setActionId] = useState<number | null>(null)
-  const [rejectTarget, setRejectTarget] = useState<AdminManualExpense | null>(null)
-  const [rejectReason, setRejectReason] = useState('')
-
-  const listQuery = useQuery({
-    queryKey: ['admin-manual-expenses', filters, page, pageSize],
-    queryFn: () => fetchAdminManualExpenses({ ...filters, page, pageSize }),
-  })
-  const overviewQuery = useQuery({
-    queryKey: ['admin-manual-expense-overview', filters],
-    queryFn: () => fetchAdminManualExpenseOverview(filters),
-  })
-  const costItemsQuery = useQuery({
-    queryKey: ['admin-manual-expense-cost-items'],
-    queryFn: fetchAdminManualExpenseCostItems,
-  })
-  const fundAccountsQuery = useQuery({
-    queryKey: ['admin-fund-accounts', 'agent'],
-    queryFn: () =>
-      fetchAdminFundAccounts({ accountType: 'agent', status: 'active', pageSize: 200 }),
-    enabled: createOpen,
-  })
-
-  const list = listQuery.data?.data
-  const overview = overviewQuery.data?.data?.overview
-  const costItems = costItemsQuery.data?.data.items || []
-  const fundAccounts = fundAccountsQuery.data?.data.items || []
-  const isSupport = getAdminRole() === 'support'
-  const ownFundAccount = isSupport ? fundAccounts[0] : undefined
-
-  useEffect(() => {
-    const orderId = Number(searchParams.get('orderId') || 0)
-    if (Number.isInteger(orderId) && orderId > 0) {
-      setCreateOpen(true)
-      expenseForm.setFieldsValue({ orderId })
-    }
-  }, [expenseForm, searchParams])
-
-  useEffect(() => {
-    if (!createOpen) return
-    const current = expenseForm.getFieldValue('costItemId')
-    if (current) return
-    const systemItem = costItems.find(
-      (item: { code: string; id: number }) => item.code === 'sys_manual_service',
-    )
-    if (systemItem) expenseForm.setFieldValue('costItemId', systemItem.id)
-  }, [costItems, createOpen, expenseForm])
-
-  useEffect(() => {
-    if (!createOpen) return
-    if (isSupport && !ownFundAccount) return
-    if (fundAccounts.length !== 1 && !ownFundAccount) return
-    if (!expenseForm.getFieldValue('fundAccountId')) {
-      expenseForm.setFieldValue('fundAccountId', ownFundAccount?.id || fundAccounts[0]?.id)
-    }
-  }, [createOpen, expenseForm, fundAccounts, isSupport, ownFundAccount])
-
-  function refreshAll() {
-    void queryClient.invalidateQueries({ queryKey: ['admin-manual-expenses'] })
-    void queryClient.invalidateQueries({ queryKey: ['admin-manual-expense-overview'] })
-    void queryClient.invalidateQueries({ queryKey: ['admin-fund-accounts'] })
-  }
-
-  function applyFilters(values: FilterForm) {
-    const range = Array.isArray(values.dateRange) ? values.dateRange : []
-    setPage(1)
-    setFilters({
-      dateFrom: range[0] ? dayjs(range[0]).format('YYYY-MM-DD') : '',
-      dateTo: range[1] ? dayjs(range[1]).format('YYYY-MM-DD') : '',
-      status: values.status || '',
-      keyword: String(values.keyword || '').trim(),
-    })
-  }
-
-  function resetFilters() {
-    filterForm.resetFields()
-    setPage(1)
-    setFilters({ dateFrom: '', dateTo: '', status: '', keyword: '' })
-  }
-
-  async function submitExpense() {
-    const values = await expenseForm.validateFields()
-    setCreating(true)
-    try {
-      const amountFen = Math.round(Number(values.amountYuan || 0) * 100)
-      const paidAt = values.paidAt
-        ? dayjs(values.paidAt as Dayjs).format('YYYY-MM-DD HH:mm:ss')
-        : dayjs().format('YYYY-MM-DD HH:mm:ss')
-      const response = await createAdminManualExpense({
-        orderId: values.orderId || undefined,
-        orderItemId: values.orderItemId || undefined,
-        fundAccountId: values.fundAccountId,
-        costItemId: values.costItemId || undefined,
-        amountFen,
-        expenseCategory: values.expenseCategory,
-        payeeType: values.payeeType,
-        payeeName: values.payeeName,
-        payeeAccount: values.payeeAccount || '',
-        paymentMethod: values.paymentMethod,
-        paidAt,
-        evidenceJson: { reference: values.evidenceReference },
-        note: values.note || '',
-      })
-      message.success(`已登记 ${response.data.expenseNo}`)
-      setCreateOpen(false)
-      expenseForm.resetFields()
-      refreshAll()
-    } catch (error) {
-      message.error(error instanceof Error ? error.message : '登记人工支出失败')
-    } finally {
-      setCreating(false)
-    }
-  }
-
-  function approve(row: AdminManualExpense) {
-    modal.confirm({
-      title: '通过人工支出',
-      content: `确认通过 ${row.expenseNo}，金额 ${formatMoney(row.amountFen)}？通过后会计入成本。`,
-      okText: '通过',
-      cancelText: '取消',
-      onOk: async () => {
-        setActionId(row.id)
-        try {
-          await approveAdminManualExpense(row.id)
-          message.success('人工支出已通过')
-          refreshAll()
-        } catch (error) {
-          message.error(error instanceof Error ? error.message : '审核失败')
-        } finally {
-          setActionId(null)
-        }
-      },
-    })
-  }
-
-  function openReject(row: AdminManualExpense) {
-    setRejectTarget(row)
-    setRejectReason('')
-  }
-
-  async function submitReject() {
-    if (!rejectTarget) return
-    if (!rejectReason.trim()) {
-      message.warning('请填写驳回原因')
-      return
-    }
-    setActionId(rejectTarget.id)
-    try {
-      await rejectAdminManualExpense(rejectTarget.id, rejectReason.trim())
-      message.success('人工支出已驳回')
-      setRejectTarget(null)
-      refreshAll()
-    } catch (error) {
-      message.error(error instanceof Error ? error.message : '驳回失败')
-    } finally {
-      setActionId(null)
-    }
-  }
-
-  function reimburse(row: AdminManualExpense) {
-    modal.confirm({
-      title: '标记已报销',
-      content: `确认 ${row.expenseNo} 已完成报销？`,
-      okText: '标记已报销',
-      cancelText: '取消',
-      onOk: async () => {
-        setActionId(row.id)
-        try {
-          await reimburseAdminManualExpense(row.id)
-          message.success('已标记报销')
-          refreshAll()
-        } catch (error) {
-          message.error(error instanceof Error ? error.message : '标记报销失败')
-        } finally {
-          setActionId(null)
-        }
-      },
-    })
-  }
-
-  const columns: TableColumnsType<AdminManualExpense> = [
-    {
-      title: '登记号 / 状态',
-      dataIndex: 'expenseNo',
-      width: 190,
-      render: (value: string, row) => {
-        const meta = STATUS_META[row.status]
-        return (
-          <Space direction="vertical" size={2}>
-            <Typography.Text copyable>{value}</Typography.Text>
-            <Tag color={meta.color}>{meta.label}</Tag>
-          </Space>
-        )
-      },
-    },
-    {
-      title: '付款时间',
-      dataIndex: 'paidAt',
-      width: 165,
-      render: (value: string) => formatAdminDateTime(value),
-    },
-    {
-      title: '订单 / 商品',
-      key: 'order',
-      width: 260,
-      render: (_, row) => (
-        <Space direction="vertical" size={2}>
-          <span>{row.platformOrderId || (row.orderId ? `#${row.orderId}` : '无关联订单')}</span>
-          <Typography.Text type="secondary" ellipsis>
-            {row.skuName || row.workOrderNo || '-'}
-          </Typography.Text>
-        </Space>
-      ),
-    },
-    {
-      title: '付款项目',
-      key: 'costItem',
-      width: 180,
-      render: (_, row) => (
-        <Space direction="vertical" size={2}>
-          <span>{row.costItemName || '未归类'}</span>
-          <Typography.Text type="secondary">
-            {CATEGORY_OPTIONS.find((item) => item.value === row.expenseCategory)?.label ||
-              row.expenseCategory}
-          </Typography.Text>
-        </Space>
-      ),
-    },
-    {
-      title: '金额',
-      dataIndex: 'amountFen',
-      width: 120,
-      render: (value: number) => <Typography.Text strong>{formatMoney(value)}</Typography.Text>,
-    },
-    {
-      title: '付款人 → 收款人',
-      key: 'parties',
-      width: 190,
-      render: (_, row) => (
-        <Space direction="vertical" size={2}>
-          <span>{row.paidByName || '-'}</span>
-          <Typography.Text type="secondary">→ {row.payeeName || '-'}</Typography.Text>
-        </Space>
-      ),
-    },
-    {
-      title: '备用金账户',
-      key: 'fundAccount',
-      width: 180,
-      render: (_, row) =>
-        row.fundAccountId ? (
-          <Space direction="vertical" size={2}>
-            <span>{row.fundAccountOwnerName || '-'}</span>
-            <Typography.Text type="secondary">
-              {row.fundAccountNo || `#${row.fundAccountId}`} · {row.fundExpenseNo || '-'}
-            </Typography.Text>
-          </Space>
-        ) : (
-          <Tag color="default">未走备用金</Tag>
-        ),
-    },
-    {
-      title: '凭证',
-      dataIndex: 'evidenceJson',
-      width: 160,
-      ellipsis: true,
-      render: (value: Record<string, unknown>) => {
-        const reference = typeof value?.reference === 'string' ? value.reference : ''
-        return (
-          <Typography.Text ellipsis title={reference}>
-            {reference || '-'}
-          </Typography.Text>
-        )
-      },
-    },
-    {
-      title: '成本快照',
-      dataIndex: 'costSnapshotId',
-      width: 100,
-      render: (value: number | null) =>
-        value ? <Tag color="green">#{value}</Tag> : <Tag color="orange">未生成</Tag>,
-    },
-    {
-      title: '操作',
-      key: 'actions',
-      width: 190,
-      fixed: 'right',
-      render: (_, row) => {
-        if (!canReview) return <Typography.Text type="secondary">仅查看</Typography.Text>
-        return (
-          <Space size={4}>
-            {row.status === 'submitted' ? (
-              <>
-                <Button
-                  size="small"
-                  type="primary"
-                  icon={<CheckOutlined />}
-                  loading={actionId === row.id}
-                  onClick={() => approve(row)}
-                >
-                  通过
-                </Button>
-                <Button
-                  size="small"
-                  danger
-                  icon={<CloseOutlined />}
-                  disabled={actionId === row.id}
-                  onClick={() => openReject(row)}
-                >
-                  驳回
-                </Button>
-              </>
-            ) : null}
-            {row.status === 'approved' ? (
-              <Button
-                size="small"
-                icon={<WalletOutlined />}
-                loading={actionId === row.id}
-                onClick={() => reimburse(row)}
-              >
-                已报销
-              </Button>
-            ) : null}
-            {row.status === 'reimbursed' ? (
-              <Typography.Text type="secondary">已完成</Typography.Text>
-            ) : null}
-          </Space>
-        )
-      },
-    },
-  ]
-
-  return (
-    <section className="page-stack">
-      <PageHeader
-        title="人工支出"
-        description="登记公司实际付出的人工/垫付支出：项目、金额、订单、付款人、收款人与凭证。"
-      />
-
-      <Card>
-        <Form<FilterForm>
-          form={filterForm}
-          layout="inline"
-          className="filter-form"
-          onFinish={applyFilters}
-          initialValues={{
-            dateRange: [dayjs().subtract(29, 'day'), dayjs()],
-            status: '',
-            keyword: '',
-          }}
-        >
-          <Form.Item name="dateRange" label="付款日期">
-            <AdminRangePicker format="YYYY-MM-DD" />
-          </Form.Item>
-          <Form.Item name="status" label="状态">
-            <Select
-              style={{ width: 140 }}
-              options={[
-                { value: '', label: '全部状态' },
-                ...Object.entries(STATUS_META).map(([value, meta]) => ({
-                  value,
-                  label: meta.label,
-                })),
-              ]}
-            />
-          </Form.Item>
-          <Form.Item name="keyword" label="关键词">
-            <Input allowClear placeholder="登记号 / 订单号 / 收款人" style={{ width: 220 }} />
-          </Form.Item>
-          <Form.Item>
-            <Space>
-              <Button type="primary" icon={<SearchOutlined />} htmlType="submit">
-                查询
-              </Button>
-              <Button onClick={resetFilters}>重置</Button>
-              {canCreate ? (
-                <Button type="primary" icon={<PlusOutlined />} onClick={() => setCreateOpen(true)}>
-                  登记人工支出
-                </Button>
-              ) : null}
-              <Button icon={<ReloadOutlined />} onClick={refreshAll}>
-                刷新
-              </Button>
-            </Space>
-          </Form.Item>
-        </Form>
-      </Card>
-
-      {overview && overview.unclassifiedCount > 0 ? (
-        <Alert
-          type="warning"
-          showIcon
-          message={`有 ${overview.unclassifiedCount} 条支出未归类，金额 ${formatMoney(overview.unclassifiedAmountFen)}`}
-          description="未归类的支出无法进入成本报表，请补齐付款项目。"
-        />
-      ) : null}
-
-      {overview && overview.noOrderCount > 0 ? (
-        <Alert
-          type="info"
-          showIcon
-          message={`有 ${overview.noOrderCount} 条支出没有关联订单，金额 ${formatMoney(overview.noOrderAmountFen)}`}
-          description="平台充值、批量拿货、办公支出可以没有订单，但建议在备注里写清用途。"
-        />
-      ) : null}
-
-      <Row gutter={[12, 12]}>
-        <Col xs={12} md={8} xl={4}>
-          <Card>
-            <Statistic
-              title="待审核"
-              value={overview?.submittedAmountFen || 0}
-              formatter={() => formatMoney(overview?.submittedAmountFen || 0)}
-            />
-          </Card>
-        </Col>
-        <Col xs={12} md={8} xl={5}>
-          <Card>
-            <Statistic
-              title="已通过"
-              value={overview?.approvedAmountFen || 0}
-              formatter={() => formatMoney(overview?.approvedAmountFen || 0)}
-            />
-          </Card>
-        </Col>
-        <Col xs={12} md={8} xl={5}>
-          <Card>
-            <Statistic
-              title="已报销"
-              value={overview?.reimbursedAmountFen || 0}
-              formatter={() => formatMoney(overview?.reimbursedAmountFen || 0)}
-            />
-          </Card>
-        </Col>
-        <Col xs={12} md={8} xl={5}>
-          <Card>
-            <Statistic title="待审核笔数" value={overview?.submittedCount || 0} />
-          </Card>
-        </Col>
-        <Col xs={12} md={8} xl={5}>
-          <Card>
-            <Statistic title="已通过笔数" value={overview?.approvedCount || 0} />
-          </Card>
-        </Col>
-      </Row>
-
-      <Card>
-        <Table<AdminManualExpense>
-          rowKey="id"
-          size="small"
-          columns={columns}
-          dataSource={list?.items || []}
-          loading={listQuery.isLoading}
-          scroll={{ x: 1830 }}
-          pagination={buildAdminTablePagination({
-            current: page,
-            pageSize,
-            total: list?.pagination.total || 0,
-            showTotal: (total) => `共 ${total} 条支出`,
-            onChange: (nextPage, nextPageSize) => {
-              setPage(nextPage)
-              setPageSize(nextPageSize)
-            },
-          })}
-        />
-      </Card>
-
-      <Modal
-        title="登记人工支出"
-        open={createOpen}
-        onCancel={() => {
-          setCreateOpen(false)
-          expenseForm.resetFields()
-        }}
-        onOk={submitExpense}
-        confirmLoading={creating}
-        okText="提交登记"
-        width={720}
-      >
-        <Form<ExpenseForm>
-          form={expenseForm}
-          layout="vertical"
-          initialValues={{
-            expenseCategory: 'service_fee',
-            payeeType: 'upstream',
-            paymentMethod: 'wechat',
-            paidAt: dayjs(),
-          }}
-        >
-          <Row gutter={12}>
-            <Col span={12}>
-              <Form.Item name="orderId" label="订单 ID（可选）">
-                <InputNumber min={1} style={{ width: '100%' }} placeholder="有订单时填写" />
-              </Form.Item>
-            </Col>
-            <Col span={12}>
-              <Form.Item name="orderItemId" label="订单项 ID（可选）">
-                <InputNumber
-                  min={1}
-                  style={{ width: '100%' }}
-                  placeholder="按订单项归集成本时填写"
-                />
-              </Form.Item>
-            </Col>
-          </Row>
-          {isSupport ? (
-            <>
-              <Form.Item label="备用金账户" extra="只能使用自己的备用金账户">
-                <Input
-                  readOnly
-                  value={
-                    ownFundAccount
-                      ? `${ownFundAccount.ownerName} · ${ownFundAccount.accountNo} · 余额 ${formatMoney(
-                          ownFundAccount.balanceFen,
-                        )}`
-                      : '当前账号还没有备用金账户'
-                  }
-                />
-              </Form.Item>
-              <Form.Item name="fundAccountId" hidden>
-                <Input />
-              </Form.Item>
-            </>
-          ) : (
-            <Form.Item
-              name="fundAccountId"
-              label="备用金账户"
-              rules={[{ required: true, message: '请选择备用金账户' }]}
-              extra="人工支出会直接从该客服的备用金余额扣减，并同步出现在「备用金」支出明细里"
-            >
-              <Select
-                showSearch
-                optionFilterProp="label"
-                loading={fundAccountsQuery.isLoading}
-                placeholder="请选择这笔支出从哪个客服备用金账户出"
-                options={fundAccounts.map((account) => ({
-                  value: account.id,
-                  label: `${account.ownerName} · ${account.accountNo} · 余额 ${formatMoney(
-                    account.balanceFen,
-                  )}`,
-                }))}
-              />
-            </Form.Item>
-          )}
-          {!fundAccountsQuery.isLoading && fundAccounts.length === 0 ? (
-            <Alert
-              type="warning"
-              showIcon
-              style={{ marginBottom: 14 }}
-              message="没有可用的客服备用金账户"
-              description="请先到「备用金」页为客服开通账户并拨付备用金，否则无法登记人工支出。"
-            />
-          ) : null}
-          <Row gutter={12}>
-            <Col span={12}>
-              <Form.Item
-                name="costItemId"
-                label="付款项目"
-                rules={[{ required: true, message: '请选择付款项目' }]}
-              >
-                <Select
-                  showSearch
-                  optionFilterProp="label"
-                  loading={costItemsQuery.isLoading}
-                  options={costItems.map((item: { id: number; code: string; name: string }) => ({
-                    value: item.id,
-                    label: `${item.name}（${item.code}）`,
-                  }))}
-                />
-              </Form.Item>
-            </Col>
-            <Col span={6}>
-              <Form.Item
-                name="amountYuan"
-                label="金额（元）"
-                rules={[{ required: true, message: '请填写金额' }]}
-              >
-                <InputNumber min={0.01} precision={2} style={{ width: '100%' }} />
-              </Form.Item>
-            </Col>
-            <Col span={6}>
-              <Form.Item name="expenseCategory" label="支出分类" rules={[{ required: true }]}>
-                <Select options={CATEGORY_OPTIONS} />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row gutter={12}>
-            <Col span={6}>
-              <Form.Item name="payeeType" label="收款方类型" rules={[{ required: true }]}>
-                <Select options={PAYEE_TYPE_OPTIONS} />
-              </Form.Item>
-            </Col>
-            <Col span={9}>
-              <Form.Item
-                name="payeeName"
-                label="收款方"
-                rules={[{ required: true, message: '请填写收款方' }]}
-              >
-                <Input placeholder="微信号 / 支付宝 / 姓名" />
-              </Form.Item>
-            </Col>
-            <Col span={9}>
-              <Form.Item name="payeeAccount" label="收款账号（可选）">
-                <Input placeholder="账号、手机号或备注" />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Row gutter={12}>
-            <Col span={6}>
-              <Form.Item name="paymentMethod" label="付款方式" rules={[{ required: true }]}>
-                <Select options={PAYMENT_METHOD_OPTIONS} />
-              </Form.Item>
-            </Col>
-            <Col span={9}>
-              <Form.Item name="paidAt" label="付款时间" rules={[{ required: true }]}>
-                <DatePicker showTime style={{ width: '100%' }} />
-              </Form.Item>
-            </Col>
-            <Col span={9}>
-              <Form.Item
-                name="evidenceReference"
-                label="凭证链接 / 流水号"
-                rules={[{ required: true, message: '至少留一项可追溯凭证' }]}
-              >
-                <Input placeholder="转账截图链接、微信流水号或聊天记录说明" />
-              </Form.Item>
-            </Col>
-          </Row>
-          <Form.Item name="note" label="备注 / 原因">
-            <Input.TextArea rows={3} placeholder="赔偿、加急、补差价等必须写清原因" />
-          </Form.Item>
-        </Form>
-      </Modal>
-
-      <Modal
-        title={`驳回 ${rejectTarget?.expenseNo || ''}`}
-        open={Boolean(rejectTarget)}
-        onCancel={() => setRejectTarget(null)}
-        onOk={submitReject}
-        confirmLoading={Boolean(rejectTarget && actionId === rejectTarget.id)}
-        okText="确认驳回"
-        okButtonProps={{ danger: true }}
-      >
-        <Input.TextArea
-          rows={3}
-          value={rejectReason}
-          onChange={(event) => setRejectReason(event.target.value)}
-          placeholder="必须填写驳回原因"
-        />
-      </Modal>
-    </section>
-  )
-}
@@ -1,7 +1,7 @@
 export * from './auth'
 export * from './dashboard'
 export * from './finance'
-export * from './manual-expense'
+export * from './manual-order-cost'
 export * from './cost-center'
 export * from './fund'
 export * from './users'
@@ -1,78 +0,0 @@
-import { apiGet, apiPost } from '@/lib/http'
-import type {
-  AdminManualExpense,
-  AdminManualExpenseListResult,
-  AdminManualExpenseOverview,
-} from '@/types/admin/manual-expense'
-
-export type AdminManualExpenseParams = {
-  dateFrom?: string
-  dateTo?: string
-  status?: string
-  keyword?: string
-  costItemId?: number
-  paidByAdminUserId?: number
-  orderId?: number
-  page?: number
-  pageSize?: number
-}
-
-export function fetchAdminManualExpenses(params: AdminManualExpenseParams = {}) {
-  return apiGet<AdminManualExpenseListResult>('/api/v1/admin/finance/manual-expenses', params)
-}
-
-export function fetchAdminManualExpenseOverview(params: AdminManualExpenseParams = {}) {
-  return apiGet<AdminManualExpenseOverview>(
-    '/api/v1/admin/finance/manual-expenses/overview',
-    params,
-  )
-}
-
-export function fetchAdminManualExpenseCostItems() {
-  return apiGet<{
-    items: Array<{
-      id: number
-      code: string
-      name: string
-      costModel: string
-      pricingMode: string
-    }>
-  }>('/api/v1/admin/finance/manual-expenses/cost-items')
-}
-
-export function fetchAdminManualExpense(expenseId: number) {
-  return apiGet<AdminManualExpense>(`/api/v1/admin/finance/manual-expenses/${expenseId}`)
-}
-
-export function createAdminManualExpense(payload: Record<string, unknown>) {
-  return apiPost<AdminManualExpense>('/api/v1/admin/finance/manual-expenses', payload)
-}
-
-export function createAdminManualOrderCost(payload: Record<string, unknown>) {
-  return apiPost<{
-    record: AdminManualExpense
-    effective: boolean
-    reason: 'approved' | 'pending_review' | 'approval_failed'
-    message?: string
-  }>('/api/v1/admin/finance/manual-order-costs', payload)
-}
-
-export function approveAdminManualExpense(
-  expenseId: number,
-  payload: Record<string, unknown> = {},
-) {
-  return apiPost<AdminManualExpense>(
-    `/api/v1/admin/finance/manual-expenses/${expenseId}/approve`,
-    payload,
-  )
-}
-
-export function rejectAdminManualExpense(expenseId: number, rejectReason: string) {
-  return apiPost<AdminManualExpense>(`/api/v1/admin/finance/manual-expenses/${expenseId}/reject`, {
-    rejectReason,
-  })
-}
-
-export function reimburseAdminManualExpense(expenseId: number) {
-  return apiPost<AdminManualExpense>(`/api/v1/admin/finance/manual-expenses/${expenseId}/reimburse`)
-}
@@ -0,0 +1,35 @@
+import { apiGet, apiPost } from '@/lib/http'
+
+/**
+ * 人工录单：直接扣客服备用金 + 直接写成本快照。
+ * 没有登记单、没有审批、没有报销环节。
+ */
+
+export type AdminManualOrderCostResult = {
+  expenseNo: string
+  fundExpenseId: number
+  fundAccountId: number
+  fundAccountNo: string
+  amountFen: number
+  orderId: number
+  orderItemId: number
+  costSnapshotId: number | null
+  fulfillmentMode: string
+  warning: string
+}
+
+export function fetchAdminManualOrderCostItems() {
+  return apiGet<{
+    items: Array<{
+      id: number
+      code: string
+      name: string
+      costModel: string
+      pricingMode: string
+    }>
+  }>('/api/v1/admin/finance/manual-order-cost-items')
+}
+
+export function createAdminManualOrderCost(payload: Record<string, unknown>) {
+  return apiPost<AdminManualOrderCostResult>('/api/v1/admin/finance/manual-order-costs', payload)
+}
@@ -32,14 +32,6 @@ export type {
  AdminSalesProfitRange,
 } from './finance'

-// Manual expense types
-export type {
-  AdminManualExpense,
-  AdminManualExpenseListResult,
-  AdminManualExpenseOverview,
-  AdminManualExpenseStatus,
-} from './manual-expense'
-
 // Fund / imprest account types
 export type {
  AdminFundAccount,
@@ -1,86 +0,0 @@
-export type AdminManualExpenseStatus =
-  | 'draft'
-  | 'submitted'
-  | 'approved'
-  | 'rejected'
-  | 'reimbursed'
-  | 'reversed'
-
-export type AdminManualExpense = {
-  id: number
-  expenseNo: string
-  orderId: number | null
-  orderItemId: number | null
-  workOrderId: number | null
-  fundExpenseId: number | null
-  fundExpenseNo: string
-  fundAccountId: number | null
-  fundAccountNo: string
-  fundAccountOwnerName: string
-  costItemId: number | null
-  costItemName: string
-  costItemCode: string
-  expenseCategory: string
-  amountFen: number
-  currency: string
-  paidByAdminUserId: number | null
-  paidByName: string
-  payeeType: string
-  payeeName: string
-  payeeAccount: string
-  paymentMethod: string
-  paidAt: string
-  status: AdminManualExpenseStatus
-  approvedBy: string
-  approvedAt: string | null
-  rejectedBy: string
-  rejectedAt: string | null
-  rejectReason: string
-  reimbursedBy: string
-  reimbursedAt: string | null
-  evidenceJson: Record<string, unknown>
-  costSnapshotId: number | null
-  reversalOfId: number | null
-  expenseBatchNo: string
-  note: string
-  createdAt: string
-  updatedAt: string
-  platformOrderId: string
-  provider: string
-  shopId: string
-  skuCode: string
-  skuName: string
-  workOrderNo: string
-}
-
-export type AdminManualExpenseListResult = {
-  range: { fromDate: string; toDate: string }
-  items: AdminManualExpense[]
-  pagination: { page: number; pageSize: number; total: number }
-}
-
-export type AdminManualExpenseOverview = {
-  range: { fromDate: string; toDate: string }
-  overview: {
-    submittedCount: number
-    submittedAmountFen: number
-    approvedCount: number
-    approvedAmountFen: number
-    reimbursedCount: number
-    reimbursedAmountFen: number
-    rejectedCount: number
-    rejectedAmountFen: number
-    noOrderCount: number
-    noOrderAmountFen: number
-    unclassifiedCount: number
-    unclassifiedAmountFen: number
-  }
-  byPayer: Array<{ paidByName: string; recordCount: number; amountFen: number }>
-  byCostItem: Array<{
-    costItemId: number | null
-    costItemName: string
-    expenseCategory: string
-    recordCount: number
-    amountFen: number
-  }>
-}