yml/order_site
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善接单平台通知配置

Browse Source
This commit is contained in:
yml2213
2026-08-17 13:54:01 +08:00
parent bca2e4a801
commit 5330b55b75
27 changed files with 1390 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/frontend/src/pages/admin/AdminWorkerPlatformPage.tsx
+37 -4
View File
@@ -1,18 +1,31 @@
import { useQuery } from '@tanstack/react-query'
import { Card, Space, Tabs } from 'antd'
import { useState } from 'react'
import { useEffect, useState } from 'react'
import { useSearchParams } from 'react-router'
import PageHeader from '@/components/admin/PageHeader'
import { fetchAdminWorkerPlatformSummary } from '@/services/admin'
import { getAdminRole } from '@/utils/admin-auth'
import CategoriesPanel from './panels/CategoriesPanel'
import FinancePanel from './panels/FinancePanel'
import LevelsPanel from './panels/LevelsPanel'
import NotificationsPanel from './panels/NotificationsPanel'
import ProductRulesPanel from './panels/ProductRulesPanel'
import WorkersPanel from './panels/WorkersPanel'
import WorkOrdersPanel from './panels/WorkOrdersPanel'
export default function AdminWorkerPlatformPage() {
const [activeTab, setActiveTab] = useState(loadActiveTabPreference)
const [searchParams] = useSearchParams()
const [activeTab, setActiveTab] = useState(() => loadActiveTab(searchParams.get('tab')))
const isAdmin = getAdminRole() === 'admin'
const visibleActiveTab = !isAdmin && activeTab === 'notifications' ? 'orders' : activeTab
useEffect(() => {
const tab = searchParams.get('tab')
if (isWorkerPlatformTab(tab)) {
setActiveTab(tab)
}
}, [searchParams])
function changeTab(nextTab: string) {
setActiveTab(nextTab)
@@ -25,7 +38,7 @@ export default function AdminWorkerPlatformPage() {
<SummaryCards />
<Tabs
destroyOnHidden={false}
activeKey={activeTab}
activeKey={visibleActiveTab}
onChange={changeTab}
items={[
{ key: 'orders', label: '接单工单', children: <WorkOrdersPanel /> },
@@ -34,6 +47,9 @@ export default function AdminWorkerPlatformPage() {
{ key: 'workers', label: '打手', children: <WorkersPanel /> },
{ key: 'finance', label: '资金', children: <FinancePanel /> },
{ key: 'levels', label: '等级权限', children: <LevelsPanel /> },
...(isAdmin
? [{ key: 'notifications', label: '通知配置', children: <NotificationsPanel /> }]
: []),
]}
/>
</section>
@@ -49,11 +65,28 @@ function loadActiveTabPreference(): string {
saved === 'categories' ||
saved === 'workers' ||
saved === 'finance' ||
saved === 'levels'
saved === 'levels' ||
saved === 'notifications'
? saved
: 'orders'
}
function loadActiveTab(tab: string | null): string {
return isWorkerPlatformTab(tab) ? tab : loadActiveTabPreference()
}
function isWorkerPlatformTab(tab: string | null): tab is string {
return [
'orders',
'rules',
'categories',
'workers',
'finance',
'levels',
'notifications',
].includes(String(tab || ''))
}
function SummaryCards() {
const summaryQuery = useQuery({
queryKey: ['admin-worker-platform-summary'],
apps/frontend/src/pages/admin/panels/FinancePanel.tsx
+35
View File
@@ -2,6 +2,7 @@ import { ReloadOutlined } from '@ant-design/icons'
import { useQuery, useQueryClient } from '@tanstack/react-query'
import {
App,
Alert,
Button,
Card,
Descriptions,
@@ -18,6 +19,7 @@ import {
} from 'antd'
import type { TableColumnsType } from 'antd'
import { useEffect, useState } from 'react'
import { useSearchParams } from 'react-router'
import ImageUpload from '@/components/files/ImageUpload'
import ImagePreviewList from '@/components/files/ImagePreviewList'
@@ -59,9 +61,11 @@ type FinanceReviewAction = 'approved' | 'rejected' | 'cancelled'
export default function FinancePanel() {
const { message } = App.useApp()
const queryClient = useQueryClient()
const [searchParams, setSearchParams] = useSearchParams()
const [configForm] = Form.useForm<FinanceConfigFormValues>()
const [reviewForm] = Form.useForm<{ reviewedNote?: string }>()
const [requestStatus, setRequestStatus] = useState('')
const [targetRequestId, setTargetRequestId] = useState<number | undefined>()
const [requestType, setRequestType] = useState('')
const [keywordInput, setKeywordInput] = useState('')
const [keyword, setKeyword] = useState('')
@@ -79,11 +83,29 @@ export default function FinancePanel() {
queryKey: ['admin-worker-platform-finance-config'],
queryFn: () => fetchAdminWorkerFinanceConfig(),
})
useEffect(() => {
const requestId = Number(searchParams.get('financeRequestId') || 0)
if (!Number.isInteger(requestId) || requestId <= 0) return
setTargetRequestId(requestId)
setRequestStatus('')
setRequestType('')
setKeyword('')
setKeywordInput('')
setPage(1)
setSearchParams(
(current) => {
current.delete('financeRequestId')
return current
},
{ replace: true },
)
}, [searchParams, setSearchParams])
const financeRequestsQuery = useQuery({
queryKey: [
'admin-worker-platform-finance-requests',
requestStatus,
requestType,
targetRequestId,
keyword,
page,
pageSize,
@@ -92,6 +114,7 @@ export default function FinancePanel() {
fetchAdminWorkerFinanceRequests({
status: requestStatus,
requestType,
requestId: targetRequestId,
keyword,
page,
pageSize,
@@ -274,6 +297,18 @@ export default function FinancePanel() {
return (
<section className="platform-panel-stack">
{targetRequestId ? (
<Alert
type="info"
showIcon
message={`已定位资金申请 #${targetRequestId}`}
action={
<Button size="small" onClick={() => setTargetRequestId(undefined)}>
取消定位
</Button>
}
/>
) : null}
<Card
title="资金配置"
bordered={false}
apps/frontend/src/pages/admin/panels/NotificationsPanel.tsx
+162
View File
@@ -0,0 +1,162 @@
import { useQuery, useQueryClient } from '@tanstack/react-query'
import { App, Alert, Button, Card, Space, Switch, Table, Typography } from 'antd'
import type { TableColumnsType } from 'antd'
import { useEffect, useState } from 'react'
import {
fetchAdminWorkerPlatformNotificationConfig,
saveAdminWorkerPlatformNotificationConfig,
} from '@/services/admin'
import type {
WorkerPlatformNotificationConfig,
WorkerPlatformNotificationEventKey,
} from '@/types/worker-platform'
type NotificationEventRow = {
key: WorkerPlatformNotificationEventKey
name: string
description: string
}
const notificationEventRows: NotificationEventRow[] = [
{ key: 'withdraw_requested', name: '提现申请', description: '打手提交新的提现申请' },
{ key: 'recharge_requested', name: '充值申请', description: '打手提交新的充值申请' },
{ key: 'acceptance_submitted', name: '提交验收', description: '打手提交订单验收资料' },
{ key: 'acceptance_reminded', name: '催验收', description: '打手在验收后催促处理' },
{ key: 'material_required', name: '待补资料工单', description: '新工单等待后台补充资料' },
]
export default function NotificationsPanel() {
const { message } = App.useApp()
const queryClient = useQueryClient()
const [draft, setDraft] = useState<WorkerPlatformNotificationConfig | null>(null)
const [saving, setSaving] = useState(false)
const configQuery = useQuery({
queryKey: ['admin-worker-platform-notification-config'],
queryFn: fetchAdminWorkerPlatformNotificationConfig,
})
useEffect(() => {
const config = configQuery.data?.data
if (config) {
setDraft(config)
}
}, [configQuery.data])
function updateEvent(
eventKey: WorkerPlatformNotificationEventKey,
field: 'todoEnabled' | 'soundEnabled' | 'externalPushEnabled',
value: boolean,
) {
setDraft((current) => {
if (!current) return current
const event = current.events[eventKey]
const nextEvent = { ...event, [field]: value }
if (field === 'todoEnabled' && !value) {
nextEvent.soundEnabled = false
}
return {
...current,
events: { ...current.events, [eventKey]: nextEvent },
}
})
}
async function saveConfig() {
if (!draft) return
setSaving(true)
try {
await saveAdminWorkerPlatformNotificationConfig(draft)
await queryClient.invalidateQueries({
queryKey: ['admin-worker-platform-notification-config'],
})
message.success('通知配置已保存')
} catch (error) {
message.error(error instanceof Error ? error.message : '保存通知配置失败')
} finally {
setSaving(false)
}
}
const columns: TableColumnsType<NotificationEventRow> = [
{
title: '通知事件',
dataIndex: 'name',
minWidth: 220,
render: (_, row) => (
<div className="cell-stack">
<Typography.Text strong>{row.name}</Typography.Text>
<Typography.Text type="secondary">{row.description}</Typography.Text>
</div>
),
},
{
title: '后台待办',
width: 130,
align: 'center',
render: (_, row) => (
<Switch
checked={draft?.events[row.key].todoEnabled || false}
disabled={!draft || saving}
onChange={(checked) => updateEvent(row.key, 'todoEnabled', checked)}
/>
),
},
{
title: '声音播报',
width: 130,
align: 'center',
render: (_, row) => (
<Switch
checked={draft?.events[row.key].soundEnabled || false}
disabled={!draft?.events[row.key].todoEnabled || saving}
onChange={(checked) => updateEvent(row.key, 'soundEnabled', checked)}
/>
),
},
{
title: 'Bark/WPush',
width: 140,
align: 'center',
render: (_, row) => (
<Switch
checked={draft?.events[row.key].externalPushEnabled || false}
disabled={!draft || saving}
onChange={(checked) => updateEvent(row.key, 'externalPushEnabled', checked)}
/>
),
},
]
return (
<Card size="small" bordered={false}>
<Space direction="vertical" size={16} style={{ width: '100%' }}>
<Alert
type="info"
showIcon
message="配置仅影响保存后产生的通知"
description="关闭后台待办后，声音播报会同步关闭；已创建的待办不会被隐藏或删除。"
/>
<Table
rowKey="key"
columns={columns}
dataSource={notificationEventRows}
pagination={false}
loading={configQuery.isLoading}
scroll={{ x: 660 }}
/>
<Space>
<Button
type="primary"
loading={saving}
disabled={!draft}
onClick={() => void saveConfig()}
>
保存配置
</Button>
<Typography.Text type="secondary">浏览器总声音开关仍可在后台右上角控制。</Typography.Text>
</Space>
</Space>
</Card>
)
}
apps/frontend/src/pages/admin/panels/WorkOrdersPanel.tsx
+37 -2
View File
@@ -37,7 +37,7 @@ import {
} from 'antd'
import type { TableColumnsType } from 'antd'
import { useEffect, useRef, useState } from 'react'
import { useNavigate } from 'react-router'
import { useNavigate, useSearchParams } from 'react-router'
import JsonPreview from '@/components/admin/JsonPreview'
import WorkOrderEventTimeline from '@/components/WorkOrderEventTimeline'
@@ -116,9 +116,11 @@ type CancelOrderFormValues = {
export default function WorkOrdersPanel() {
const { message, modal } = App.useApp()
const navigate = useNavigate()
const [searchParams, setSearchParams] = useSearchParams()
const queryClient = useQueryClient()
const canEditRequirementFields = hasAdminRole('operator')
const [statuses, setStatuses] = useState<string[]>([])
const [targetWorkOrderId, setTargetWorkOrderId] = useState<number | undefined>()
const [keyword, setKeyword] = useState('')
const [keywordInput, setKeywordInput] = useState('')
const [workerId, setWorkerId] = useState<number | undefined>()
@@ -165,12 +167,31 @@ export default function WorkOrdersPanel() {
)
const vipEvidencePending = statuses.includes(VIP_EVIDENCE_PENDING_STATUS)
useEffect(() => {
const workOrderId = Number(searchParams.get('workOrderId') || 0)
if (!Number.isInteger(workOrderId) || workOrderId <= 0) return
setTargetWorkOrderId(workOrderId)
setStatuses([])
setKeyword('')
setKeywordInput('')
setWorkerId(undefined)
setPage(1)
setSearchParams(
(current) => {
current.delete('workOrderId')
return current
},
{ replace: true },
)
}, [searchParams, setSearchParams])
const ordersQuery = useQuery({
queryKey: [
'admin-worker-platform-orders',
statuses.join(','),
keyword,
workerId,
targetWorkOrderId,
page,
pageSize,
],
@@ -179,6 +200,7 @@ export default function WorkOrdersPanel() {
status:
selectedWorkOrderStatuses.length > 0 ? selectedWorkOrderStatuses.join(',') : undefined,
vipEvidencePending: vipEvidencePending || undefined,
workOrderId: targetWorkOrderId,
keyword,
workerId,
page,
@@ -207,7 +229,7 @@ export default function WorkOrdersPanel() {
useEffect(() => {
setSelectedAcceptanceOrderIds([])
}, [statuses, keyword, workerId, page, pageSize])
}, [statuses, keyword, workerId, targetWorkOrderId, page, pageSize])
function openAssignModal(row: WorkOrder) {
setAssignOrder(row)
@@ -482,6 +504,7 @@ export default function WorkOrdersPanel() {
}
function clearOrderFilters() {
setTargetWorkOrderId(undefined)
setKeywordInput('')
setKeyword('')
setStatuses([])
@@ -865,6 +888,18 @@ export default function WorkOrdersPanel() {
return (
<section className="platform-panel-stack">
{targetWorkOrderId ? (
<Alert
type="info"
showIcon
message={`已定位工单 #${targetWorkOrderId}`}
action={
<Button size="small" onClick={() => setTargetWorkOrderId(undefined)}>
取消定位
</Button>
}
/>
) : null}
<Card title="订单搜索与筛选" bordered={false}>
<div className="worker-orders-toolbar">
<Space wrap className="filter-form worker-orders-search-controls">
apps/frontend/src/pages/worker/WorkerOrdersPage.tsx
+23
View File
@@ -37,6 +37,7 @@ import {
fetchWorkerMyOrderOverview,
fetchWorkerMyOrders,
fetchWorkerProfile,
remindWorkerAcceptance,
saveWorkerAcceptanceDraft,
saveWorkerOrderNote,
supplementWorkerAcceptedOrderEvidence,
@@ -300,6 +301,16 @@ export default function WorkerOrdersPage() {
}
}
async function submitAcceptanceReminder(order: WorkOrder) {
try {
await remindWorkerAcceptance(order.workOrderId)
message.success('已催促管理员验收')
await refreshAll()
} catch (error) {
message.error(error instanceof Error ? error.message : '催验收失败')
}
}
async function submitAcceptance(values: AcceptanceFormValues) {
if (!editingOrder) return
const isAcceptedEvidenceSupplement = canSupplementAcceptedEvidence(editingOrder)
@@ -597,6 +608,9 @@ export default function WorkerOrdersPage() {
{hasSubmittedAcceptance(row) ? '补充图片' : '验收'}
</Button>
) : null}
{canRemindAcceptance(row) ? (
<Button onClick={() => submitAcceptanceReminder(row)}>催验收</Button>
) : null}
</Space>
</div>
),
@@ -893,6 +907,11 @@ export default function WorkerOrdersPage() {
{hasSubmittedAcceptance(order) ? '补充图片' : '提交验收'}
</Button>
) : null}
{canRemindAcceptance(order) ? (
<Button size="small" onClick={() => submitAcceptanceReminder(order)}>
催验收
</Button>
) : null}
</div>
</div>
</article>
@@ -1292,6 +1311,10 @@ function canSubmitAcceptance(order: WorkOrder) {
return ['in_progress', 'problem'].includes(order.status)
}
function canRemindAcceptance(order: WorkOrder) {
return !order.myShare && order.status === 'pending_acceptance'
}
function canAutoAcceptOrder(order: WorkOrder, workerCanAutoAcceptWithoutEvidence: boolean) {
return (
workerCanAutoAcceptWithoutEvidence &&