时间显示到秒 & 表格之间的跳转页面
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
import { zodResolver } from "@hookform/resolvers/zod"
|
||||
import { format } from "date-fns"
|
||||
import { CheckCircle, Clock, XCircle } from "lucide-react"
|
||||
import Link from "next/link"
|
||||
import { Suspense, useCallback, useState } from "react"
|
||||
import { Controller, useForm } from "react-hook-form"
|
||||
import { z } from "zod"
|
||||
@@ -9,12 +10,7 @@ import { getPageTrade } from "@/actions/trade"
|
||||
import { DataTable, useDataTable } from "@/components/data-table"
|
||||
import { Page } from "@/components/page"
|
||||
import { Button } from "@/components/ui/button"
|
||||
import {
|
||||
Field,
|
||||
FieldError,
|
||||
FieldGroup,
|
||||
FieldLabel,
|
||||
} from "@/components/ui/field"
|
||||
import { Field, FieldError, FieldLabel } from "@/components/ui/field"
|
||||
import { Input } from "@/components/ui/input"
|
||||
import {
|
||||
Select,
|
||||
@@ -69,7 +65,6 @@ type FilterSchema = z.infer<typeof filterSchema>
|
||||
|
||||
export default function TradePage() {
|
||||
const [filters, setFilters] = useState<FilterValues>({})
|
||||
|
||||
const { control, handleSubmit, reset } = useForm<FilterSchema>({
|
||||
resolver: zodResolver(filterSchema),
|
||||
defaultValues: {
|
||||
@@ -120,10 +115,7 @@ export default function TradePage() {
|
||||
name="user_phone"
|
||||
control={control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field
|
||||
data-invalid={fieldState.invalid}
|
||||
className="w-40 flex"
|
||||
>
|
||||
<Field data-invalid={fieldState.invalid} className="w-40 flex">
|
||||
<FieldLabel>会员号</FieldLabel>
|
||||
<Input {...field} placeholder="请输入会员号" />
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
@@ -135,10 +127,7 @@ export default function TradePage() {
|
||||
name="inner_no"
|
||||
control={control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field
|
||||
data-invalid={fieldState.invalid}
|
||||
className="w-40 flex"
|
||||
>
|
||||
<Field data-invalid={fieldState.invalid} className="w-40 flex">
|
||||
<FieldLabel>订单号</FieldLabel>
|
||||
<Input {...field} placeholder="请输入订单号" />
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
@@ -217,10 +206,7 @@ export default function TradePage() {
|
||||
name="created_at_start"
|
||||
control={control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field
|
||||
data-invalid={fieldState.invalid}
|
||||
className="w-40 flex"
|
||||
>
|
||||
<Field data-invalid={fieldState.invalid} className="w-40 flex">
|
||||
<FieldLabel>开始时间</FieldLabel>
|
||||
<Input type="date" {...field} />
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
@@ -232,17 +218,14 @@ export default function TradePage() {
|
||||
name="created_at_end"
|
||||
control={control}
|
||||
render={({ field, fieldState }) => (
|
||||
<Field
|
||||
data-invalid={fieldState.invalid}
|
||||
className="w-40 flex"
|
||||
>
|
||||
<Field data-invalid={fieldState.invalid} className="w-40 flex">
|
||||
<FieldLabel>结束时间</FieldLabel>
|
||||
<Input type="date" {...field} />
|
||||
<FieldError>{fieldState.error?.message}</FieldError>
|
||||
</Field>
|
||||
)}
|
||||
/>
|
||||
|
||||
|
||||
<Button type="submit">搜索</Button>
|
||||
<Button
|
||||
type="button"
|
||||
@@ -266,10 +249,29 @@ export default function TradePage() {
|
||||
header: "创建时间",
|
||||
accessorKey: "created_at",
|
||||
cell: ({ row }) =>
|
||||
format(new Date(row.original.created_at), "yyyy-MM-dd HH:mm"),
|
||||
format(
|
||||
new Date(row.original.created_at),
|
||||
"yyyy-MM-dd HH:mm:ss",
|
||||
),
|
||||
},
|
||||
{ header: "会员号", accessorFn: row => row.user?.phone || "" },
|
||||
{ header: "订单号", accessorKey: "inner_no" },
|
||||
{
|
||||
header: "订单号",
|
||||
accessorKey: "inner_no",
|
||||
cell: ({ row }) => {
|
||||
const innerNo = row.original.inner_no
|
||||
return (
|
||||
<Link
|
||||
href={`/billing?inner_no=${innerNo}`}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="text-blue-600 hover:underline cursor-pointer"
|
||||
>
|
||||
{innerNo}
|
||||
</Link>
|
||||
)
|
||||
},
|
||||
},
|
||||
{ header: "购买套餐", accessorKey: "subject" },
|
||||
{
|
||||
header: "支付金额",
|
||||
|
||||
Reference in New Issue
Block a user