城市合伙人县区不做限制

apps/admin-web/src/pages/CityPartnersPage.tsx

@@ -31,7 +31,7 @@ import {
   type PartnerPermissionKey,
 } from '@dukang/shared-types';
 import { request, type Paginated } from '../lib/api';
-import { districtCodeLabel } from '../lib/china-region';
+import { districtCodeLabel, formatDistrictLabels } from '../lib/china-region';
 import { ADMIN_OPTIONS_PAGE_SIZE, fmtTime } from '../lib/constants';
 import { useAdminList } from '../lib/useAdminList';
 import CityDistrictMultiSelect from '../components/CityDistrictMultiSelect';
@@ -48,6 +48,7 @@ type Row = {
   cityId?: string | null;
   cityName?: string | null;
   scopeType?: string;
+  districtCodes?: string[] | null;
   orderCommissionRate?: number;
   redeemCommissionRate?: number;
   bindingStatus?: string;
@@ -259,7 +260,15 @@ export default function CityPartnersPage() {
   }
 
   const columns: ColumnsType<Row> = [
-    { title: '公司名', dataIndex: 'companyName', ellipsis: true },
+    { title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 },
+    {
+      title: '区县',
+      dataIndex: 'districtCodes',
+      width: 160,
+      ellipsis: true,
+      render: (codes: string[] | null | undefined, row) =>
+        row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
+    },
     { title: '城市', dataIndex: 'cityName', width: 90 },
     { title: '主账号姓名', dataIndex: 'name', width: 100, ellipsis: true },
     { title: '登录手机', dataIndex: 'phone', width: 120 },
@@ -476,7 +485,7 @@ export default function CityPartnersPage() {
                         <Form.Item
                           name="districtCodes"
                           label="区县"
-                          extra="仅可选当前开城城市下的区县；不可与其他区域合伙人重合"
+                          extra="仅作标识，可多选当前城市下的区县（不做互斥）"
                         >
                           <CityDistrictMultiSelect cityCode={editCityCode} />
                         </Form.Item>
@@ -591,7 +600,7 @@ export default function CityPartnersPage() {
               name="districtCodes"
               label="区县"
               rules={[{ required: true, message: '请选择至少一个区县' }]}
-              extra="仅可选当前开城城市下的区县；不可与其他区域合伙人重合"
+              extra="仅作标识，可多选当前城市下的区县（不做互斥）"
             >
               <CityDistrictMultiSelect cityCode={createCityCode} />
             </Form.Item>