feat(admin): 收口人工履约入口并修复履约筛选
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import {
|
||||
ArrowLeftOutlined,
|
||||
CheckOutlined,
|
||||
CopyOutlined,
|
||||
FileTextOutlined,
|
||||
PauseCircleOutlined,
|
||||
PlayCircleOutlined,
|
||||
RollbackOutlined,
|
||||
@@ -23,19 +23,20 @@ import {
|
||||
Skeleton,
|
||||
Space,
|
||||
Tag,
|
||||
Tooltip,
|
||||
Typography,
|
||||
} from 'antd'
|
||||
import PercentTable from '@/components/common/PercentTable'
|
||||
import type { TableColumnsType } from 'antd'
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import type { Dayjs } from 'dayjs'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useNavigate, useParams, useSearchParams } from 'react-router'
|
||||
import { useState } from 'react'
|
||||
import { useNavigate, useParams } from 'react-router'
|
||||
|
||||
import dayjs from '@/lib/dayjs'
|
||||
|
||||
import JsonPreview from '@/components/admin/JsonPreview'
|
||||
import ManualOrderCostModal from '@/components/admin/ManualOrderCostModal'
|
||||
import { ManualFulfillmentConfirmModal } from '@/components/admin/ManualFulfillmentConfirmModal'
|
||||
import PageHeader from '@/components/admin/PageHeader'
|
||||
import StatusTag from '@/components/admin/StatusTag'
|
||||
import {
|
||||
@@ -57,9 +58,8 @@ export default function AdminOrderDetailPage() {
|
||||
const queryClient = useQueryClient()
|
||||
const { message, modal } = App.useApp()
|
||||
const { orderId = '' } = useParams()
|
||||
const [searchParams, setSearchParams] = useSearchParams()
|
||||
const [statusModalVisible, setStatusModalVisible] = useState(false)
|
||||
const [manualCostOpen, setManualCostOpen] = useState(false)
|
||||
const [fulfillOpen, setFulfillOpen] = useState(false)
|
||||
const [costPreviewItemId, setCostPreviewItemId] = useState<number | null>(null)
|
||||
const [refundModalOpen, setRefundModalOpen] = useState(false)
|
||||
const [refundScope, setRefundScope] = useState<'order' | 'item'>('order')
|
||||
@@ -75,21 +75,6 @@ export default function AdminOrderDetailPage() {
|
||||
const [targetStatus, setTargetStatus] = useState<'active' | 'paused' | 'closed'>('active')
|
||||
const [statusReason, setStatusReason] = useState('')
|
||||
|
||||
useEffect(() => {
|
||||
if (searchParams.get('manualCost') === '1') {
|
||||
setManualCostOpen(true)
|
||||
}
|
||||
}, [searchParams])
|
||||
|
||||
function closeManualCost() {
|
||||
setManualCostOpen(false)
|
||||
if (searchParams.get('manualCost')) {
|
||||
const next = new URLSearchParams(searchParams)
|
||||
next.delete('manualCost')
|
||||
setSearchParams(next, { replace: true })
|
||||
}
|
||||
}
|
||||
|
||||
const query = useQuery({
|
||||
queryKey: ['admin-order-detail', orderId],
|
||||
queryFn: () => fetchAdminOrderDetail(orderId),
|
||||
@@ -314,9 +299,19 @@ export default function AdminOrderDetailPage() {
|
||||
退款登记
|
||||
</Button>
|
||||
) : null}
|
||||
<Button icon={<FileTextOutlined />} onClick={() => setManualCostOpen(true)}>
|
||||
人工录单
|
||||
</Button>
|
||||
{Number(detail.order.manualPendingCount || 0) > 0 ? (
|
||||
<Button icon={<CheckOutlined />} onClick={() => setFulfillOpen(true)}>
|
||||
确认履约
|
||||
</Button>
|
||||
) : Number(detail.order.manualUnconfiguredCount || 0) > 0 ? (
|
||||
<Tooltip
|
||||
title={`有 ${detail.order.manualUnconfiguredCount} 个人工商品未配置履约渠道,请先到「商品与成本 → 人工 SKU 配置」补全`}
|
||||
>
|
||||
<Tag color="orange" style={{ margin: 0 }}>
|
||||
待补全履约
|
||||
</Tag>
|
||||
</Tooltip>
|
||||
) : null}
|
||||
{isAutoClaimOrder ? (
|
||||
<>
|
||||
<Button icon={<CopyOutlined />} onClick={handleCopyH5Link}>
|
||||
@@ -620,18 +615,13 @@ export default function AdminOrderDetailPage() {
|
||||
</div>
|
||||
</Modal>
|
||||
|
||||
<ManualOrderCostModal
|
||||
open={manualCostOpen}
|
||||
<ManualFulfillmentConfirmModal
|
||||
open={fulfillOpen}
|
||||
orderId={detail.order.orderId}
|
||||
orderNo={detail.order.platformOrderId || String(detail.order.orderId)}
|
||||
items={detail.items.map((item) => ({
|
||||
orderItemId: item.orderItemId,
|
||||
matchSku: item.matchSku,
|
||||
skuName: item.skuName,
|
||||
skuCode: item.skuCode,
|
||||
quantity: item.quantity,
|
||||
}))}
|
||||
onClose={closeManualCost}
|
||||
onClose={() => setFulfillOpen(false)}
|
||||
onConfirmed={() =>
|
||||
void queryClient.invalidateQueries({ queryKey: ['admin-order-detail', orderId] })
|
||||
}
|
||||
/>
|
||||
|
||||
<Modal
|
||||
|
||||
Reference in New Issue
Block a user