开城合伙人页与城市详情内合伙人 Tab 已同步

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">