jacy/dukang
1
0
Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jacy
2026-07-22 23:43:16 +08:00
parent e0d3c840a2
commit aeb72154a7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/admin-web/src/components/CityPartnersPanel.tsx
+1 -1
View File
@@ -211,7 +211,6 @@ export default function CityPartnersPanel({
} }
const columns: ColumnsType<PartnerRow> = [ const columns: ColumnsType<PartnerRow> = [
{ title: '公司名', dataIndex: 'companyName', ellipsis: true },
{ {
title: '区县', title: '区县',
dataIndex: 'districtCodes', dataIndex: 'districtCodes',
@@ -220,6 +219,7 @@ export default function CityPartnersPanel({
render: (codes: string[] | null | undefined, row) => render: (codes: string[] | null | undefined, row) =>
row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes), row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
}, },
{ title: '公司名', dataIndex: 'companyName', ellipsis: true },
{ title: '主账号', dataIndex: 'phone', width: 120 }, { title: '主账号', dataIndex: 'phone', width: 120 },
{ {
title: '管辖', title: '管辖',
apps/admin-web/src/pages/CityPartnersPage.tsx
+8 -8
View File
@@ -260,7 +260,7 @@ export default function CityPartnersPage() {
} }
const columns: ColumnsType<Row> = [ const columns: ColumnsType<Row> = [
{ title: '公司名', dataIndex: 'companyName', ellipsis: true, width: 140 }, { title: '城市', dataIndex: 'cityName', width: 90 },
{ {
title: '区县', title: '区县',
dataIndex: 'districtCodes', dataIndex: 'districtCodes',
@@ -269,7 +269,7 @@ export default function CityPartnersPage() {
render: (codes: string[] | null | undefined, row) => render: (codes: string[] | null | undefined, row) =>
row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes), 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: 'name', width: 100, ellipsis: true },
{ title: '登录手机', dataIndex: 'phone', width: 120 }, { title: '登录手机', dataIndex: 'phone', width: 120 },
{ {
@@ -362,12 +362,6 @@ export default function CityPartnersPage() {
setPage(1); 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="城市"> <Form.Item name="cityId" label="城市">
<Select <Select
allowClear allowClear
@@ -378,6 +372,12 @@ export default function CityPartnersPage() {
options={cities.map((c) => ({ value: c.id, label: c.name }))} options={cities.map((c) => ({ value: c.id, label: c.name }))}
/> />
</Form.Item> </Form.Item>
<Form.Item name="companyName" label="公司">
<Input allowClear placeholder="公司名" />
</Form.Item>
<Form.Item name="phone" label="手机">
<Input allowClear placeholder="登录手机" />
</Form.Item>
<Form.Item> <Form.Item>
<Space> <Space>
<Button type="primary" htmlType="submit"> <Button type="primary" htmlType="submit">
apps/admin-web/src/pages/PartnersPage.tsx
+2 -2
View File
@@ -174,7 +174,7 @@ export default function PartnersPage() {
} }
const columns: ColumnsType<Row> = [ const columns: ColumnsType<Row> = [
{ title: '公司名', dataIndex: 'companyName', ellipsis: true }, { title: '城市', dataIndex: 'cityName', width: 100 },
{ {
title: '区县', title: '区县',
dataIndex: 'districtCodes', dataIndex: 'districtCodes',
@@ -183,7 +183,7 @@ export default function PartnersPage() {
render: (codes: string[] | null | undefined, row) => render: (codes: string[] | null | undefined, row) =>
row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes), row.scopeType === CityPartnerScopeType.CITY_WIDE ? '全城' : formatDistrictLabels(codes),
}, },
{ title: '城市', dataIndex: 'cityName', width: 100 }, { title: '公司名', dataIndex: 'companyName', ellipsis: true },
{ title: '主账号', dataIndex: 'phone', width: 130 }, { title: '主账号', dataIndex: 'phone', width: 130 },
{ {
title: '管辖', title: '管辖',