时间显示到秒 & 表格之间的跳转页面
This commit is contained in:
@@ -1,7 +1,9 @@
|
||||
"use client"
|
||||
import { zodResolver } from "@hookform/resolvers/zod"
|
||||
import { format } from "date-fns"
|
||||
import { Suspense, useState } from "react"
|
||||
import Link from "next/link"
|
||||
import { useRouter, useSearchParams } from "next/navigation"
|
||||
import { Suspense } from "react"
|
||||
import { Controller, useForm } from "react-hook-form"
|
||||
import { z } from "zod"
|
||||
import { getPageBatch } from "@/actions/batch"
|
||||
@@ -64,14 +66,17 @@ const filterSchema = z
|
||||
type FilterSchema = z.infer<typeof filterSchema>
|
||||
|
||||
export default function BatchPage() {
|
||||
const [filters, setFilters] = useState<APIFilterParams>({})
|
||||
|
||||
const { control, handleSubmit, reset } = useForm<FilterSchema>({
|
||||
const searchParams = useSearchParams()
|
||||
const resourceNo = searchParams.get("resource_no")
|
||||
const batchNo = searchParams.get("batch_no")
|
||||
const router = useRouter()
|
||||
const { control, handleSubmit, reset, getValues } = useForm<FilterSchema>({
|
||||
resolver: zodResolver(filterSchema),
|
||||
defaultValues: {
|
||||
user_phone: "",
|
||||
batch_no: "",
|
||||
batch_no: batchNo || "",
|
||||
prov: "",
|
||||
resource_no: resourceNo || "",
|
||||
city: "",
|
||||
isp: "all",
|
||||
created_at_start: "",
|
||||
@@ -79,24 +84,25 @@ export default function BatchPage() {
|
||||
},
|
||||
})
|
||||
|
||||
const table = useDataTable<Batch>((page, size) =>
|
||||
getPageBatch({ page, size, ...filters }),
|
||||
)
|
||||
|
||||
const onFilter = handleSubmit(data => {
|
||||
const table = useDataTable<Batch>((page, size) => {
|
||||
const result: APIFilterParams = {}
|
||||
if (data.user_phone?.trim()) result.user_phone = data.user_phone.trim()
|
||||
if (data.batch_no?.trim()) result.batch_no = data.batch_no.trim()
|
||||
if (data.resource_no?.trim()) result.resource_no = data.resource_no.trim()
|
||||
if (data.prov?.trim()) result.prov = data.prov.trim()
|
||||
if (data.city?.trim()) result.city = data.city.trim()
|
||||
if (data.isp && data.isp !== "all") result.isp = data.isp
|
||||
if (data.created_at_start)
|
||||
result.created_at_start = new Date(data.created_at_start)
|
||||
if (data.created_at_end)
|
||||
result.created_at_end = new Date(data.created_at_end)
|
||||
const filters = getValues()
|
||||
if (filters.user_phone?.trim())
|
||||
result.user_phone = filters.user_phone.trim()
|
||||
if (filters.batch_no?.trim()) result.batch_no = filters.batch_no.trim()
|
||||
if (filters.resource_no?.trim())
|
||||
result.resource_no = filters.resource_no.trim()
|
||||
if (filters.prov?.trim()) result.prov = filters.prov.trim()
|
||||
if (filters.city?.trim()) result.city = filters.city.trim()
|
||||
if (filters.isp && filters.isp !== "all") result.isp = filters.isp
|
||||
if (filters.created_at_start)
|
||||
result.created_at_start = new Date(filters.created_at_start)
|
||||
if (filters.created_at_end)
|
||||
result.created_at_end = new Date(filters.created_at_end)
|
||||
return getPageBatch({ page, size, ...result })
|
||||
})
|
||||
|
||||
setFilters(result)
|
||||
const onFilter = handleSubmit(() => {
|
||||
table.pagination.onPageChange(1)
|
||||
})
|
||||
|
||||
@@ -237,8 +243,17 @@ export default function BatchPage() {
|
||||
type="button"
|
||||
variant="outline"
|
||||
onClick={() => {
|
||||
reset()
|
||||
setFilters({})
|
||||
reset({
|
||||
user_phone: "",
|
||||
batch_no: "",
|
||||
prov: "",
|
||||
resource_no: "",
|
||||
city: "",
|
||||
isp: "all",
|
||||
created_at_start: "",
|
||||
created_at_end: "",
|
||||
})
|
||||
router.replace("./batch")
|
||||
table.pagination.onPageChange(1)
|
||||
}}
|
||||
>
|
||||
@@ -255,7 +270,23 @@ export default function BatchPage() {
|
||||
header: "会员号",
|
||||
accessorFn: row => row.user?.phone || "",
|
||||
},
|
||||
{ header: "套餐号", accessorKey: "resource.resource_no" },
|
||||
{
|
||||
header: "套餐号",
|
||||
accessorKey: "resource.resource_no",
|
||||
cell: ({ row }) => {
|
||||
const resourceNo = row.original.resource?.resource_no
|
||||
return (
|
||||
<Link
|
||||
href={`/channel?resource_no=${resourceNo}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-blue-600 hover:underline cursor-pointer"
|
||||
>
|
||||
{resourceNo}
|
||||
</Link>
|
||||
)
|
||||
},
|
||||
},
|
||||
{ header: "提取编号", accessorKey: "batch_no" },
|
||||
{ header: "省份", accessorKey: "prov" },
|
||||
{ header: "城市", accessorKey: "city" },
|
||||
@@ -266,7 +297,7 @@ export default function BatchPage() {
|
||||
header: "提取时间",
|
||||
accessorKey: "time",
|
||||
cell: ({ row }) =>
|
||||
format(new Date(row.original.time), "yyyy-MM-dd HH:mm"),
|
||||
format(new Date(row.original.time), "yyyy-MM-dd HH:mm:ss"),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user