Merge branch 'dev1023' into dev

解决 9 个冲突文件,并修复合并后遗留问题:

- 大厅候选集:采用 FIFO 窗口 + 全部置顶单 UNION(列表与抢单/拼单复核同源)
- 拼单份额:采用多次参与模型(每次参与 INSERT 新份额、requestId 幂等),
  取消后可重新参与;移除 HEAD 已废弃的单行 rejoin 逻辑与对应测试
- 工单迁移与成本中心 103–108 编号撞车:合并重写为
  109_work_order_share_participation / 110_work_order_hall_and_shop_indexes;
  临时库全量执行与重跑幂等验证通过(10 列、唯一键已删、7 个索引)
- 实时补丁:保留个性化字段、置顶重排、分页总数同步;补回 orderTimelineVisible 类型
- 打手大厅:保留 memo 组件化,移植「再拼一次」多份额按钮逻辑
- 全项目表格统一 PercentTable:WorkerOrderShareTable 改造

验证:backend typecheck/lint/check:sql/test(833 pass)、
frontend typecheck/lint/test(172 pass)/build 全绿。
This commit is contained in:
yml2213
2026-10-26 12:10:53 +08:00
94 changed files with 8991 additions and 744 deletions
@@ -1,4 +1,4 @@
import { ReloadOutlined } from '@ant-design/icons'
import { ReloadOutlined, VideoCameraOutlined } from '@ant-design/icons'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import {
App,
@@ -26,8 +26,14 @@ import {
repayAdminAfterSalesCaseDebt,
resolveAdminAfterSalesCase,
} from '@/services/admin'
import type { UploadedFile, WorkerAfterSalesCase, WorkOrder } from '@/types/worker-platform'
import type {
UploadedFile,
WorkerAcceptanceVideo,
WorkerAfterSalesCase,
WorkOrder,
} from '@/types/worker-platform'
import { ADMIN_DEFAULT_PAGE_SIZE, buildAdminTablePagination } from '@/utils/admin-pagination'
import { normalizeSearchText } from '@/utils/admin-realtime-work-orders'
import { formatAdminDateTime } from '@/utils/admin-time'
import { uniqueUploadedFiles } from '@/utils/image-identity'
import { asRecord, formatMoney } from './shared'
@@ -49,6 +55,14 @@ type AfterSalesRepayFormValues = {
note?: string
}
/** 售后单状态筛选(与列表标签同一套文案)。 */
const AFTER_SALES_STATUS_OPTIONS = [
{ value: 'awaiting_worker_response', label: '待打手说明' },
{ value: 'under_review', label: '客服处理中' },
{ value: 'recovery_pending', label: '追缴中' },
{ value: 'closed', label: '已关闭' },
]
export type AfterSalesPanelHandle = {
openCreateModal: (row: WorkOrder) => void
}
@@ -62,6 +76,10 @@ const AfterSalesPanel = forwardRef<AfterSalesPanelHandle>(function AfterSalesPan
const [afterSalesFiles, setAfterSalesFiles] = useState<UploadedFile[]>([])
const [afterSalesPage, setAfterSalesPage] = useState(1)
const [afterSalesPageSize, setAfterSalesPageSize] = useState(ADMIN_DEFAULT_PAGE_SIZE)
/** 搜索框输入值;点搜索/回车后才写入 afterSalesKeyword,避免每敲一个字就请求。 */
const [afterSalesKeywordInput, setAfterSalesKeywordInput] = useState('')
const [afterSalesKeyword, setAfterSalesKeyword] = useState('')
const [afterSalesStatus, setAfterSalesStatus] = useState('')
const [afterSalesCreateForm] = Form.useForm<AfterSalesCreateFormValues>()
const [afterSalesResolutionForm] = Form.useForm<AfterSalesResolutionFormValues>()
const [afterSalesRepayForm] = Form.useForm<AfterSalesRepayFormValues>()
@@ -72,9 +90,20 @@ const AfterSalesPanel = forwardRef<AfterSalesPanelHandle>(function AfterSalesPan
enabled: Boolean(afterSalesOrder?.sharing?.enabled),
})
const afterSalesCasesQuery = useQuery({
queryKey: ['admin-worker-platform-after-sales-cases', afterSalesPage, afterSalesPageSize],
queryKey: [
'admin-worker-platform-after-sales-cases',
afterSalesPage,
afterSalesPageSize,
afterSalesKeyword,
afterSalesStatus,
],
queryFn: () =>
fetchAdminAfterSalesCases({ page: afterSalesPage, pageSize: afterSalesPageSize }),
fetchAdminAfterSalesCases({
page: afterSalesPage,
pageSize: afterSalesPageSize,
...(afterSalesKeyword ? { keyword: afterSalesKeyword } : {}),
...(afterSalesStatus ? { status: afterSalesStatus } : {}),
}),
})
useImperativeHandle(ref, () => ({
@@ -195,6 +224,41 @@ const AfterSalesPanel = forwardRef<AfterSalesPanelHandle>(function AfterSalesPan
}
bordered={false}
>
<div style={{ marginBottom: 16 }}>
<Space wrap>
<Input.Search
allowClear
value={afterSalesKeywordInput}
placeholder="售后单号 / 工单号 / 平台号 / 责任打手"
style={{ width: 340 }}
onChange={(event) => {
const nextValue = event.target.value
setAfterSalesKeywordInput(nextValue)
// 清空输入立即恢复全量,不用再点一次搜索。
if (!nextValue.trim()) {
setAfterSalesKeyword('')
setAfterSalesPage(1)
}
}}
onSearch={(value) => {
// 归一化(全角→半角、去零宽字符):粘贴来的单号常夹带不可见字符。
setAfterSalesKeyword(normalizeSearchText(value))
setAfterSalesPage(1)
}}
/>
<Select
allowClear
value={afterSalesStatus || undefined}
placeholder="全部状态"
style={{ width: 160 }}
options={AFTER_SALES_STATUS_OPTIONS}
onChange={(value) => {
setAfterSalesStatus(String(value || ''))
setAfterSalesPage(1)
}}
/>
</Space>
</div>
<PercentTable<WorkerAfterSalesCase>
rowKey="caseId"
loading={afterSalesCasesQuery.isLoading}
@@ -259,6 +323,15 @@ const AfterSalesPanel = forwardRef<AfterSalesPanelHandle>(function AfterSalesPan
/>
</Space>
) : null}
{getAfterSalesSnapshotVideo(item) ? (
<a
href={getAfterSalesSnapshotVideo(item)?.url}
target="_blank"
rel="noreferrer"
>
<VideoCameraOutlined /> 查看固化验收视频
</a>
) : null}
</div>
),
},
@@ -570,4 +643,21 @@ function getAfterSalesSnapshotFiles(item: WorkerAfterSalesCase): UploadedFile[]
)
}
/** 售后固化快照里的验收视频(有则给出可点击链接)。 */
function getAfterSalesSnapshotVideo(item: WorkerAfterSalesCase): WorkerAcceptanceVideo | null {
const snapshot = asRecord(item.acceptanceSnapshot)
const acceptance = asRecord(snapshot.acceptance)
const video = asRecord(acceptance.video)
const url = String(video.url || '').trim()
if (!url) return null
return {
objectKey: String(video.objectKey || video.object_key || ''),
url,
filename: String(video.filename || ''),
contentType: String(video.contentType || video.content_type || ''),
size: Number(video.size || 0),
durationSeconds: Number(video.durationSeconds || video.duration_seconds || 0),
}
}
export default AfterSalesPanel
@@ -226,7 +226,7 @@ function AnnouncementCard() {
name="content"
label="公告内容"
rules={[{ required: true, whitespace: true, message: '请填写公告内容' }]}
extra="公告会显示在打手端各页面顶部并横向滚动。"
extra="公告会显示在打手端各页面顶部并横向滚动;正文一改动,打手端下次进入会弹出公告弹窗,需点「我已知晓」才关闭。"
>
<Input.TextArea rows={4} maxLength={300} showCount placeholder="请输入打手端公告内容" />
</Form.Item>
@@ -24,6 +24,11 @@ const notificationEventRows: NotificationEventRow[] = [
{ key: 'recharge_requested', name: '充值申请', description: '打手提交新的充值申请' },
{ key: 'acceptance_submitted', name: '提交验收', description: '打手提交订单验收资料' },
{ key: 'acceptance_reminded', name: '催验收', description: '打手在验收后催促处理' },
{
key: 'order_accepted',
name: '整单验收完成',
description: '全部份额验收完成(含拼单统一验收)',
},
{ key: 'material_required', name: '待补资料工单', description: '新工单等待后台补充资料' },
{
key: 'cancel_requested',
@@ -14,6 +14,7 @@ import {
UserAddOutlined,
WarningOutlined,
RollbackOutlined,
VideoCameraOutlined,
} from '@ant-design/icons'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import {
@@ -28,6 +29,7 @@ import {
Input,
InputNumber,
Modal,
Popover,
Radio,
Select,
Space,
@@ -45,6 +47,7 @@ import JsonPreview from '@/components/admin/JsonPreview'
import WorkOrderEventTimeline from '@/components/WorkOrderEventTimeline'
import ImageUpload from '@/components/files/ImageUpload'
import ImagePreviewList from '@/components/files/ImagePreviewList'
import VideoPreview, { formatAcceptanceVideoDuration } from '@/components/files/VideoPreview'
import {
acceptAdminWorkOrder,
acceptAdminWorkOrderShare,
@@ -57,6 +60,7 @@ import {
confirmAdminWorkOrderFriend,
deductAdminWorkOrderPendingDeposit,
deleteAdminWorkOrder,
disposeAdminWorkOrderShareProblem,
fetchAdminWorkCategories,
fetchAdminSession,
fetchAdminWorkOrderSharing,
@@ -65,8 +69,10 @@ import {
fetchAdminWorkerUsers,
fetchAdminWorkOrders,
markAdminWorkOrderProblem,
markAdminWorkOrderShareProblem,
pinAdminWorkOrder,
publishAdminWorkOrder,
reduceAdminWorkOrderShareQuantity,
reopenAdminCancelledWorkOrder,
resetAdminWorkOrderGiftMaterial,
resolveAdminProblemWorkOrder,
@@ -114,6 +120,7 @@ import {
asRecord,
formatMoney,
formatSharingShareStatus,
formatSharingShareCancelledReason,
formatStatus,
resolveGiftPhaseColor,
resolveSharingShareStatusColor,
@@ -240,6 +247,9 @@ export default function WorkOrdersPanel() {
const canCancelShare = sessionPermissions
? sessionPermissions.includes('worker_order.cancel_share')
: hasAdminPermission('worker_order.cancel_share')
const canManageShareProblem = sessionPermissions
? sessionPermissions.includes('worker_order.manage_problem')
: hasAdminPermission('worker_order.manage_problem')
const canEditOrder = sessionPermissions
? sessionPermissions.includes('worker_order.edit')
: hasAdminPermission('worker_order.edit')
@@ -297,6 +307,9 @@ export default function WorkOrdersPanel() {
const [materialPasteText, setMaterialPasteText] = useState('')
const [sharingOrder, setSharingOrder] = useState<WorkOrder | null>(null)
const [cancelShare, setCancelShare] = useState<WorkOrderShare | null>(null)
const [reduceShare, setReduceShare] = useState<WorkOrderShare | null>(null)
const [problemShare, setProblemShare] = useState<WorkOrderShare | null>(null)
const [disposeShare, setDisposeShare] = useState<WorkOrderShare | null>(null)
const [cancelSharingOrder, setCancelSharingOrder] = useState<WorkOrder | null>(null)
const [assignOrder, setAssignOrder] = useState<WorkOrder | null>(null)
const [assignWorkerId, setAssignWorkerId] = useState<number | undefined>(undefined)
@@ -309,6 +322,12 @@ export default function WorkOrdersPanel() {
const [materialForm] = Form.useForm<MaterialFormValues>()
const [cancelForm] = Form.useForm<CancelOrderFormValues>()
const [cancelShareForm] = Form.useForm<CancelShareFormValues>()
const [reduceShareForm] = Form.useForm<{ reduceQuantity?: number; note?: string }>()
const [problemShareForm] = Form.useForm<{ note?: string }>()
const [disposeShareForm] = Form.useForm<{
action?: 'return_to_worker' | 'reopen' | 'cancel_release' | 'cancel_deduct'
note?: string
}>()
const [cancelSharingForm] = Form.useForm<CancelSharingFormValues>()
const [deductForm] = Form.useForm<{ amount?: number; note?: string }>()
const [editForm] = Form.useForm<{
@@ -699,7 +718,7 @@ export default function WorkOrdersPanel() {
cancelAdminWorkOrderShare(workOrderId, cancelShare.shareId, {
reason: String(values.reason || '').trim(),
}),
'该参与者已撤单,押金和拼单份数已恢复',
'该参与者已撤单,押金已退还,母单状态未变更',
)
if (!succeeded) return
await queryClient.invalidateQueries({
@@ -709,6 +728,77 @@ export default function WorkOrdersPanel() {
cancelShareForm.resetFields()
}
/** 按份数撤销部分份额:减少的份数回到大厅,押金保持冻结。 */
async function submitReduceShare(values: { reduceQuantity?: number; note?: string }) {
if (!sharingOrder || !reduceShare) return
const workOrderId = sharingOrder.workOrderId
const reduceQuantity = Math.floor(Number(values.reduceQuantity || 0))
if (!Number.isFinite(reduceQuantity) || reduceQuantity <= 0) {
message.warning('请填写要撤掉的份数')
return
}
const keepQuantity = Math.max(0, reduceShare.quantity - reduceQuantity)
const succeeded = await runAction(
() =>
reduceAdminWorkOrderShareQuantity(workOrderId, reduceShare.shareId, {
reduceQuantity,
note: String(values.note || '').trim(),
}),
`已撤掉 ${reduceQuantity} 份,保留 ${keepQuantity} 份继续履约`,
)
if (!succeeded) return
await queryClient.invalidateQueries({
queryKey: ['admin-worker-platform-order-sharing', workOrderId],
})
setReduceShare(null)
reduceShareForm.resetFields()
}
/** 按份额标记问题单:只影响该打手,母单状态不变。备注选填。 */
async function submitProblemShare(values: { note?: string }) {
if (!sharingOrder || !problemShare) return
const workOrderId = sharingOrder.workOrderId
const succeeded = await runAction(
() =>
markAdminWorkOrderShareProblem(
workOrderId,
problemShare.shareId,
String(values.note || '').trim(),
),
'该份额已标记为问题单,仅影响该打手',
)
if (!succeeded) return
await queryClient.invalidateQueries({
queryKey: ['admin-worker-platform-order-sharing', workOrderId],
})
setProblemShare(null)
problemShareForm.resetFields()
}
/** 处置份额问题单:方式与母单处置一致,但只作用于这一份,母单状态不变。 */
async function submitShareDisposal(values: {
action?: 'return_to_worker' | 'reopen' | 'cancel_release' | 'cancel_deduct'
note?: string
}) {
if (!sharingOrder || !disposeShare || !values.action) return
const workOrderId = sharingOrder.workOrderId
const action = values.action
const succeeded = await runAction(
() =>
disposeAdminWorkOrderShareProblem(workOrderId, disposeShare.shareId, {
action,
note: String(values.note || '').trim(),
}),
'该份额问题单已处置',
)
if (!succeeded) return
await queryClient.invalidateQueries({
queryKey: ['admin-worker-platform-order-sharing', workOrderId],
})
setDisposeShare(null)
disposeShareForm.resetFields()
}
async function submitCancelSharing(values: CancelSharingFormValues) {
if (!cancelSharingOrder || !values.action) return
const action = values.action
@@ -2545,6 +2635,11 @@ export default function WorkOrdersPanel() {
{getAcceptanceFiles(detailOrder).length +
getAcceptanceImageUrls(detailOrder).length || '-'}
</Descriptions.Item>
<Descriptions.Item label="验收视频">
{detailOrder.acceptance?.video
? formatAcceptanceVideoDuration(detailOrder.acceptance.video.durationSeconds)
: '未上传'}
</Descriptions.Item>
{detailOrder.acceptance?.reviewMode === 'vip_auto' ? (
<Descriptions.Item label="VIP 补图">
{detailOrder.acceptance.evidenceStatus === 'pending'
@@ -2568,6 +2663,11 @@ export default function WorkOrdersPanel() {
) : (
<Typography.Text type="secondary">暂无验收图</Typography.Text>
)}
<VideoPreview
video={detailOrder.acceptance?.video ?? null}
maxHeight={200}
emptyText="暂无验收视频(选填)"
/>
</div>
</Card>
@@ -3012,9 +3112,11 @@ export default function WorkOrdersPanel() {
onCancel={() => {
setSharingOrder(null)
setCancelShare(null)
setReduceShare(null)
setCancelSharingOrder(null)
sharingForm.resetFields()
cancelShareForm.resetFields()
reduceShareForm.resetFields()
cancelSharingForm.resetFields()
}}
onOk={() => sharingForm.submit()}
@@ -3022,13 +3124,14 @@ export default function WorkOrdersPanel() {
sharingOrder?.capabilities?.canConfigureSharing && canConfigureSharing ? undefined : null
}
destroyOnHidden
width={720}
width={1360}
>
{sharingOrder ? (
<Space direction="vertical" size={16} className="full-width">
<Form
form={sharingForm}
layout="vertical"
style={{ maxWidth: 760 }}
initialValues={{
enabled: false,
totalQuantity: 1,
@@ -3145,33 +3248,103 @@ export default function WorkOrdersPanel() {
dataSource={sharingShares}
loading={sharingQuery.isFetching}
pagination={false}
tableLayout="fixed"
scroll={{ x: 1914 }}
rowClassName={(share) =>
share.problemMarked
? 'admin-share-row-problem'
: share.status === 'cancelled'
? 'admin-share-row-cancelled'
: ''
}
columns={[
{
title: '打手',
width: 132,
fixed: 'left',
render: (_, share) =>
share.worker?.displayName || share.worker?.username || '-',
},
{ title: '数量', dataIndex: 'quantity' },
{ title: '数量', dataIndex: 'quantity', width: 64, align: 'center' },
{
title: '份额报酬',
width: 96,
align: 'right',
render: (_, share) => formatMoney(share.shareReward),
},
{
title: '状态',
width: 104,
render: (_, share) => (
<Tag color={resolveSharingShareStatusColor(share.status)}>
{formatSharingShareStatus(share.status)}
</Tag>
<Space size={4} wrap>
<Tag color={resolveSharingShareStatusColor(share.status)}>
{formatSharingShareStatus(share.status)}
</Tag>
{share.status === 'cancelled' && share.cancelledReason ? (
<Tag>{formatSharingShareCancelledReason(share.cancelledReason)}</Tag>
) : null}
</Space>
),
},
{
title: '问题',
width: 120,
render: (_, share) =>
share.problemMarked ? (
<Space direction="vertical" size={2}>
<Tag color="red">问题单</Tag>
{String(share.problemNote || '').trim() ? (
<Typography.Text
type="danger"
style={{ fontSize: 12 }}
ellipsis={{ tooltip: share.problemNote }}
>
{share.problemNote}
</Typography.Text>
) : (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
未填备注
</Typography.Text>
)}
</Space>
) : (
<Typography.Text type="secondary">-</Typography.Text>
),
},
{
title: '参与时间',
width: 128,
render: (_, share) =>
share.createdAt ? formatAdminDateTime(share.createdAt) : '-',
},
{
title: '截止时间',
width: 150,
render: (_, share) =>
share.deadlineAt ? (
<span>
{formatAdminDateTime(share.deadlineAt)}
{share.timeoutMinutes ? ` · ${share.timeoutMinutes} 分钟` : null}
</span>
) : (
<Typography.Text type="secondary">不限时</Typography.Text>
),
},
{
title: '超时策略',
width: 90,
render: (_, share) =>
share.timeoutPolicy ? formatTimeoutPolicyLabel(share.timeoutPolicy) : '-',
},
{
title: '提交时间',
width: 128,
render: (_, share) =>
share.submittedAt ? formatAdminDateTime(share.submittedAt) : '-',
},
{
title: '验收图',
width: 150,
width: 96,
render: (_, share) => (
<ImagePreviewList
files={
@@ -3182,23 +3355,111 @@ export default function WorkOrdersPanel() {
? share.acceptance.imageUrls
: []
}
size={44}
size={36}
maxVisible={2}
/>
),
},
{
title: '验收视频',
width: 96,
render: (_, share) => {
const video = share.acceptance?.video
if (!video?.url) return '-'
return (
<Popover
trigger="click"
placement="left"
title="验收视频"
content={<VideoPreview video={video} maxHeight={240} showMeta />}
>
<Button size="small" icon={<VideoCameraOutlined />}>
查看
</Button>
</Popover>
)
},
},
{
title: '备注',
render: (_, share) => String(share.acceptance?.note || '').trim() || '-',
width: 120,
render: (_, share) => {
const note = String(share.acceptance?.note || '').trim()
return note ? (
<Typography.Text style={{ fontSize: 12 }} ellipsis={{ tooltip: note }}>
{note}
</Typography.Text>
) : (
'-'
)
},
},
{
title: '撤单记录',
width: 170,
render: (_, share) => {
// 份数前缀由展示层拼接:接口只给结构化的份数与原因文本
const cancelledQuantity = Math.max(
0,
Math.floor(Number(share.cancelQuantity || 0)),
)
const note = String(share.cancelNote || '').trim()
if (!cancelledQuantity && !note) return '-'
const text = cancelledQuantity
? `撤 ${cancelledQuantity} 份${note ? ` · ${note}` : ''}`
: note
return (
<Typography.Text style={{ fontSize: 12 }} ellipsis={{ tooltip: text }}>
{text}
</Typography.Text>
)
},
},
{
title: '操作',
width: 190,
width: 420,
fixed: 'right',
render: (_, share) => {
if (share.status === 'accepted') return <Tag color="green">已验收</Tag>
if (share.status === 'cancelled') return <Tag>已撤单</Tag>
if (share.status === 'accepted') return <Tag color="green">已验收</Tag>
// 份额级问题单:标记只影响该打手;已标记时按母单同一套方式处置。
// 已验收份额的报酬/押金已结算,不能处置,因此也不提供标记入口。
const disposableShare =
share.status === 'joined' || share.status === 'submitted'
const problemAction =
canManageShareProblem && disposableShare ? (
share.problemMarked ? (
<Button
size="small"
onClick={() => {
setDisposeShare(share)
disposeShareForm.setFieldsValue({
action: 'return_to_worker',
note: '',
})
}}
>
处置问题单
</Button>
) : (
<Button
danger
size="small"
icon={<WarningOutlined />}
title="只标记该参与者的份额;母单状态与其他打手不受影响"
onClick={() => {
setProblemShare(share)
problemShareForm.setFieldsValue({ note: '' })
}}
>
标记问题单
</Button>
)
) : null
return (
<Space size={6}>
<Space size={6} className="admin-share-actions">
{share.status === 'submitted' ? (
<Button
type="primary"
@@ -3242,6 +3503,25 @@ export default function WorkOrdersPanel() {
单人撤单
</Button>
) : null}
{(share.status === 'joined' || share.status === 'submitted') &&
share.quantity >= 2 ? (
<Button
danger
size="small"
icon={<UndoOutlined />}
title="按份数撤销部分份额:减少的份数立即回到大厅,押金保持冻结,验收资料保留"
onClick={() => {
setReduceShare(share)
reduceShareForm.setFieldsValue({
reduceQuantity: 1,
note: '',
})
}}
>
撤份额
</Button>
) : null}
{problemAction}
</Space>
)
},
@@ -3276,7 +3556,7 @@ export default function WorkOrdersPanel() {
showIcon
type="warning"
message={`将撤销该打手承接的 ${cancelShare.quantity} 份拼单`}
description="撤单后会退还该份额冻结的押金,空出的份数重新回到接单大厅;已提交的验收资料会保留在后台记录中。"
description="撤单只释放这一份份额并退还该份额冻结的押金,母单状态保持不变(待验收/进行中的单不会被踢回大厅);已提交的验收资料会保留在后台记录中。"
style={{ marginBottom: 16 }}
/>
<Form.Item label="撤单原因" name="reason">
@@ -3286,6 +3566,162 @@ export default function WorkOrdersPanel() {
) : null}
</Modal>
<Modal
title={`撤份额 · ${reduceShare?.worker?.displayName || reduceShare?.worker?.username || ''}`}
open={Boolean(reduceShare)}
okText="确认撤销"
cancelText="取消"
okButtonProps={{ danger: true }}
onCancel={() => {
setReduceShare(null)
reduceShareForm.resetFields()
}}
onOk={() => reduceShareForm.submit()}
destroyOnHidden
>
{reduceShare ? (
<Form
form={reduceShareForm}
layout="vertical"
initialValues={{ reduceQuantity: 1 }}
onFinish={submitReduceShare}
>
<Alert
showIcon
type="warning"
message={`将从该打手的 ${reduceShare.quantity} 份中撤掉指定份数`}
description="撤掉的份数会立刻回到抢单大厅;押金保持原冻结额不退还;验收资料保留,之后仍可单独验收剩余份数。"
style={{ marginBottom: 16 }}
/>
<Form.Item
label={`撤掉份数(1 ~ ${Math.max(1, reduceShare.quantity - 1)} 份)`}
name="reduceQuantity"
rules={[{ required: true, message: '请填写要撤掉的份数' }]}
>
<InputNumber
min={1}
max={Math.max(1, reduceShare.quantity - 1)}
precision={0}
addonAfter="份"
style={{ width: '100%' }}
/>
</Form.Item>
<Form.Item noStyle shouldUpdate>
{() => {
const reduceQuantity = Math.floor(
Number(reduceShareForm.getFieldValue('reduceQuantity') || 0),
)
const boundedReduce = Math.max(
0,
Math.min(Math.max(0, reduceShare.quantity - 1), reduceQuantity),
)
const keepQuantity = Math.max(0, reduceShare.quantity - boundedReduce)
return (
<Typography.Text type="secondary">
调整后保留 {keepQuantity} 份,回到大厅 {boundedReduce} 份;剩余份额报酬{' '}
{formatMoney(keepQuantity * Number(reduceShare.unitReward || 0))}
</Typography.Text>
)
}}
</Form.Item>
<Form.Item label="撤销原因(选填)" name="note">
<Input.TextArea
rows={3}
maxLength={200}
placeholder="如:打手账号实际只能赠送 5 份"
/>
</Form.Item>
</Form>
) : null}
</Modal>
<Modal
title={`标记份额问题单 · ${
problemShare?.worker?.displayName || problemShare?.worker?.username || ''
}`}
open={Boolean(problemShare)}
okText="确认标记"
cancelText="取消"
okButtonProps={{ danger: true }}
onCancel={() => {
setProblemShare(null)
problemShareForm.resetFields()
}}
onOk={() => problemShareForm.submit()}
destroyOnHidden
>
{problemShare ? (
<Form form={problemShareForm} layout="vertical" onFinish={submitProblemShare}>
<Alert
showIcon
type="warning"
message={`将标记该打手承接的 ${problemShare.quantity} 份拼单为问题单`}
description="只有该份额持有人会在「我的订单」里看到问题单与备注;同工单其他打手、母单状态与份额状态都不受影响。整单问题单仍可在订单详情里操作。"
style={{ marginBottom: 16 }}
/>
<Form.Item label="问题备注" name="note">
<Input.TextArea rows={3} placeholder="选填,仅该份额持有人可见" maxLength={500} />
</Form.Item>
</Form>
) : null}
</Modal>
<Modal
title={`处置份额问题单 · ${
disposeShare?.worker?.displayName || disposeShare?.worker?.username || ''
}`}
open={Boolean(disposeShare)}
okText="确认处置"
cancelText="取消"
okButtonProps={{ danger: true }}
onCancel={() => {
setDisposeShare(null)
disposeShareForm.resetFields()
}}
onOk={() => disposeShareForm.submit()}
destroyOnHidden
>
{disposeShare ? (
<Form
form={disposeShareForm}
layout="vertical"
initialValues={{ action: 'return_to_worker', note: '' }}
onFinish={submitShareDisposal}
>
<Alert
showIcon
type="warning"
message={`只处置「${
disposeShare.worker?.displayName || disposeShare.worker?.username || '该打手'
}」的 ${disposeShare.quantity} 份份额`}
description="处置方式与母单一致,但只作用于这一份:母单状态、其他打手都不受影响。"
style={{ marginBottom: 16 }}
/>
<Form.Item
label="处置方式"
name="action"
rules={[{ required: true, message: '请选择处置方式' }]}
>
<Select
options={[
{ value: 'return_to_worker', label: '退回打手继续代练' },
{ value: 'reopen', label: '释放押金并重新放回大厅' },
{ value: 'cancel_release', label: '取消该份额并退还押金' },
{ value: 'cancel_deduct', label: '取消该份额并扣除押金' },
]}
/>
</Form.Item>
<Form.Item
label="处置备注"
name="note"
rules={[{ required: true, message: '请填写处置备注' }]}
>
<Input.TextArea rows={4} placeholder="如:验收图片与要求不符,退回继续代练" />
</Form.Item>
</Form>
) : null}
</Modal>
<Modal
title={`拼单撤单处理 · ${getDisplayOrderNo(cancelSharingOrder)}`}
open={Boolean(cancelSharingOrder)}
@@ -252,6 +252,17 @@ export function formatSharingShareStatus(status: string) {
return labels[status] || status
}
/** 撤单原因:份额级独立撤单后,后台需要一眼看出是谁撤的。 */
export function formatSharingShareCancelledReason(reason: string) {
const labels: Record<string, string> = {
timeout: '超时失效',
admin: '后台撤单',
worker_request: '打手退单',
problem: '问题单处置',
}
return labels[reason] || reason
}
export function formatAcceptanceMode(mode: string) {
if (mode === 'friend_gift') return '好友赠送'
return '标准验收'
@@ -67,6 +67,7 @@ import {
resolveHallRewardAmount,
} from '@/utils/worker-product-name'
import { formatDateTime, formatPublishedElapsedTime } from '@/utils/date-time'
import { createRequestId } from '@/utils/request-id'
type HallSummary = {
pendingAcceptanceCount: number
@@ -312,7 +313,8 @@ export default function WorkerHallPage() {
async (order: WorkOrder) => {
setGrabbingId(order.workOrderId)
try {
await grabWorkerOrder(order.workOrderId)
// 幂等键:重复点击/网络重试不会重复抢单(服务端按 requestId 去重)。
await grabWorkerOrder(order.workOrderId, { requestId: createRequestId('grab') })
message.success('抢单成功,已进入我的订单')
removeHallOrderLocally(order.workOrderId)
await refreshAfterMutation()
@@ -356,6 +358,7 @@ export default function WorkerHallPage() {
try {
const result = await joinWorkerSharingOrder(sharingOrder.workOrderId, {
quantity: sharingQuantity,
requestId: createRequestId('share'),
})
message.success('拼单成功,已进入我的订单')
const currentProgress = sharingOrder.sharingProgress
@@ -1159,6 +1162,20 @@ type HallCardProps = {
onOpenSharing: (order: WorkOrder) => void
}
/**
* 我在该工单的份额摘要:参与次数 + 累计份数。
*
* 同一打手在同一工单可以多次拼单,`myShares` 是全部有效份额;旧数据只有 `myShare`。
* 大厅按钮据此固定显示「再拼一次」,不再随参与次数改文案。
*/
function resolveHallMyShareSummary(order: WorkOrder): { count: number; quantity: number } {
const shares = order.myShares?.length ? order.myShares : order.myShare ? [order.myShare] : []
return {
count: shares.length,
quantity: shares.reduce((total, share) => total + Number(share.quantity || 0), 0),
}
}
/**
* 已加载 100+ 单时,任何一条实时变更都会替换大厅缓存中的一条订单。
* 卡片拆成 memo 组件后,只有真正变化的那条会重渲染,其余卡片直接复用。
@@ -1177,6 +1194,7 @@ const HallDesktopCard = memo(function HallDesktopCard({
const sharingRemaining = resolveHallRemainingQuantity(order)
const depositAmount = resolveHallDepositAmount(order)
const rewardAmount = resolveHallRewardAmount(order)
const myShareSummary = resolveHallMyShareSummary(order)
return (
<article className="worker-hall-card">
@@ -1250,16 +1268,21 @@ const HallDesktopCard = memo(function HallDesktopCard({
<div className="worker-hall-card-actions">
<div className="worker-hall-card-grab-row">
{order.sharing?.enabled && (sharingRemaining > 0 || order.myShare) && !disabledReason ? (
{order.sharing?.enabled && sharingRemaining > 0 && !disabledReason ? (
<Button
type="primary"
size="large"
className="worker-hall-sharing-button"
disabled={Boolean(disabledReason) || Boolean(order.myShare)}
disabled={Boolean(disabledReason)}
title={
myShareSummary.count > 0
? `已参与 ${myShareSummary.count} 次 · 共 ${myShareSummary.quantity} 份`
: undefined
}
onClick={() => onOpenSharing(order)}
>
{order.myShare
? `已拼 ${order.myShare.quantity} 份`
{myShareSummary.count > 0
? '再拼一次'
: `拼单 ${formatMoney(order.sharing.unitReward)}/份`}
</Button>
) : null}
@@ -1293,6 +1316,7 @@ const HallMobileCard = memo(function HallMobileCard({
const disabledReason = resolveGrabDisabledReason(order, worker, remainingSlots)
const productName = resolveHallProductName(order) || '未命名商品'
const sharingRemaining = resolveHallRemainingQuantity(order)
const myShareSummary = resolveHallMyShareSummary(order)
return (
<article className="worker-hall-mobile-card">
@@ -1352,16 +1376,21 @@ const HallMobileCard = memo(function HallMobileCard({
</div>
<div className="worker-hall-mobile-card-btn-group">
{order.sharing?.enabled && (sharingRemaining > 0 || order.myShare) && !disabledReason ? (
{order.sharing?.enabled && sharingRemaining > 0 && !disabledReason ? (
<Button
type="primary"
size="middle"
className="worker-hall-sharing-button"
disabled={Boolean(disabledReason) || Boolean(order.myShare)}
disabled={Boolean(disabledReason)}
title={
myShareSummary.count > 0
? `已参与 ${myShareSummary.count} 次 · 共 ${myShareSummary.quantity} 份`
: undefined
}
onClick={() => onOpenSharing(order)}
>
{order.myShare
? `已拼 ${order.myShare.quantity} 份`
{myShareSummary.count > 0
? '再拼一次'
: `拼单 ${formatMoney(order.sharing.unitReward)}/份`}
</Button>
) : null}
@@ -9,6 +9,7 @@ import {
import { Alert, Button, Card, Empty, Input, Space, Tabs, Typography } from 'antd'
import PercentTable from '@/components/common/PercentTable'
import type { TableColumnsType } from 'antd'
import type { ReactNode } from 'react'
import type { Pagination, WorkerOrderOverviewItem, WorkOrder } from '@/types/worker-platform'
@@ -30,6 +31,7 @@ export function WorkerOrderDesktopList({
page,
pageSize,
columns,
renderExpandedRow,
loading,
searching,
refreshing,
@@ -50,6 +52,7 @@ export function WorkerOrderDesktopList({
page: number
pageSize: number
columns: TableColumnsType<WorkOrder>
renderExpandedRow?: (order: WorkOrder) => ReactNode
loading: boolean
searching: boolean
refreshing: boolean
@@ -263,6 +266,15 @@ export function WorkerOrderDesktopList({
dataSource={orders}
columns={columns}
className="worker-orders-table"
expandable={
renderExpandedRow
? {
expandedRowRender: renderExpandedRow,
rowExpandable: (order) => (order.myShares?.length || 0) > 1,
columnWidth: 42,
}
: undefined
}
locale={{
emptyText: error ? (
<Empty description={error instanceof Error ? error.message : '读取我的订单失败'} />
@@ -3,6 +3,7 @@ import { Alert, Button, Card, Descriptions, Drawer, Space, Steps, Tag, Typograph
import WorkOrderEventTimeline from '@/components/WorkOrderEventTimeline'
import ImagePreviewList from '@/components/files/ImagePreviewList'
import VideoPreview, { formatAcceptanceVideoDuration } from '@/components/files/VideoPreview'
import type { WorkOrder } from '@/types/worker-platform'
import { formatDateTime } from '@/utils/date-time'
import { resolveOrderConsignmentScreenshotUrls } from '@/utils/consignment-display'
@@ -104,7 +105,7 @@ export function WorkerOrderDetailDrawer({
icon={<PictureOutlined />}
onClick={() => onOpenAcceptance(order)}
>
{hasSubmittedAcceptance(order) ? '补充图片' : '上传图片 / 提交验收'}
{hasSubmittedAcceptance(order) ? '补充验收资料' : '上传图片/视频 · 提交验收'}
</Button>
) : null}
{canRequestCancel(order) ? (
@@ -322,6 +323,7 @@ function GiftProgressCard({ order }: { order: WorkOrder }) {
function AcceptanceSummary({ order }: { order: WorkOrder }) {
const acceptanceFiles = getUniqueAcceptanceFiles(getWorkerAcceptance(order))
const draftFiles = getUniqueAcceptanceFiles(getWorkerDraft(order))
const acceptanceVideo = getWorkerAcceptance(order)?.video ?? getWorkerDraft(order)?.video ?? null
const hasAcceptance = acceptanceFiles.length > 0
const hasDraft = draftFiles.length > 0 && !hasSubmittedAcceptance(order)
@@ -329,7 +331,12 @@ function AcceptanceSummary({ order }: { order: WorkOrder }) {
<div className="worker-order-detail-stack">
<Descriptions column={{ xs: 1, md: 2 }} bordered size="small">
<Descriptions.Item label="验收图片数量">{acceptanceFiles.length}</Descriptions.Item>
<Descriptions.Item label="提交时间">
<Descriptions.Item label="验收视频">
{acceptanceVideo
? formatAcceptanceVideoDuration(acceptanceVideo.durationSeconds)
: '未上传'}
</Descriptions.Item>
<Descriptions.Item label="提交时间" span={2}>
{formatDateTime(getAcceptanceSubmittedAt(order))}
</Descriptions.Item>
<Descriptions.Item label="验收说明" span={2}>
@@ -345,6 +352,8 @@ function AcceptanceSummary({ order }: { order: WorkOrder }) {
<Typography.Text type="secondary">暂无已提交验收图片</Typography.Text>
)}
<VideoPreview video={acceptanceVideo} maxHeight={180} emptyText="暂无验收视频(选填)" />
{hasDraft ? (
<div className="acceptance-draft-badge-wrap" style={{ marginTop: 8 }}>
<Tag color="processing" icon={<PictureOutlined />}>
@@ -7,7 +7,8 @@ import {
ReloadOutlined,
SearchOutlined,
} from '@ant-design/icons'
import { Alert, Button, Empty, Input, Pagination, Spin, Tag } from 'antd'
import { Alert, Button, Empty, Input, Pagination, Spin, Tag, Typography } from 'antd'
import type { ReactNode } from 'react'
import { DeadlineCountdown } from '@/components/DeadlineCountdown'
import ImagePreviewList from '@/components/files/ImagePreviewList'
@@ -53,6 +54,7 @@ export function WorkerOrderMobileList({
pagination,
page,
pageSize,
renderShareTable,
loading,
searching,
refreshing,
@@ -81,6 +83,7 @@ export function WorkerOrderMobileList({
pagination: PaginationData | undefined
page: number
pageSize: number
renderShareTable?: (order: WorkOrder) => ReactNode
loading: boolean
searching: boolean
refreshing: boolean
@@ -173,6 +176,7 @@ export function WorkerOrderMobileList({
<WorkerOrderMobileCard
key={order.workOrderId}
order={order}
renderShareTable={renderShareTable}
onOpenDetail={onOpenDetail}
onOpenAcceptance={onOpenAcceptance}
onOpenGiftMaterial={onOpenGiftMaterial}
@@ -203,6 +207,7 @@ export function WorkerOrderMobileList({
function WorkerOrderMobileCard({
order,
renderShareTable,
onOpenDetail,
onOpenAcceptance,
onOpenGiftMaterial,
@@ -326,14 +331,27 @@ function WorkerOrderMobileCard({
? '押金: 已解除冻结'
: `押金: ${formatMoney(order.freezeDepositAmount)}`}
</span>
{order.myShare ? (
{order.myShare || order.myShares?.length ? (
<span className="worker-order-mobile-sub-item">
已拼 {order.myShare.quantity} 份 ({formatMoney(order.myShare.shareReward)})
已参与 {order.myShares?.length || 1} 次 · 共{' '}
{order.myShares?.reduce((total, share) => total + share.quantity, 0) ||
order.myShare?.quantity ||
0}{' '}
份
</span>
) : null}
<span className="worker-order-mobile-sub-time">{formatDateTime(order.assignedAt)}</span>
</div>
{(order.myShares?.length || 0) > 1 && renderShareTable ? (
<div className="worker-order-mobile-shares">
<Typography.Text strong style={{ fontSize: 12 }}>
拼单明细({order.myShares?.length} 份)
</Typography.Text>
{renderShareTable(order)}
</div>
) : null}
{order.status === 'problem' && String(order.problemNote || '').trim() ? (
<div className="worker-order-mobile-problem-box">
<strong>问题:</strong>
@@ -458,7 +476,7 @@ function WorkerOrderMobileCard({
className="worker-order-mobile-action-submit"
onClick={() => onOpenAcceptance(order)}
>
{hasSubmittedAcceptance(order) ? '补充图片' : '提交验收'}
{hasSubmittedAcceptance(order) ? '补充验收资料' : '验收'}
</Button>
) : null}
{canRemindAcceptance(order) ? (
@@ -3,8 +3,10 @@ import { Button, Form, Input, Modal, Radio, Space, Tag, Typography } from 'antd'
import type { FormInstance } from 'antd'
import ImageUpload from '@/components/files/ImageUpload'
import VideoUpload from '@/components/files/VideoUpload'
import type {
UploadedFile,
WorkerAcceptanceVideo,
WorkerCancelRequestRisk,
WorkerOrderFeedback,
WorkOrder,
@@ -59,10 +61,12 @@ export function WorkerOrderModals({
onSaveNote,
editingOrder,
acceptanceFiles,
acceptanceVideo,
acceptanceForm,
workerCanAutoAcceptWithoutEvidence,
onCloseAcceptance,
onAcceptanceFilesChange,
onAcceptanceVideoChange,
onSubmitAcceptance,
onSaveAcceptanceImages,
giftMaterialOrder,
@@ -89,10 +93,12 @@ export function WorkerOrderModals({
onSaveNote: (values: WorkerNoteFormValues) => void | Promise<void>
editingOrder: WorkOrder | null
acceptanceFiles: UploadedFile[]
acceptanceVideo: WorkerAcceptanceVideo | null
acceptanceForm: FormInstance<AcceptanceFormValues>
workerCanAutoAcceptWithoutEvidence: boolean
onCloseAcceptance: () => void
onAcceptanceFilesChange: (files: UploadedFile[]) => void
onAcceptanceVideoChange: (video: WorkerAcceptanceVideo | null) => void
onSubmitAcceptance: (values: AcceptanceFormValues) => void | Promise<void>
onSaveAcceptanceImages: (values: AcceptanceFormValues) => void | Promise<void>
giftMaterialOrder: WorkOrder | null
@@ -261,17 +267,18 @@ export function WorkerOrderModals({
<Form.Item
label="验收图片"
required={
!editingOrder ||
canSupplementAcceptedEvidence(editingOrder) ||
!canAutoAcceptOrder(editingOrder, workerCanAutoAcceptWithoutEvidence)
!acceptanceVideo &&
(!editingOrder ||
canSupplementAcceptedEvidence(editingOrder) ||
!canAutoAcceptOrder(editingOrder, workerCanAutoAcceptWithoutEvidence))
}
extra={
editingOrder && canSupplementAcceptedEvidence(editingOrder)
? '仅可追加新图片,原有验收图片会保留。'
: editingOrder &&
canAutoAcceptOrder(editingOrder, workerCanAutoAcceptWithoutEvidence)
? 'VIP 免审核可先提交,验收后需在 24 小时内补充图片。'
: undefined
? 'VIP 免审核可先提交,验收后需在 24 小时内补充图片或视频。'
: '验收图片与验收视频至少上传一个,已上传视频时图片可不填。'
}
>
<ImageUpload
@@ -283,6 +290,12 @@ export function WorkerOrderModals({
showPasteHint
/>
</Form.Item>
<Form.Item
label="验收视频"
extra="与验收图片至少上传一个;选片后会在本机压到 720p 再上传;已提交的验收只能替换视频,不能删除。"
>
<VideoUpload value={acceptanceVideo} onChange={onAcceptanceVideoChange} />
</Form.Item>
</Form>
</Modal>
<Modal
@@ -0,0 +1,248 @@
import { Button, Space, Tag, Typography } from 'antd'
import type { TableColumnsType } from 'antd'
import PercentTable from '@/components/common/PercentTable'
import { DeadlineCountdown } from '@/components/DeadlineCountdown'
import ImagePreviewList from '@/components/files/ImagePreviewList'
import type { WorkOrder, WorkOrderShare } from '@/types/worker-platform'
import { formatDateTime } from '@/utils/date-time'
import { formatMoney, getOrderShares, getUniqueAcceptanceFiles } from './worker-order-utils'
const SHARE_STATUS_META: Record<string, { label: string; color: string }> = {
joined: { label: '进行中', color: 'processing' },
submitted: { label: '待验收', color: 'orange' },
accepted: { label: '已验收', color: 'green' },
cancelled: { label: '已取消', color: 'default' },
}
/**
* 一个工单一行,展开后展示该打手在这个工单里的每一份份额。
* 数量 / 奖励 / 押金直接取份额字段,与后台「拼单明细」同口径。
*/
export function WorkerOrderShareTable({
order,
onOpenAcceptance,
onOpenCancelRequest,
onRemindAcceptance,
}: {
order: WorkOrder
onOpenAcceptance: (order: WorkOrder, shareId: number) => void
onOpenCancelRequest: (order: WorkOrder, shareId: number) => void
onRemindAcceptance: (order: WorkOrder) => void
}) {
const shares = getOrderShares(order)
.slice()
.sort((left, right) => {
const byCreatedAt = String(left.createdAt || '').localeCompare(String(right.createdAt || ''))
return byCreatedAt !== 0 ? byCreatedAt : left.shareId - right.shareId
})
const isTimedOut = order.status === 'open' || Boolean(order.timeoutNotice?.isTimedOut)
if (shares.length === 0) return null
const columns: TableColumnsType<WorkOrderShare> = [
{
title: '份额',
width: 92,
render: (_, share) => (
<div className="cell-stack">
<Typography.Text strong>
第 {shares.findIndex((item) => item.shareId === share.shareId) + 1} 份
</Typography.Text>
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
#{share.shareId}
</Typography.Text>
</div>
),
},
{
title: '数量',
width: 80,
render: (_, share) => <Typography.Text strong>{share.quantity} 份</Typography.Text>,
},
{
title: '奖励',
width: 110,
render: (_, share) => (
<Typography.Text strong style={{ color: '#cf1322' }}>
{formatMoney(share.shareReward)}
</Typography.Text>
),
},
{
title: '押金',
width: 100,
render: (_, share) => formatMoney(share.shareDeposit),
},
{
title: '状态',
width: 96,
render: (_, share) => {
const meta = SHARE_STATUS_META[String(share.status)] || {
label: String(share.status || '-'),
color: 'default',
}
return <Tag color={meta.color}>{meta.label}</Tag>
},
},
{
title: '问题',
width: 150,
render: (_, share) => {
if (!share.problemMarked) {
return (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
—
</Typography.Text>
)
}
const note = String(share.problemNote || '').trim()
return (
<div className="cell-stack">
<Tag
color="red"
title={
share.problemMarkedAt
? `标记时间:${formatDateTime(share.problemMarkedAt)}`
: undefined
}
>
问题单
</Tag>
{note ? (
<Typography.Text
type="secondary"
ellipsis={{ tooltip: note }}
style={{ fontSize: 12 }}
>
{note}
</Typography.Text>
) : null}
</div>
)
},
},
{
title: '截止时间',
width: 170,
render: (_, share) => {
if (!share.deadlineAt) {
return (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
不限时
</Typography.Text>
)
}
return (
<div className="cell-stack">
<Typography.Text style={{ fontSize: 12 }}>
{formatDateTime(share.deadlineAt)}
</Typography.Text>
{share.status === 'joined' && !isTimedOut ? (
<DeadlineCountdown deadlineAt={share.deadlineAt} />
) : null}
</div>
)
},
},
{
title: '验收信息',
width: 220,
render: (_, share) => <ShareAcceptanceCell share={share} />,
},
{
title: '操作',
width: 190,
render: (_, share) => {
const canAccept = !isTimedOut && share.status === 'joined'
const canEdit = !isTimedOut && ['joined', 'submitted'].includes(String(share.status))
const canRemind = !isTimedOut && share.status === 'submitted'
const canCancel = !isTimedOut && ['joined', 'submitted'].includes(String(share.status))
if (!canAccept && !canEdit && !canRemind && !canCancel) {
return (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
无
</Typography.Text>
)
}
return (
<Space size={6} wrap>
{canAccept ? (
<Button
type="primary"
size="small"
onClick={() => onOpenAcceptance(order, share.shareId)}
>
验收
</Button>
) : null}
{canEdit && share.status === 'submitted' ? (
<Button size="small" onClick={() => onOpenAcceptance(order, share.shareId)}>
补充图片
</Button>
) : null}
{canRemind ? (
<Button size="small" onClick={() => onRemindAcceptance(order)}>
催验收
</Button>
) : null}
{canCancel ? (
<Button danger size="small" onClick={() => onOpenCancelRequest(order, share.shareId)}>
申请取消
</Button>
) : null}
</Space>
)
},
},
]
return (
<PercentTable<WorkOrderShare>
rowKey="shareId"
size="small"
bordered={false}
pagination={false}
dataSource={shares}
columns={columns}
className="worker-order-share-table"
/>
)
}
function ShareAcceptanceCell({ share }: { share: WorkOrderShare }) {
const acceptanceFiles = getUniqueAcceptanceFiles(share.acceptance)
const draftFiles = getUniqueAcceptanceFiles(share.draftAcceptance)
if (acceptanceFiles.length === 0 && draftFiles.length === 0 && !share.submittedAt) {
return (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
未提交
</Typography.Text>
)
}
return (
<div className="cell-stack">
{acceptanceFiles.length > 0 ? (
<ImagePreviewList files={acceptanceFiles} size={32} maxVisible={2} />
) : null}
{share.submittedAt ? (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
提交:{formatDateTime(share.submittedAt)}
</Typography.Text>
) : null}
{draftFiles.length > 0 && !share.submittedAt ? (
<Tag color="processing">已暂存 {draftFiles.length} 张</Tag>
) : null}
{String(share.acceptance?.note || '').trim() ? (
<Typography.Text
type="secondary"
ellipsis={{ tooltip: share.acceptance.note }}
style={{ fontSize: 12 }}
>
{share.acceptance.note}
</Typography.Text>
) : null}
</div>
)
}
@@ -83,7 +83,9 @@ export function buildWorkerOrderTableColumns({
</Space>
<Space size={[4, 4]} wrap>
{row.categoryName ? <Tag color="blue">{row.categoryName}</Tag> : null}
{row.myShare ? <Tag color="purple">拼单</Tag> : null}
{row.myShares?.length || row.myShare ? (
<Tag color="purple">拼单 {row.myShares?.length || 1} 次</Tag>
) : null}
</Space>
<Typography.Text
type="secondary"
@@ -165,9 +167,13 @@ export function buildWorkerOrderTableColumns({
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
押金:{formatMoney(row.freezeDepositAmount)}
</Typography.Text>
{row.myShare ? (
{row.myShare || row.myShares?.length ? (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
{row.myShare.quantity} 份 · {formatMoney(row.myShare.shareReward)}
{row.myShares?.length || 1} 次 ·{' '}
{row.myShares?.reduce((total, share) => total + share.quantity, 0) ||
row.myShare?.quantity ||
0}{' '}
份
</Typography.Text>
) : null}
</div>
@@ -239,48 +245,57 @@ export function buildWorkerOrderTableColumns({
{
title: '操作',
width: 150,
render: (_, row) => (
<div className="worker-order-actions">
<Space size={6}>
<Tooltip title="查看详情">
<Button
aria-label="查看详情"
icon={<EyeOutlined />}
onClick={() => onOpenDetail(row)}
/>
</Tooltip>
{canSubmitGiftMaterial(row) ? (
<Button type="primary" onClick={() => onOpenGiftMaterial(row)}>
提交资料
</Button>
) : null}
{canEditAcceptanceImages(row) ? (
<Button
icon={<PictureOutlined />}
type={canSubmitAcceptance(row) ? 'primary' : 'default'}
onClick={() => onOpenAcceptance(row)}
>
{hasSubmittedAcceptance(row) ? '补充图片' : '验收'}
</Button>
) : null}
{canRemindAcceptance(row) ? (
<Button onClick={() => onRemindAcceptance(row)}>催验收</Button>
) : null}
{canRequestCancel(row) ? (
<Button danger onClick={() => onOpenCancelRequest(row)}>
申请取消
</Button>
) : null}
{canSubmitFeedback(row) ? (
<Tooltip title="反馈客户资料或订单处理问题">
<Button icon={<MessageOutlined />} onClick={() => onOpenFeedback(row)}>
反馈
</Button>
render: (_, row) => {
const shareCount = row.myShares?.length || (row.myShare ? 1 : 0)
const hasMultipleShares = shareCount > 1
return (
<div className="worker-order-actions">
<Space size={6} wrap>
<Tooltip title="查看详情">
<Button
aria-label="查看详情"
icon={<EyeOutlined />}
onClick={() => onOpenDetail(row)}
/>
</Tooltip>
) : null}
</Space>
</div>
),
{canSubmitGiftMaterial(row) ? (
<Button type="primary" onClick={() => onOpenGiftMaterial(row)}>
提交资料
</Button>
) : null}
{!hasMultipleShares && canEditAcceptanceImages(row) ? (
<Button
icon={<PictureOutlined />}
type={canSubmitAcceptance(row) ? 'primary' : 'default'}
onClick={() => onOpenAcceptance(row)}
>
{hasSubmittedAcceptance(row) ? '补充图片' : '验收'}
</Button>
) : null}
{!hasMultipleShares && canRemindAcceptance(row) ? (
<Button onClick={() => onRemindAcceptance(row)}>催验收</Button>
) : null}
{!hasMultipleShares && canRequestCancel(row) ? (
<Button danger onClick={() => onOpenCancelRequest(row)}>
申请取消
</Button>
) : null}
{hasMultipleShares ? (
<Typography.Text type="secondary" style={{ fontSize: 12 }}>
展开行查看 {shareCount} 份份额操作
</Typography.Text>
) : null}
{canSubmitFeedback(row) ? (
<Tooltip title="反馈客户资料或订单处理问题">
<Button icon={<MessageOutlined />} onClick={() => onOpenFeedback(row)}>
反馈
</Button>
</Tooltip>
) : null}
</Space>
</div>
)
},
},
]
}
@@ -1,6 +1,6 @@
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { keepPreviousData, useQuery, useQueryClient } from '@tanstack/react-query'
import { useNavigate } from 'react-router'
import { App, Badge, Button, Form, Space, Typography } from 'antd'
import { App, Badge, Button, Form, Modal, Radio, Space, Tag, Typography } from 'antd'
import { useState } from 'react'
import {
@@ -20,13 +20,15 @@ import {
submitWorkerOrderFeedback,
supplementWorkerAcceptedOrderEvidence,
} from '@/services/worker'
import type { UploadedFile, WorkOrder } from '@/types/worker-platform'
import type { UploadedFile, WorkOrder, WorkerAcceptanceVideo } from '@/types/worker-platform'
import { isExplicitOrderNoSearch, normalizeSearchText } from '@/utils/admin-realtime-work-orders'
import { formatDateTime } from '@/utils/date-time'
import { useIsMobile } from '@/utils/use-is-mobile'
import { buildWorkerOrderQuery } from '@/utils/worker-order-query'
import { WorkerOrderDesktopList } from './WorkerOrderDesktopList'
import { WorkerOrderDetailDrawer } from './WorkerOrderDetailDrawer'
import { WorkerOrderMobileList } from './WorkerOrderMobileList'
import { WorkerOrderShareTable } from './WorkerOrderShareTable'
import {
type AcceptanceFormValues,
type CancelRequestFormValues,
@@ -41,6 +43,7 @@ import {
canSupplementAcceptedEvidence,
getCopyOrderInfoItems,
getMaterialScreenshots,
getOrderShares,
getUniqueAcceptanceFiles,
getWorkerAcceptance,
getWorkerDraft,
@@ -165,10 +168,22 @@ export default function WorkerOrdersPage() {
const [pageSize, setPageSize] = useState(20)
const [detailOrder, setDetailOrder] = useState<WorkOrder | null>(null)
const [editingOrder, setEditingOrder] = useState<WorkOrder | null>(null)
/** 本次验收/补图针对的份额;null = 整单 */
const [editingShareId, setEditingShareId] = useState<number | null>(null)
/** 多份额时先让打手选择要操作哪一份 */
const [sharePicker, setSharePicker] = useState<{
order: WorkOrder
action: 'accept' | 'cancel'
} | null>(null)
const [pickedShareId, setPickedShareId] = useState<number>(0)
const [cancelShareId, setCancelShareId] = useState<number | null>(null)
const [noteOrder, setNoteOrder] = useState<WorkOrder | null>(null)
const [cancelRequestOrder, setCancelRequestOrder] = useState<WorkOrder | null>(null)
const [feedbackOrder, setFeedbackOrder] = useState<WorkOrder | null>(null)
const [acceptanceFiles, setAcceptanceFiles] = useState<UploadedFile[]>([])
/** 验收视频(单条,非必填);dirty 表示本次弹窗里换过视频,用于补图时允许"只补视频" */
const [acceptanceVideo, setAcceptanceVideo] = useState<WorkerAcceptanceVideo | null>(null)
const [acceptanceVideoDirty, setAcceptanceVideoDirty] = useState(false)
const [giftMaterialOrder, setGiftMaterialOrder] = useState<WorkOrder | null>(null)
const [giftMaterialFiles, setGiftMaterialFiles] = useState<UploadedFile[]>([])
const [form] = Form.useForm<AcceptanceFormValues>()
@@ -181,6 +196,8 @@ export default function WorkerOrdersPage() {
queryKey: ['worker-my-orders', status, keyword, page, pageSize],
queryFn: () => fetchWorkerMyOrders(buildWorkerOrderQuery(status, keyword, page, pageSize)),
staleTime: 2_000,
// 切页签时保留上一页数据,避免请求返回前先闪一下空列表。
placeholderData: keepPreviousData,
refetchOnWindowFocus: false,
retry: false,
})
@@ -292,21 +309,54 @@ export default function WorkerOrdersPage() {
}
}
/** 把订单对象替换成「指定份额」视角,让验收弹窗读写该份额的验收/草稿。 */
function buildShareEditingOrder(order: WorkOrder, shareId: number | null): WorkOrder {
if (!shareId) return order
const share = getOrderShares(order).find((item) => item.shareId === shareId)
if (!share) return order
return {
...order,
myShare: share,
// 已验收的份额走补图分支;其它份额沿用母单状态。
status: share.status === 'accepted' ? 'accepted' : order.status,
}
}
function openAcceptanceModal(order: WorkOrder) {
markOrderAsRead(order)
setEditingOrder(order)
if (canSupplementAcceptedEvidence(order)) {
// 已验收补图只上传新增文件,原有验收图片由服务端保留。
const shares = getOrderShares(order)
if (shares.length > 1) {
setPickedShareId(shares[0]?.shareId || 0)
setSharePicker({ order, action: 'accept' })
return
}
openAcceptanceWithShare(order, shares[0]?.shareId ?? null)
}
/** 子表里直接对某一份份额发起验收/补图。 */
function openAcceptanceForShare(order: WorkOrder, shareId: number) {
markOrderAsRead(order)
openAcceptanceWithShare(order, shareId)
}
function openAcceptanceWithShare(order: WorkOrder, shareId: number | null) {
const editingTarget = buildShareEditingOrder(order, shareId)
setEditingShareId(shareId)
setEditingOrder(editingTarget)
setAcceptanceVideoDirty(false)
const submitted = getWorkerAcceptance(editingTarget)
if (canSupplementAcceptedEvidence(editingTarget)) {
// 已验收补图只上传新增文件,原有验收图片由服务端保留;视频只能替换、不能删除。
setAcceptanceFiles([])
setAcceptanceVideo(submitted?.video ?? null)
form.resetFields()
setDetailOrder(null)
return
}
// 已提交:以已提交的验收资料为初始内容;未提交:以暂存草稿为初始内容
const source = hasSubmittedAcceptance(order)
? getWorkerAcceptance(order)
: getWorkerDraft(order)
const source = hasSubmittedAcceptance(editingTarget) ? submitted : getWorkerDraft(editingTarget)
setAcceptanceFiles(getUniqueAcceptanceFiles(source))
setAcceptanceVideo(source?.video ?? null)
form.setFieldsValue({ note: String(source?.note || '') })
setDetailOrder(null)
}
@@ -356,6 +406,21 @@ export default function WorkerOrdersPage() {
function openCancelRequestModal(order: WorkOrder) {
markOrderAsRead(order)
const shares = getOrderShares(order)
if (shares.length > 1) {
setPickedShareId(shares[0]?.shareId || 0)
setSharePicker({ order, action: 'cancel' })
return
}
setCancelShareId(shares[0]?.shareId ?? null)
setCancelRequestOrder(order)
cancelRequestForm.resetFields()
}
/** 子表里直接对某一份份额申请取消。 */
function openCancelRequestForShare(order: WorkOrder, shareId: number) {
markOrderAsRead(order)
setCancelShareId(shareId)
setCancelRequestOrder(order)
cancelRequestForm.resetFields()
}
@@ -365,6 +430,7 @@ export default function WorkerOrdersPage() {
try {
await submitWorkerCancelRequest(cancelRequestOrder.workOrderId, {
reason: String(values.reason || '').trim(),
shareId: cancelShareId,
})
message.success('取消申请已提交,等待客服审核')
setCancelRequestOrder(null)
@@ -423,21 +489,25 @@ export default function WorkerOrdersPage() {
if (!editingOrder) return
const isAcceptedEvidenceSupplement = canSupplementAcceptedEvidence(editingOrder)
if (isAcceptedEvidenceSupplement) {
if (acceptanceFiles.length === 0) {
message.error('请上传新的验收图片')
if (acceptanceFiles.length === 0 && !acceptanceVideoDirty) {
message.error('请上传新的验收图片,或替换验收视频')
return
}
try {
await supplementWorkerAcceptedOrderEvidence(editingOrder.workOrderId, {
files: acceptanceFiles,
...(acceptanceVideoDirty ? { video: acceptanceVideo } : {}),
...(editingShareId ? { shareId: editingShareId } : {}),
})
message.success('验收图片已补充')
message.success('验收资料已补充')
setEditingOrder(null)
setAcceptanceFiles([])
setAcceptanceVideo(null)
setAcceptanceVideoDirty(false)
form.resetFields()
await refreshAll()
} catch (error) {
message.error(error instanceof Error ? error.message : '补充验收图片失败')
message.error(error instanceof Error ? error.message : '补充验收资料失败')
}
return
}
@@ -448,18 +518,31 @@ export default function WorkerOrdersPage() {
}
const canAutoAccept = canAutoAcceptOrder(editingOrder, workerCanAutoAcceptWithoutEvidence)
if (acceptanceFiles.length === 0 && !canAutoAccept) {
message.error('请上传验收图片')
// 验收图片与验收视频至少上传一个;有视频时视同有图片,后续口径完全一致。
const hasEvidence = acceptanceFiles.length > 0 || Boolean(acceptanceVideo)
if (!hasEvidence && !canAutoAccept) {
message.error('请上传验收图片或验收视频')
return
}
try {
await submitWorkerAcceptance(editingOrder.workOrderId, {
note: values.note,
files: acceptanceFiles,
video: acceptanceVideo,
...(editingShareId ? { shareId: editingShareId } : {}),
})
message.success(canAutoAccept ? '已自动验收,可在 24 小时内补充图片' : '已提交验收')
// 已有图片或视频时证据即算齐备,不再提示补图。
message.success(
canAutoAccept
? hasEvidence
? '已自动验收'
: '已自动验收,可在 24 小时内补充图片或视频'
: '已提交验收',
)
setEditingOrder(null)
setAcceptanceFiles([])
setAcceptanceVideo(null)
setAcceptanceVideoDirty(false)
form.resetFields()
await refreshAll()
} catch (error) {
@@ -469,20 +552,24 @@ export default function WorkerOrdersPage() {
async function saveAcceptanceImages(values: AcceptanceFormValues) {
if (!editingOrder) return
if (hasSubmittedAcceptance(editingOrder) && acceptanceFiles.length === 0) {
message.error('请至少保留一张验收图片')
if (hasSubmittedAcceptance(editingOrder) && acceptanceFiles.length === 0 && !acceptanceVideo) {
message.error('请至少保留一张验收图片或一段验收视频')
return
}
try {
await saveWorkerAcceptanceDraft(editingOrder.workOrderId, {
note: values.note,
files: acceptanceFiles,
video: acceptanceVideo,
...(editingShareId ? { shareId: editingShareId } : {}),
})
message.success(
hasSubmittedAcceptance(editingOrder) ? '验收图片已更新' : '验收图片已暂存,可继续补充',
hasSubmittedAcceptance(editingOrder) ? '验收资料已更新' : '验收资料已暂存,可继续补充',
)
setEditingOrder(null)
setAcceptanceFiles([])
setAcceptanceVideo(null)
setAcceptanceVideoDirty(false)
form.resetFields()
await refreshAll()
} catch (error) {
@@ -501,6 +588,19 @@ export default function WorkerOrdersPage() {
setPage(1)
}
function renderShareTable(order: WorkOrder) {
return (
<WorkerOrderShareTable
order={order}
onOpenAcceptance={openAcceptanceForShare}
onOpenCancelRequest={openCancelRequestForShare}
onRemindAcceptance={(target) => {
void submitAcceptanceReminder(target)
}}
/>
)
}
const columns = buildWorkerOrderTableColumns({
onOpenDetail: openOrderDetail,
onOpenAcceptance: openAcceptanceModal,
@@ -562,6 +662,7 @@ export default function WorkerOrdersPage() {
pagination={pagination}
page={page}
pageSize={pageSize}
renderShareTable={renderShareTable}
loading={ordersQuery.isLoading}
searching={ordersQuery.isFetching}
refreshing={ordersQuery.isFetching || overviewQuery.isFetching}
@@ -611,6 +712,7 @@ export default function WorkerOrdersPage() {
page={page}
pageSize={pageSize}
columns={columns}
renderExpandedRow={renderShareTable}
loading={ordersQuery.isLoading}
searching={ordersQuery.isFetching}
refreshing={ordersQuery.isFetching || overviewQuery.isFetching}
@@ -674,14 +776,21 @@ export default function WorkerOrdersPage() {
onSaveNote={saveOrderNote}
editingOrder={editingOrder}
acceptanceFiles={acceptanceFiles}
acceptanceVideo={acceptanceVideo}
acceptanceForm={form}
workerCanAutoAcceptWithoutEvidence={workerCanAutoAcceptWithoutEvidence}
onCloseAcceptance={() => {
setEditingOrder(null)
setAcceptanceFiles([])
setAcceptanceVideo(null)
setAcceptanceVideoDirty(false)
form.resetFields()
}}
onAcceptanceFilesChange={setAcceptanceFiles}
onAcceptanceVideoChange={(video) => {
setAcceptanceVideo(video)
setAcceptanceVideoDirty(true)
}}
onSubmitAcceptance={submitAcceptance}
onSaveAcceptanceImages={saveAcceptanceImages}
giftMaterialOrder={giftMaterialOrder}
@@ -695,6 +804,57 @@ export default function WorkerOrdersPage() {
onGiftMaterialFilesChange={setGiftMaterialFiles}
onSubmitGiftMaterial={submitGiftMaterial}
/>
<Modal
open={Boolean(sharePicker)}
title={sharePicker?.action === 'cancel' ? '选择要撤销的份额' : '选择要验收的份额'}
okText={sharePicker?.action === 'cancel' ? '提交退单申请' : '继续'}
cancelText="取消"
onCancel={() => setSharePicker(null)}
onOk={() => {
if (!sharePicker) return
if (sharePicker.action === 'accept') {
openAcceptanceWithShare(sharePicker.order, pickedShareId || null)
} else {
setCancelShareId(pickedShareId || null)
setCancelRequestOrder(sharePicker.order)
cancelRequestForm.resetFields()
}
setSharePicker(null)
}}
>
<Radio.Group
value={pickedShareId}
onChange={(event) => setPickedShareId(Number(event.target.value))}
style={{ display: 'flex', flexDirection: 'column', gap: 10 }}
>
{sharePicker && sharePicker.action === 'cancel' ? (
<Radio value={0}>全部有效份额(整单退单)</Radio>
) : null}
{sharePicker
? getOrderShares(sharePicker.order).map((share) => (
<Radio key={share.shareId} value={share.shareId}>
<Space size={6} wrap>
<span>#{share.shareId}</span>
<Tag color="purple">{share.quantity} 份</Tag>
<span>
{share.status === 'joined'
? '进行中'
: share.status === 'submitted'
? '待验收'
: share.status === 'accepted'
? '已验收'
: share.status}
</span>
<span style={{ color: '#8c8c8c' }}>
{share.deadlineAt ? `${formatDateTime(share.deadlineAt)} 截止` : '不限时'}
</span>
</Space>
</Radio>
))
: null}
</Radio.Group>
</Modal>
</>
)
}
@@ -6,6 +6,7 @@ import type {
UploadedFile,
WorkerAcceptance,
WorkOrder,
WorkOrderShare,
} from '@/types/worker-platform'
import { getImageIdentity } from '@/utils/image-identity'
@@ -33,6 +34,13 @@ export function patchWorkOrderReadState(current: unknown, workOrderId: number) {
}
}
/** 同一打手在该工单的全部有效份额;单份额订单回退为 myShare 一条。 */
export function getOrderShares(order: WorkOrder | null | undefined): WorkOrderShare[] {
if (!order) return []
if (order.myShares?.length) return order.myShares
return order.myShare ? [order.myShare] : []
}
/** 好友赠送验收模式(整单,不参与拼单)。 */
export function isFriendGiftOrder(order: WorkOrder) {
return order.acceptanceMode === 'friend_gift' && !order.myShare
@@ -89,7 +97,12 @@ export function getOrderFlagTags(order: WorkOrder) {
}
return flags
}
if (order.problemMarked) flags.push({ key: 'problem', label: '平台标记', color: 'red' })
if (order.problemMarked)
flags.push(
order.shareProblemMarked
? { key: 'share_problem', label: '份额问题', color: 'red' }
: { key: 'problem', label: '平台标记', color: 'red' },
)
if (order.pendingCancelRequest)
flags.push({ key: 'cancel', label: '退单审核中', color: 'orange' })
if (order.pendingFeedback) flags.push({ key: 'feedback', label: '反馈处理中', color: 'orange' })