修整IP管理页面的表格

src/app/(root)/channel/page.tsx

@@ -118,6 +118,7 @@ export default function ChannelPage() {
   const onFilter = handleSubmit(() => {
     table.pagination.onPageChange(1)
   })
+  console.log(table, "table")
 
   return (
     <Page>
@@ -291,12 +292,16 @@ export default function ChannelPage() {
               accessorFn: row => row.user?.phone || "-",
             },
             {
-              header: "套餐号",
+              header: "套餐号/提取编号",
               accessorKey: "resource.resource_no",
               cell: ({ row }) => {
                 const resource_no = row.original.resource?.resource_no
+                const batchNo = row.original.batch_no
                 const type = row.original.resource?.type
                 return (
+                  <div className="flex flex-col font-mono text-xs">
+                    <span>
+                      套餐号&ensp;&ensp;：
                       <Link
                         href={`./resources?resource_no=${resource_no}&type=${type}`}
                         target="_blank"
@@ -305,15 +310,9 @@ export default function ChannelPage() {
                       >
                         {resource_no}
                       </Link>
-                )
+                    </span>
-              },
+                    <span>
-            },
+                      提取编号：
-            {
-              header: "提取编号",
-              accessorKey: "batch_no",
-              cell: ({ row }) => {
-                const batchNo = row.original.batch_no
-                return (
                       <Link
                         href={`./batch?batch_no=${batchNo}`}
                         target="_blank"
@@ -322,25 +321,34 @@ export default function ChannelPage() {
                       >
                         {batchNo}
                       </Link>
+                    </span>
+                  </div>
+                )
+              },
+            },
+            {
+              header: "网关",
+              accessorKey: "host",
+              cell: ({ row }) => {
+                return (
+                  <span>
+                    {row.original.host}:{row.original.port}
+                  </span>
                 )
               },
             },
             {
               header: "节点",
-              accessorFn: row => row.ip || row.edge_ref || row.edge_id,
+              accessorFn: row => row.edge_ref || row.ip || row.edge_id,
             },
             {
-              header: "自动配置",
+              header: "地区",
               cell: ({ row }) => {
                 const prov = row.original.filter_prov
                 const city = row.original.filter_city
-                const isp = row.original.filter_isp
                 const parts = []
                 if (prov && prov !== "all") parts.push(prov)
                 if (city && city !== "all") parts.push(city)
-                if (isp && isp !== "all") {
-                  parts.push(ispMap[Number(isp)] || isp)
-                }
                 return (
                   <div className="text-sm">
                     {parts.length > 0 ? parts.join(" / ") : "不限"}
@@ -349,14 +357,11 @@ export default function ChannelPage() {
               },
             },
             {
-              header: "网关地址",
+              header: "运营商",
-              accessorKey: "host",
+              // accessorFn: row => row.filter_isp || "",
               cell: ({ row }) => {
-                return (
+                const isp = row.original.filter_isp
-                  <span>
+                return ispMap[Number(isp)] || isp
-                    {row.original.host}:{row.original.port}
-                  </span>
-                )
               },
             },
             {