From 68c96919bb8bdefab06adbc769c962c793163456 Mon Sep 17 00:00:00 2001 From: uiuJun <> Date: Fri, 19 Sep 2025 00:16:07 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E4=BC=98=E5=8C=96=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .umirc.ts | 8 +++--- src/pages/asset/houses/index.tsx | 24 ++++++++-------- .../list/components/ConvenienceServices.tsx | 4 +-- .../index.tsx | 0 .../modals/ServiceCreate.tsx | 0 .../modals/ServiceUpdate.tsx | 0 .../{receipt_accounts => accounts}/index.tsx | 2 +- .../modals/ReceiptAccountCreate.tsx | 2 +- .../modals/ReceiptAccountUpdate.tsx | 2 +- src/pages/company/list/index.tsx | 16 ++++------- .../company/list/modals/CompanyCreate.tsx | 12 ++++---- .../CompanyShow.tsx} | 28 ++++++++----------- .../company/list/modals/CompanyUpdate.tsx | 12 ++++---- src/pages/company/list/show/$id.tsx | 2 +- src/pages/company/list/table/Brands.tsx | 3 +- .../company/list/table/ReceiptAccounts.tsx | 4 +-- src/pages/company/organizations/index.tsx | 2 +- src/pages/house_charge_tasks/index.tsx | 17 ++++++++--- src/pages/house_order/index.tsx | 2 +- src/pages/system/sys_roles/index.tsx | 2 +- 20 files changed, 71 insertions(+), 71 deletions(-) rename src/pages/asset/{convenience_services => services}/index.tsx (100%) rename src/pages/asset/{convenience_services => services}/modals/ServiceCreate.tsx (100%) rename src/pages/asset/{convenience_services => services}/modals/ServiceUpdate.tsx (100%) rename src/pages/company/{receipt_accounts => accounts}/index.tsx (98%) rename src/pages/company/{receipt_accounts => accounts}/modals/ReceiptAccountCreate.tsx (98%) rename src/pages/company/{receipt_accounts => accounts}/modals/ReceiptAccountUpdate.tsx (98%) rename src/pages/company/list/{table/ComponentsInfo.tsx => modals/CompanyShow.tsx} (75%) diff --git a/.umirc.ts b/.umirc.ts index af85b4a..be583c9 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -15,11 +15,11 @@ export default defineConfig({ proxy: { '/api/': { // target: 'http://yt:8003', - // target: 'http://10.39.13.80:8001', // target: 'http://10.39.13.78:8001/', - target: 'https://test-admin.linyikj.com.cn/', - // target: 'http://we6f9c65.natappfree.cc', - // target: 'https://loanos-test.nchl.net/', + // target: 'https://test-admin.linyikj.com.cn/', + + target: 'https://admin.linyikj.com.cn/', + changeOrigin: true, pathRewrite: { '^': '' }, }, diff --git a/src/pages/asset/houses/index.tsx b/src/pages/asset/houses/index.tsx index e478a9a..b942d29 100644 --- a/src/pages/asset/houses/index.tsx +++ b/src/pages/asset/houses/index.tsx @@ -12,7 +12,7 @@ import { } from '@/gen/Enums'; import { ProCard, ProTable } from '@ant-design/pro-components'; import { useNavigate } from '@umijs/max'; -import { message, Space, Typography } from 'antd'; +import { Alert, message, Space, Typography } from 'antd'; import { useCallback, useMemo, useRef, useState } from 'react'; import BuildingsCreate from './modals/BuildingsCreate'; import AssetBuildingsUpdate from './modals/BuildingsUpdate'; @@ -165,7 +165,7 @@ export default function Index({ title = '项目列表' }) { { - navigate(`/asset/id/${item.id}`); + navigate(`/asset/list/show/${item.id}`); }} /> @@ -301,14 +301,14 @@ export default function Index({ title = '项目列表' }) { return ( - // } + title={ + + } >
@@ -326,9 +326,9 @@ export default function Index({ title = '项目列表' }) { // collapsed: false, // collapseRender: false, // }} - actionRef={actionBuildingsRef} + actionRef={actionAssetRef} rowClassName={(record: any) => { - return selectedBuilding?.id === record?.id + return selectedAsset?.id === record?.id ? 'ant-table-row-selected' : ''; }} diff --git a/src/pages/asset/list/components/ConvenienceServices.tsx b/src/pages/asset/list/components/ConvenienceServices.tsx index d1d48a0..a4221f3 100644 --- a/src/pages/asset/list/components/ConvenienceServices.tsx +++ b/src/pages/asset/list/components/ConvenienceServices.tsx @@ -4,8 +4,8 @@ import { ConvenienceServicesTypeEnum } from '@/gen/Enums'; import { ProTable } from '@ant-design/pro-components'; import { Space } from 'antd'; import { useEffect, useRef } from 'react'; -import ServiceCreate from '../../convenience_services/modals/ServiceCreate'; -import ServiceUpdate from '../../convenience_services/modals/ServiceUpdate'; +import ServiceCreate from '../../services/modals/ServiceCreate'; +import ServiceUpdate from '../../services/modals/ServiceUpdate'; export default function Index({ ...rest }) { const actionLooks = useRef(); diff --git a/src/pages/asset/convenience_services/index.tsx b/src/pages/asset/services/index.tsx similarity index 100% rename from src/pages/asset/convenience_services/index.tsx rename to src/pages/asset/services/index.tsx diff --git a/src/pages/asset/convenience_services/modals/ServiceCreate.tsx b/src/pages/asset/services/modals/ServiceCreate.tsx similarity index 100% rename from src/pages/asset/convenience_services/modals/ServiceCreate.tsx rename to src/pages/asset/services/modals/ServiceCreate.tsx diff --git a/src/pages/asset/convenience_services/modals/ServiceUpdate.tsx b/src/pages/asset/services/modals/ServiceUpdate.tsx similarity index 100% rename from src/pages/asset/convenience_services/modals/ServiceUpdate.tsx rename to src/pages/asset/services/modals/ServiceUpdate.tsx diff --git a/src/pages/company/receipt_accounts/index.tsx b/src/pages/company/accounts/index.tsx similarity index 98% rename from src/pages/company/receipt_accounts/index.tsx rename to src/pages/company/accounts/index.tsx index 0c109e1..a4318af 100644 --- a/src/pages/company/receipt_accounts/index.tsx +++ b/src/pages/company/accounts/index.tsx @@ -52,7 +52,7 @@ export default function Index({ title = '账号管理' }) { search: false, }, { - title: '收款账号名称', + title: '收款户名', dataIndex: 'company_name', }, { diff --git a/src/pages/company/receipt_accounts/modals/ReceiptAccountCreate.tsx b/src/pages/company/accounts/modals/ReceiptAccountCreate.tsx similarity index 98% rename from src/pages/company/receipt_accounts/modals/ReceiptAccountCreate.tsx rename to src/pages/company/accounts/modals/ReceiptAccountCreate.tsx index cfee14a..ff27ef2 100644 --- a/src/pages/company/receipt_accounts/modals/ReceiptAccountCreate.tsx +++ b/src/pages/company/accounts/modals/ReceiptAccountCreate.tsx @@ -54,7 +54,7 @@ export default function Create(props: MyBetaModalFormProps) { ]), { key: 'company_name', - title: '收款账户名称', + title: '收款户名', colProps: { span: 24 }, formItemProps: { ...rulesHelper.text }, }, diff --git a/src/pages/company/receipt_accounts/modals/ReceiptAccountUpdate.tsx b/src/pages/company/accounts/modals/ReceiptAccountUpdate.tsx similarity index 98% rename from src/pages/company/receipt_accounts/modals/ReceiptAccountUpdate.tsx rename to src/pages/company/accounts/modals/ReceiptAccountUpdate.tsx index 9ce19ba..6b5569e 100644 --- a/src/pages/company/receipt_accounts/modals/ReceiptAccountUpdate.tsx +++ b/src/pages/company/accounts/modals/ReceiptAccountUpdate.tsx @@ -43,7 +43,7 @@ export default function Update(props: MyBetaModalFormProps) { columns={[ { key: 'company_name', - title: '收款账户名称', + title: '收款户名', colProps: { span: 24 }, formItemProps: { ...rulesHelper.text }, }, diff --git a/src/pages/company/list/index.tsx b/src/pages/company/list/index.tsx index f26c344..32b9812 100644 --- a/src/pages/company/list/index.tsx +++ b/src/pages/company/list/index.tsx @@ -10,8 +10,8 @@ import { ProTable } from '@ant-design/pro-components'; import { useNavigate } from '@umijs/max'; import { Space } from 'antd'; import CompanyCreate from './modals/CompanyCreate'; +import CompanyShow from './modals/CompanyShow'; import CompanyUpdate from './modals/CompanyUpdate'; -import ComponentsInfo from './table/ComponentsInfo'; export default function Index({ title = '机构列表' }) { const navigate = useNavigate(); @@ -39,15 +39,15 @@ export default function Index({ title = '机构列表' }) { ]} columns={[ MyColumns.ID(), + { + title: '机构名称', + dataIndex: 'name', + }, { title: '机构简称', dataIndex: 'short_name', search: false, }, - { - title: '企业名称', - dataIndex: 'name', - }, // MyColumns.EnumTag({ // title: '类型', // dataIndex: 'merchant_type', @@ -63,11 +63,7 @@ export default function Index({ title = '机构列表' }) { MyColumns.Option({ render: (_, item: any, index, action) => ( - + - - - {props?.item?.short_name} - + {props?.item?.name} @@ -27,28 +23,28 @@ export default function info(props: MyBetaModalFormProps) { /> */} - + + {props?.item?.short_name} + + {/* - + */} {props?.item?.business_license_number} - - {props?.item?.contact_name} + + {props?.item?.contact_name}: {props?.item?.contact_phone} - - {props?.item?.contact_phone} - - + {props?.item?.contact_email} - + {props?.item?.province || ''} {props?.item?.city || ''} {props?.item?.district || ''} diff --git a/src/pages/company/list/modals/CompanyUpdate.tsx b/src/pages/company/list/modals/CompanyUpdate.tsx index 2737c9d..9c65a6d 100644 --- a/src/pages/company/list/modals/CompanyUpdate.tsx +++ b/src/pages/company/list/modals/CompanyUpdate.tsx @@ -45,15 +45,15 @@ export default function Update(props: MyBetaModalFormProps) { } columns={[ { - key: 'short_name', - title: '机构简称', - colProps: { span: 6 }, + key: 'name', + title: '机构名称', + colProps: { span: 14 }, formItemProps: { ...rulesHelper.text }, }, { - key: 'name', - title: '企业名称', - colProps: { span: 18 }, + key: 'short_name', + title: '机构简称', + colProps: { span: 10 }, formItemProps: { ...rulesHelper.text }, }, { diff --git a/src/pages/company/list/show/$id.tsx b/src/pages/company/list/show/$id.tsx index 2e4d94e..281dd8b 100644 --- a/src/pages/company/list/show/$id.tsx +++ b/src/pages/company/list/show/$id.tsx @@ -5,11 +5,11 @@ import { useParams } from '@umijs/max'; import { Space, Tabs } from 'antd'; import { useEffect, useState } from 'react'; +import ComponentsInfo from '../modals/CompanyShow'; import CompanyUpdate from '../modals/CompanyUpdate'; import CompanyApps from '../table/Apps'; import Assets from '../table/Assets'; import Brands from '../table/Brands'; -import ComponentsInfo from '../table/ComponentsInfo'; import Employees from '../table/Employees'; import Organizations from '../table/Organizations'; import Positions from '../table/Positions'; diff --git a/src/pages/company/list/table/Brands.tsx b/src/pages/company/list/table/Brands.tsx index 4fbe860..08a4431 100644 --- a/src/pages/company/list/table/Brands.tsx +++ b/src/pages/company/list/table/Brands.tsx @@ -30,11 +30,10 @@ export default function PropertyBrands(props: MyBetaModalFormProps) { title="品牌" />, ]} - // search={false} + search={false} // options={false} columns={[ MyColumns.ID(), - { title: '物业名称', dataIndex: 'name', diff --git a/src/pages/company/list/table/ReceiptAccounts.tsx b/src/pages/company/list/table/ReceiptAccounts.tsx index b9cba98..b49a436 100644 --- a/src/pages/company/list/table/ReceiptAccounts.tsx +++ b/src/pages/company/list/table/ReceiptAccounts.tsx @@ -7,8 +7,8 @@ import { import { Apis } from '@/gen/Apis'; import { ProTable } from '@ant-design/pro-components'; import { Space } from 'antd'; -import ReceiptAccountCreate from '../../receipt_accounts/modals/ReceiptAccountCreate'; -import ReceiptAccountUpdate from '../../receipt_accounts/modals/ReceiptAccountUpdate'; +import ReceiptAccountCreate from '../../accounts/modals/ReceiptAccountCreate'; +import ReceiptAccountUpdate from '../../accounts/modals/ReceiptAccountUpdate'; export default function ReceiptAccounts(props: MyBetaModalFormProps) { return ( diff --git a/src/pages/company/organizations/index.tsx b/src/pages/company/organizations/index.tsx index f0c8d0a..b8d9dc4 100644 --- a/src/pages/company/organizations/index.tsx +++ b/src/pages/company/organizations/index.tsx @@ -43,7 +43,7 @@ export default function Index({ title = '组织列表' }) { , ]} columns={[ diff --git a/src/pages/house_charge_tasks/index.tsx b/src/pages/house_charge_tasks/index.tsx index 74da70b..d905970 100644 --- a/src/pages/house_charge_tasks/index.tsx +++ b/src/pages/house_charge_tasks/index.tsx @@ -46,12 +46,21 @@ export default function Index({ title = '任务结果' }) { dataIndex: 'house_charge_tasks_id', search: false, }, - MyColumns.ID(), MyColumns.EnumTag({ title: '任务状态', dataIndex: 'status', valueEnum: HouseChargeTaskDetailsStatusEnum, }), + { + title: '账单ID', + dataIndex: 'id', + search: false, + }, + { + title: '关联对象', + dataIndex: 'full_name', + search: false, + }, { title: '账单月份', render: (_, record) => { @@ -60,15 +69,15 @@ export default function Index({ title = '任务结果' }) { }, { title: '计费开始日期', - dataIndex: 'start_date', + dataIndex: ['house_charge_task', 'start_date'], search: false, }, { title: '计费结束日期', - dataIndex: 'end_date', + dataIndex: ['house_charge_task', 'end_date'], search: false, }, - MyColumns.UpdatedAt(), + // MyColumns.UpdatedAt(), MyColumns.CreatedAt(), MyColumns.Option({ render: (_, item: any, index, action) => ( diff --git a/src/pages/house_order/index.tsx b/src/pages/house_order/index.tsx index bb10a3e..480c90f 100644 --- a/src/pages/house_order/index.tsx +++ b/src/pages/house_order/index.tsx @@ -60,7 +60,7 @@ export default function Index({ title = '支付明细' }) { }), { - title: '订单编号', + title: '收款单号', dataIndex: 'order_code', search: false, }, diff --git a/src/pages/system/sys_roles/index.tsx b/src/pages/system/sys_roles/index.tsx index 9a3cfd7..84f991f 100644 --- a/src/pages/system/sys_roles/index.tsx +++ b/src/pages/system/sys_roles/index.tsx @@ -37,7 +37,7 @@ export default function Index({ title = '角色' }) { ]} columns={[ MyColumns.ID(), - { dataIndex: 'guard_name', title: 'guard_name', search: false }, + // { dataIndex: 'guard_name', title: 'guard_name', search: false }, { dataIndex: 'name', title: '名称' }, { title: '颜色',