pay/pay-admin
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix： 优化页面 #7

Merged
uiujun merged 1 commits from develop into main 2025-09-19 00:16:49 +08:00
Conversation 0 Commits 1 Files Changed 20 +71 -71
20 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.umirc.ts
View File

@ -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: { '^': '' },
},

24
src/pages/asset/houses/index.tsx
View File

@ -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 = '项目列表' }) {
<MyButtons.View
title="配置"
onClick={() => {
navigate(`/asset/id/${item.id}`);
navigate(`/asset/list/show/${item.id}`);
}}
/>
</Space>
@ -301,14 +301,14 @@ export default function Index({ title = '项目列表' }) {
return (
<MyPageContainer title={title}>
<ProCard
// title={
// <Alert
// message="操作提示：在楼栋下添加单元，在单元下添加房屋！"
// type="info"
// showIcon
// style={{ margin: 0 }}
// />
// }
title={
<Alert
message="操作提示：可在项目中添加楼栋，在楼栋中添加单元，在单元中添加房屋！"
type="info"
showIcon
style={{ margin: 0 }}
/>
}
>
<Space align="start" size="large" style={{ width: '100%' }}>
<div style={{ flex: 1 }}>
@ -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'
: '';
}}

4
src/pages/asset/list/components/ConvenienceServices.tsx
View File

@ -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<any>();

0
src/pages/asset/convenience_services/index.tsx → src/pages/asset/services/index.tsx
View File

0
src/pages/asset/convenience_services/modals/ServiceCreate.tsx → src/pages/asset/services/modals/ServiceCreate.tsx
View File

0
src/pages/asset/convenience_services/modals/ServiceUpdate.tsx → src/pages/asset/services/modals/ServiceUpdate.tsx
View File

2
src/pages/company/receipt_accounts/index.tsx → src/pages/company/accounts/index.tsx
View File

@ -52,7 +52,7 @@ export default function Index({ title = '账号管理' }) {
search: false,
},
{
title: '收款账号名称',
title: '收款户名',
dataIndex: 'company_name',
},
{

2
src/pages/company/receipt_accounts/modals/ReceiptAccountCreate.tsx → src/pages/company/accounts/modals/ReceiptAccountCreate.tsx
View File

@ -54,7 +54,7 @@ export default function Create(props: MyBetaModalFormProps) {
]),
{
key: 'company_name',
title: '收款账户名称',
title: '收款户名',
colProps: { span: 24 },
formItemProps: { ...rulesHelper.text },
},

2
src/pages/company/receipt_accounts/modals/ReceiptAccountUpdate.tsx → src/pages/company/accounts/modals/ReceiptAccountUpdate.tsx
View File

@ -43,7 +43,7 @@ export default function Update(props: MyBetaModalFormProps) {
columns={[
{
key: 'company_name',
title: '收款账户名称',
title: '收款户名',
colProps: { span: 24 },
formItemProps: { ...rulesHelper.text },
},

16
src/pages/company/list/index.tsx
View File

@ -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) => (
<Space key={index}>
<ComponentsInfo
item={item}
title="查看"
reload={action?.reload}
/>
<CompanyShow item={item} title="查看" reload={action?.reload} />
<CompanyUpdate
item={{ ...item, type: 'link' }}
title="机构"

12
src/pages/company/list/modals/CompanyCreate.tsx
View File

@ -40,15 +40,15 @@ export default function Create(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 },
},
{

28
src/pages/company/list/table/ComponentsInfo.tsx → src/pages/company/list/modals/CompanyShow.tsx
View File

@ -1,6 +1,5 @@
import { MyBetaModalFormProps, renderTextHelper } from '@/common';
import { MyBetaModalFormProps } from '@/common';
import { MyModal } from '@/components/MyModal';
import { CompaniesMerchantTypeEnum } from '@/gen/Enums';
import { ProCard, ProDescriptions } from '@ant-design/pro-components';
import { Space } from 'antd';
@ -9,14 +8,11 @@ export default function info(props: MyBetaModalFormProps) {
<MyModal
title={props.title || '查看'}
type={props.item?.type || 'primary'}
width="1000px"
width="800px"
node={
<Space direction="vertical" style={{ width: '100%' }}>
<ProCard extra={props.extra}>
<ProDescriptions bordered>
<ProDescriptions.Item label="机构简称">
{props?.item?.short_name}
</ProDescriptions.Item>
<ProDescriptions bordered column={2}>
<ProDescriptions.Item label="机构名称" span={2}>
<Space>
{props?.item?.name}
@ -27,28 +23,28 @@ export default function info(props: MyBetaModalFormProps) {
/> */}
</Space>
</ProDescriptions.Item>
<ProDescriptions.Item label="商户类型">
<ProDescriptions.Item label="机构简称">
{props?.item?.short_name}
</ProDescriptions.Item>
{/* <ProDescriptions.Item label="商户类型">
<renderTextHelper.Tag
Enums={CompaniesMerchantTypeEnum}
value={props?.item?.merchant_type}
key="merchant_type"
/>
</ProDescriptions.Item>
</ProDescriptions.Item> */}
<ProDescriptions.Item label="营业执照号" span={2}>
{props?.item?.business_license_number}
</ProDescriptions.Item>
<ProDescriptions.Item label="联系人姓名">
{props?.item?.contact_name}
<ProDescriptions.Item label="联系人">
{props?.item?.contact_name}: {props?.item?.contact_phone}
</ProDescriptions.Item>
<ProDescriptions.Item label="联系人手机">
{props?.item?.contact_phone}
</ProDescriptions.Item>
<ProDescriptions.Item label="联系人邮箱">
<ProDescriptions.Item label="联系邮箱">
{props?.item?.contact_email}
</ProDescriptions.Item>
<ProDescriptions.Item label="机构地址">
<ProDescriptions.Item label="机构地址" span={2}>
{props?.item?.province || ''}
{props?.item?.city || ''}
{props?.item?.district || ''}

12
src/pages/company/list/modals/CompanyUpdate.tsx
View File

@ -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 },
},
{

2
src/pages/company/list/show/$id.tsx
View File

@ -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';

3
src/pages/company/list/table/Brands.tsx
View File

@ -30,11 +30,10 @@ export default function PropertyBrands(props: MyBetaModalFormProps) {
title="品牌"
/>,
]}
// search={false}
search={false}
// options={false}
columns={[
MyColumns.ID(),
{
title: '物业名称',
dataIndex: 'name',

4
src/pages/company/list/table/ReceiptAccounts.tsx
View File

@ -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 (

2
src/pages/company/organizations/index.tsx
View File

@ -43,7 +43,7 @@ export default function Index({ title = '组织列表' }) {
<OrganizationCreate
key="Create"
reload={action?.reload}
title={title}
title={'组织'}
/>,
]}
columns={[

17
src/pages/house_charge_tasks/index.tsx
View File

@ -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) => (

2
src/pages/house_order/index.tsx
View File

@ -60,7 +60,7 @@ export default function Index({ title = '支付明细' }) {
}),
{
title: '订单编号',
title: '收款单号',
dataIndex: 'order_code',
search: false,
},

2
src/pages/system/sys_roles/index.tsx
View File

@ -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: '颜色',