From b8407eeba748b3a09e430dc092257e9d90d33931 Mon Sep 17 00:00:00 2001 From: uiuJun <> Date: Thu, 9 Oct 2025 23:24:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=83=A8=E5=88=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .umirc.ts | 4 ++-- src/pages/archive/components/SummaryInfo.tsx | 10 +++++----- src/pages/archive/index.tsx | 1 - src/pages/asset/grids/index.tsx | 11 ++--------- src/pages/asset/list/index.tsx | 2 +- src/pages/bills/list/index.tsx | 2 +- src/pages/common/positions/index.tsx | 2 +- src/pages/company/brand/index.tsx | 4 ++++ src/pages/company/employees/index.tsx | 4 ++-- src/pages/complaint/index.tsx | 1 - src/pages/customer/components/CustomerHouse.tsx | 7 ++++--- src/pages/moments/classification/index.tsx | 2 +- src/pages/moments/list/index.tsx | 2 +- src/pages/order/list/index.tsx | 4 ++-- 14 files changed, 26 insertions(+), 30 deletions(-) diff --git a/.umirc.ts b/.umirc.ts index 6fdf83b..318fa17 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -16,8 +16,8 @@ export default defineConfig({ '/api/': { // target: 'http://yt:8003', // target: 'http://10.39.13.78:8001/', - target: 'https://test-admin.linyikj.com.cn/', - // target: 'https://admin.linyikj.com.cn/', + // target: 'https://test-admin.linyikj.com.cn/', + target: 'https://admin.linyikj.com.cn/', // target: 'http://c789629c.natappfree.cc', changeOrigin: true, diff --git a/src/pages/archive/components/SummaryInfo.tsx b/src/pages/archive/components/SummaryInfo.tsx index e7b1dd4..24b5028 100644 --- a/src/pages/archive/components/SummaryInfo.tsx +++ b/src/pages/archive/components/SummaryInfo.tsx @@ -22,9 +22,9 @@ export default function Info(props: MyBetaModalFormProps) { }, [props?.item?.id]); return ( - - - + + + {/* {getShow?.payable_amount_sum || '-'} @@ -32,8 +32,8 @@ export default function Info(props: MyBetaModalFormProps) { {getShow?.discount_amount_sum || '-'} - - + */} + {getShow?.total_payable_sum || ''} {getShow?.payable_amount_sum ? ( diff --git a/src/pages/archive/index.tsx b/src/pages/archive/index.tsx index 2d06536..7079765 100644 --- a/src/pages/archive/index.tsx +++ b/src/pages/archive/index.tsx @@ -126,7 +126,6 @@ export default function Index({ title = '房客关系' }) { }, search: false, }, - MyColumns.Option({ render: (_, item: any, index, action) => ( diff --git a/src/pages/asset/grids/index.tsx b/src/pages/asset/grids/index.tsx index c1adcb7..f2a69cd 100644 --- a/src/pages/asset/grids/index.tsx +++ b/src/pages/asset/grids/index.tsx @@ -39,6 +39,7 @@ export default function Index({ title = '楼栋范围' }) { , ]} columns={[ + MyColumns.ID(), { title: '关联项目', dataIndex: ['asset_project', 'name'], @@ -48,23 +49,15 @@ export default function Index({ title = '楼栋范围' }) { }, }, }, - { - title: 'ID', - dataIndex: 'id', - }, { title: '板块名称', dataIndex: 'name', }, - { - title: '标识', - dataIndex: 'grid_mark', - }, { title: '楼栋管家', dataIndex: ['company_employee', 'name'], render: (_, item: any) => - `${item?.company_employee?.name || ''}-${ + `${item?.company_employee?.name || ''}：${ item?.company_employee?.phone || '' }`, }, diff --git a/src/pages/asset/list/index.tsx b/src/pages/asset/list/index.tsx index 189762b..4653d17 100644 --- a/src/pages/asset/list/index.tsx +++ b/src/pages/asset/list/index.tsx @@ -131,7 +131,7 @@ export default function Index({ title = '项目列表' }) { /> - Apis.Common.Admins.Delete({ id: item.id }).then(() => + Apis.Asset.AssetProjects.Delete({ id: item.id }).then(() => action?.reload(), ) } diff --git a/src/pages/bills/list/index.tsx b/src/pages/bills/list/index.tsx index 7ee7b6c..c417148 100644 --- a/src/pages/bills/list/index.tsx +++ b/src/pages/bills/list/index.tsx @@ -113,7 +113,7 @@ export default function Index({ title = '账单明细' }) { - Apis.Common.Admins.Delete({ id: item.id }).then(() => + Apis.Bill.HouseBills.Delete({ id: item.id }).then(() => action?.reload(), ) } diff --git a/src/pages/common/positions/index.tsx b/src/pages/common/positions/index.tsx index d600319..5ea94a6 100644 --- a/src/pages/common/positions/index.tsx +++ b/src/pages/common/positions/index.tsx @@ -12,7 +12,7 @@ import { Space } from 'antd'; import Create from './modals/Create'; import Update from './modals/Update'; -export default function Index({ title = '岗位管理' }) { +export default function Index({ title = '岗位库' }) { const navigate = useNavigate(); // 注册当前页面为标签页 diff --git a/src/pages/company/brand/index.tsx b/src/pages/company/brand/index.tsx index 2379d1f..2352d79 100644 --- a/src/pages/company/brand/index.tsx +++ b/src/pages/company/brand/index.tsx @@ -45,10 +45,12 @@ export default function Index({ title = '品牌管理' }) { { title: '机构', dataIndex: ['company', 'name'], + width: 300, }, { title: '品牌名称', dataIndex: 'name', + width: 200, }, { title: 'logo', @@ -66,7 +68,9 @@ export default function Index({ title = '品牌管理' }) { ); }, + width: 100, }, + MyColumns.UpdatedAt(), MyColumns.Option({ render: (_, item: any, index, action) => ( diff --git a/src/pages/company/employees/index.tsx b/src/pages/company/employees/index.tsx index 84c63d2..e36788d 100644 --- a/src/pages/company/employees/index.tsx +++ b/src/pages/company/employees/index.tsx @@ -92,8 +92,8 @@ export default function Index({ title = '员工管理' }) { - Apis.Common.Admins.Delete({ id: item.id }).then(() => - action?.reload(), + Apis.Company.CompanyEmployees.Delete({ id: item.id }).then( + () => action?.reload(), ) } /> diff --git a/src/pages/complaint/index.tsx b/src/pages/complaint/index.tsx index 77fb8ec..b923f54 100644 --- a/src/pages/complaint/index.tsx +++ b/src/pages/complaint/index.tsx @@ -166,7 +166,6 @@ export default function Index({ title = '投诉列表' }) { title="分配" /> )} - Apis.WorkOrder.HouseWorkOrders.SoftDelete({ diff --git a/src/pages/customer/components/CustomerHouse.tsx b/src/pages/customer/components/CustomerHouse.tsx index 34361b0..d04175b 100644 --- a/src/pages/customer/components/CustomerHouse.tsx +++ b/src/pages/customer/components/CustomerHouse.tsx @@ -20,12 +20,13 @@ export default function Index(props: MyBetaModalFormProps) { Apis.Archive.HouseOccupants.CustomerHouseByPhone, ) } - // search={false} - // options={false} + search={false} + options={false} columns={[ { - title: '项目名称', + title: '关联房屋', dataIndex: ['asset_house', 'full_name'], + search: false, }, MyColumns.EnumTag({ diff --git a/src/pages/moments/classification/index.tsx b/src/pages/moments/classification/index.tsx index 3f3b7b6..8e6234d 100644 --- a/src/pages/moments/classification/index.tsx +++ b/src/pages/moments/classification/index.tsx @@ -11,7 +11,7 @@ import { Space } from 'antd'; import Create from './modals/Create'; import Update from './modals/Update'; -export default function Index({ title = '朋友圈分类' }) { +export default function Index({ title = '内容分类' }) { // 注册当前页面为标签页 usePageTabs({ tabKey: 'moments-classification', diff --git a/src/pages/moments/list/index.tsx b/src/pages/moments/list/index.tsx index 50741b9..8d69eb2 100644 --- a/src/pages/moments/list/index.tsx +++ b/src/pages/moments/list/index.tsx @@ -16,7 +16,7 @@ import { ProTable } from '@ant-design/pro-components'; import { Card, Space } from 'antd'; import Create from './modals/Create'; -export default function Index({ title = '推送任务' }) { +export default function Index({ title = '创建内容' }) { // 注册当前页面为标签页 usePageTabs({ tabKey: 'moments-list', diff --git a/src/pages/order/list/index.tsx b/src/pages/order/list/index.tsx index c47e1db..66d76d2 100644 --- a/src/pages/order/list/index.tsx +++ b/src/pages/order/list/index.tsx @@ -113,8 +113,8 @@ export default function Index({ title = '支付订单' }) { - Apis.Common.Admins.Delete({ id: item.id }).then(() => - action?.reload(), + Apis.HouseOrder.HouseOrders.Delete({ id: item.id }).then( + () => action?.reload(), ) } />