From aeb72154a733afc95b5427f5dfa3cce9bb91da73 Mon Sep 17 00:00:00 2001
From: jacy <18049821889@163.com>
Date: Wed, 22 Jul 2026 23:43:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=9F=8E=E5=90=88=E4=BC=99=E4=BA=BA?=
 =?UTF-8?q?=E9=A1=B5=E4=B8=8E=E5=9F=8E=E5=B8=82=E8=AF=A6=E6=83=85=E5=86=85?=
 =?UTF-8?q?=E5=90=88=E4=BC=99=E4=BA=BA=20Tab=20=E5=B7=B2=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CityPartnersPanel.tsx         |  2 +-
 apps/admin-web/src/pages/CityPartnersPage.tsx    | 16 ++++++++--------
 apps/admin-web/src/pages/PartnersPage.tsx        |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/admin-web/src/components/CityPartnersPanel.tsx b/apps/admin-web/src/components/CityPartnersPanel.tsx
index 1e8186e..ceefe94 100644
--- a/apps/admin-web/src/components/CityPartnersPanel.tsx
+++ b/apps/admin-web/src/components/CityPartnersPanel.tsx
@@ -211,7 +211,6 @@ export default function CityPartnersPanel({
   }
 
   const columns: ColumnsType<PartnerRow> = [
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
     {
       title: '区县',
       dataIndex: 'districtCodes',
@@ -220,6 +219,7 @@ export default function CityPartnersPanel({
       render: (codes: string[] | null | undefined, row) =>
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
     { title: '主账号', dataIndex: 'phone', width: 120 },
     {
       title: '管辖',
diff --git a/apps/admin-web/src/pages/CityPartnersPage.tsx b/apps/admin-web/src/pages/CityPartnersPage.tsx
index a586087..9316594 100644
--- a/apps/admin-web/src/pages/CityPartnersPage.tsx
+++ b/apps/admin-web/src/pages/CityPartnersPage.tsx
@@ -260,7 +260,7 @@ export default function CityPartnersPage() {
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
+    { title: '城市', dataIndex: 'cityName', width: 90 },
     {
       title: '区县',
       dataIndex: 'districtCodes',
@@ -269,7 +269,7 @@ export default function CityPartnersPage() {
       render: (codes: string[] | null | undefined, row) =>
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
-    { title: '城市', dataIndex: 'cityName', width: 90 },
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
     { title: '主账号姓名', dataIndex: 'name', width: 100, ellipsis: true },
     { title: '登录手机', dataIndex: 'phone', width: 120 },
     {
@@ -362,12 +362,6 @@ export default function CityPartnersPage() {
           setPage(1);
         }}
       >
-        <Form.Item name="companyName" label="公司">
-          <Input allowClear placeholder="公司名" />
-        </Form.Item>
-        <Form.Item name="phone" label="手机">
-          <Input allowClear placeholder="登录手机" />
-        </Form.Item>
         <Form.Item name="cityId" label="城市">
           <Select
             allowClear
@@ -378,6 +372,12 @@ export default function CityPartnersPage() {
             options={cities.map((c) => ({ value: c.id, label: c.name }))}
           />
         </Form.Item>
+        <Form.Item name="companyName" label="公司">
+          <Input allowClear placeholder="公司名" />
+        </Form.Item>
+        <Form.Item name="phone" label="手机">
+          <Input allowClear placeholder="登录手机" />
+        </Form.Item>
         <Form.Item>
           <Space>
             <Button type="primary" htmlType="submit">
diff --git a/apps/admin-web/src/pages/PartnersPage.tsx b/apps/admin-web/src/pages/PartnersPage.tsx
index e28345f..04aeea7 100644
--- a/apps/admin-web/src/pages/PartnersPage.tsx
+++ b/apps/admin-web/src/pages/PartnersPage.tsx
@@ -174,7 +174,7 @@ export default function PartnersPage() {
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
+    { title: '城市', dataIndex: 'cityName', width: 100 },
     {
       title: '区县',
       dataIndex: 'districtCodes',
@@ -183,7 +183,7 @@ export default function PartnersPage() {
       render: (codes: string[] | null | undefined, row) =>
         row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
     },
-    { title: '城市', dataIndex: 'cityName', width: 100 },
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
     { title: '主账号', dataIndex: 'phone', width: 130 },
     {
       title: '管辖',