feat:支持房屋跳转;增加收费订单
All checks were successful
Build and Push Docker Image / build (push) Successful in 3m1s

This commit is contained in:
uiuJun 2025-09-09 14:35:08 +08:00
parent e6eb58a0bd
commit 41b8859698
4 changed files with 228 additions and 3 deletions

View File

@ -8,9 +8,11 @@ import { Apis } from '@/gen/Apis';
import { HouseRegistersStatusEnum, HouseRegistersTypeEnum } from '@/gen/Enums'; import { HouseRegistersStatusEnum, HouseRegistersTypeEnum } from '@/gen/Enums';
import { ProTable } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components';
import { Space } from 'antd'; import { Space } from 'antd';
import { useNavigate } from 'umi';
import Audit from './modals/Audit'; import Audit from './modals/Audit';
export default function Index({ title = '登记审核' }) { export default function Index({ title = '登记审核' }) {
const navigate = useNavigate();
// 注册当前页面为标签页 // 注册当前页面为标签页
usePageTabs({ usePageTabs({
tabKey: 'examine-house-registers-audit', tabKey: 'examine-house-registers-audit',
@ -30,13 +32,18 @@ export default function Index({ title = '登记审核' }) {
columns={[ columns={[
MyColumns.ID(), MyColumns.ID(),
{ {
title: '客户信息', title: '房屋名称',
dataIndex: ['asset_house', 'full_name'], dataIndex: ['asset_house', 'full_name'],
search: { search: {
transform: (value) => { transform: (value) => {
return { house_name: value }; return { house_name: value };
}, },
}, },
render: (text, record) => (
<a onClick={() => navigate(`/archive/${record.model_id}`)}>
{text}
</a>
),
}, },
{ {
title: '客户信息', title: '客户信息',
@ -62,7 +69,9 @@ export default function Index({ title = '登记审核' }) {
MyColumns.Option({ MyColumns.Option({
render: (_, item: any, index, action) => ( render: (_, item: any, index, action) => (
<Space key={index}> <Space key={index}>
{item?.status === HouseRegistersStatusEnum.Pending.value && (
<Audit item={item} reload={action?.reload} title={title} /> <Audit item={item} reload={action?.reload} title={title} />
)}
</Space> </Space>
), ),
}), }),

View File

@ -22,9 +22,12 @@ import {
ProDescriptions, ProDescriptions,
ProTable, ProTable,
} from '@ant-design/pro-components'; } from '@ant-design/pro-components';
import { useNavigate } from '@umijs/max';
import { Form, Image, message, Space } from 'antd'; import { Form, Image, message, Space } from 'antd';
export default function Update(props: MyBetaModalFormProps) { export default function Update(props: MyBetaModalFormProps) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const navigate = useNavigate();
return ( return (
<BetaSchemaForm<ApiTypes.Archive.HouseRegisters.Update> <BetaSchemaForm<ApiTypes.Archive.HouseRegisters.Update>
{...MyModalFormProps.props} {...MyModalFormProps.props}
@ -59,7 +62,13 @@ export default function Update(props: MyBetaModalFormProps) {
<ProCard size="small"> <ProCard size="small">
<ProDescriptions bordered size="small" column={1}> <ProDescriptions bordered size="small" column={1}>
<ProDescriptions.Item label="房屋信息"> <ProDescriptions.Item label="房屋信息">
<a
onClick={() =>
navigate(`/archive/${props?.item?.model_id}`)
}
>
{props?.item?.asset_house?.full_name || '-'} {props?.item?.asset_house?.full_name || '-'}
</a>
</ProDescriptions.Item> </ProDescriptions.Item>
{/* <ProDescriptions.Item label=""> {/* <ProDescriptions.Item label="">
<renderTextHelper.Tag <renderTextHelper.Tag

View File

@ -0,0 +1,117 @@
import {
MyColumns,
MyPageContainer,
MyProTableProps,
usePageTabs,
} from '@/common';
import { Apis } from '@/gen/Apis';
import {
HouseOrdersOrderStatusEnum,
HouseOrdersPaymentMethodEnum,
} from '@/gen/Enums';
import { ProTable } from '@ant-design/pro-components';
export default function Index({ title = '支付明细' }) {
// 注册当前页面为标签页
usePageTabs({
tabKey: 'house_order',
tabLabel: title,
});
return (
<MyPageContainer
title={title}
enableTabs={true}
tabKey="house_order"
tabLabel={title}
>
<ProTable
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
params,
sort,
Apis.HouseOrder.HouseOrders.List,
)
}
// toolBarRender={(action) => [
// <MyImportModal
// key="ImportHouse"
// title="批量导入"
// type="danger"
// size="middle"
// templateApi={Apis.Bill.HouseBills.DownloadTemplate}
// importApi={Apis.Bill.HouseBills.Import}
// reload={action?.reload}
// />,
// <BillCreate key="Create" reload={action?.reload} title={title} />,
// ]}
columns={[
MyColumns.ID(),
MyColumns.EnumTag({
title: '支付状态',
dataIndex: 'order_status',
valueEnum: HouseOrdersOrderStatusEnum,
}),
MyColumns.EnumTag({
title: '支付渠道',
dataIndex: 'payment_method',
valueEnum: HouseOrdersPaymentMethodEnum,
}),
{
title: '订单编号',
dataIndex: 'order_code',
search: false,
},
{
title: '账单金额',
dataIndex: 'amount',
search: false,
},
{
title: '优惠金额',
dataIndex: 'discount_amount',
search: false,
},
{
title: '滞纳金',
dataIndex: 'late_fee',
search: false,
},
{
title: '应付金额',
dataIndex: 'total_payable_amount',
search: false,
},
{
title: '关联项目',
dataIndex: ['asset_project', 'name'],
search: false,
},
{
title: '关联机构',
dataIndex: ['company', 'name'],
search: false,
},
MyColumns.CreatedAt(),
// MyColumns.Option({
// render: (_, item: any, index, action) => (
// <Space key={index}>
// <BillUpdate item={item} reload={action?.reload} title={title} />
// <MyButtons.Delete
// onConfirm={() =>
// Apis.Common.Admins.Delete({ id: item.id }).then(() =>
// action?.reload(),
// )
// }
// />
// </Space>
// ),
// }),
]}
/>
</MyPageContainer>
);
}

View File

@ -0,0 +1,90 @@
import {
MyColumns,
MyPageContainer,
MyProTableProps,
usePageTabs,
} from '@/common';
import { Apis } from '@/gen/Apis';
import { ProTable } from '@ant-design/pro-components';
export default function Index({ title = '支付明细' }) {
// 注册当前页面为标签页
usePageTabs({
tabKey: 'house_order_payments',
tabLabel: title,
});
return (
<MyPageContainer
title={title}
enableTabs={true}
tabKey="house_order_payments"
tabLabel={title}
>
<ProTable
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
params,
sort,
Apis.HouseOrder.HouseOrderPayments.List,
)
}
// toolBarRender={(action) => [
// <MyImportModal
// key="ImportHouse"
// title="批量导入"
// type="danger"
// size="middle"
// templateApi={Apis.Bill.HouseBills.DownloadTemplate}
// importApi={Apis.Bill.HouseBills.Import}
// reload={action?.reload}
// />,
// <BillCreate key="Create" reload={action?.reload} title={title} />,
// ]}
columns={[
MyColumns.ID(),
{
title: '房屋',
dataIndex: ['asset_house', 'full_name'],
search: {
transform: (value) => {
return { full_name: value };
},
},
},
{
title: '支付单号',
dataIndex: 'payment_no',
search: false,
},
{
title: '交易单号',
dataIndex: 'transaction_id',
search: false,
},
{
title: '第三方交易号',
dataIndex: 'hird_trade_no',
search: false,
},
MyColumns.CreatedAt(),
// MyColumns.Option({
// render: (_, item: any, index, action) => (
// <Space key={index}>
// <BillUpdate item={item} reload={action?.reload} title={title} />
// <MyButtons.Delete
// onConfirm={() =>
// Apis.Common.Admins.Delete({ id: item.id }).then(() =>
// action?.reload(),
// )
// }
// />
// </Space>
// ),
// }),
]}
/>
</MyPageContainer>
);
}