develop #14

Merged
zsq merged 2 commits from develop into main 2026-04-24 09:33:28 +08:00
5 changed files with 24 additions and 11 deletions
Showing only changes of commit 66ec3a87bb - Show all commits

View File

@ -2,7 +2,7 @@ import { MyBetaModalFormProps } from '@/common';
import { ProCard } from '@ant-design/pro-components'; import { ProCard } from '@ant-design/pro-components';
export default function Attachments(props: MyBetaModalFormProps) { export default function Attachments(props: MyBetaModalFormProps) {
return ( return (
<ProCard title="合同附件"> <ProCard title="件文件">
{props?.item?.map((item: any) => { {props?.item?.map((item: any) => {
const handleDownload = async (e: React.MouseEvent) => { const handleDownload = async (e: React.MouseEvent) => {
e.preventDefault(); e.preventDefault();

View File

@ -15,7 +15,6 @@ import {
ApprovalTemplatesTypeEnum, ApprovalTemplatesTypeEnum,
HouseBillsBillStatusEnum, HouseBillsBillStatusEnum,
HouseBillsTypeEnum, HouseBillsTypeEnum,
RefundsTypeEnum,
} from '@/gen/Enums'; } from '@/gen/Enums';
import { ProTable } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components';
import { useNavigate } from '@umijs/max'; import { useNavigate } from '@umijs/max';
@ -86,7 +85,13 @@ export default function Index({ title = '账单明细' }) {
download={Apis.Bill.HouseBills} download={Apis.Bill.HouseBills}
/> />
), ),
add: <BillCreate key="Create" reload={action?.reload} title={title} />, add: (
<BillCreate
key="Create"
reload={action?.reload}
title={title}
/>
),
}} }}
/>, />,
]} ]}
@ -226,7 +231,9 @@ export default function Index({ title = '账单明细' }) {
title="查看" title="查看"
/> />
), ),
qrcode: <ShowQrCode key="ShowQrCode" item={item} title="收款码" />, qrcode: (
<ShowQrCode key="ShowQrCode" item={item} title="收款码" />
),
pay: ( pay: (
<PayCreate <PayCreate
item={{ ...item, size: 'small' }} item={{ ...item, size: 'small' }}
@ -234,7 +241,13 @@ export default function Index({ title = '账单明细' }) {
title={title} title={title}
/> />
), ),
update: <BillUpdate item={item} reload={action?.reload} title={title} />, update: (
<BillUpdate
item={item}
reload={action?.reload}
title={title}
/>
),
complete: ( complete: (
<RefundComplete <RefundComplete
item={{ ...item, id: item?.refunds[0]?.id }} item={{ ...item, id: item?.refunds[0]?.id }}
@ -246,7 +259,7 @@ export default function Index({ title = '账单明细' }) {
<BillRefund <BillRefund
item={{ item={{
...item, ...item,
type: RefundsTypeEnum.HouseBill.value, type: item?.type,
approval_type: ApprovalTemplatesTypeEnum.Refund.value, approval_type: ApprovalTemplatesTypeEnum.Refund.value,
total_paid_amount: item.total_paid_amount, total_paid_amount: item.total_paid_amount,
}} }}

View File

@ -76,9 +76,9 @@
transition: color 0.3s ease; transition: color 0.3s ease;
} }
&:hover &_label { // &:hover &_label {
color: #f77a3a; // color: #f77a3a;
} // }
&_footer { &_footer {
width: 100%; width: 100%;

View File

@ -63,7 +63,7 @@ export default function Create(props: MyBetaModalFormProps) {
{ {
valueType: 'formList', valueType: 'formList',
dataIndex: 'members', dataIndex: 'members',
title: '团队成员', // title: '团队成员',
formItemProps: { ...rulesHelper.array }, formItemProps: { ...rulesHelper.array },
fieldProps: { fieldProps: {
copyIconProps: false, copyIconProps: false,

View File

@ -68,7 +68,7 @@ export default function Index({ title = '应急小组' }) {
<Update item={item} reload={action?.reload} title={title} /> <Update item={item} reload={action?.reload} title={title} />
<MyButtons.Delete <MyButtons.Delete
onConfirm={() => onConfirm={() =>
Apis.Emergency.EmergencyEventCategories.Delete({ Apis.Emergency.EmergencyEventTeams.Delete({
id: item.id, id: item.id,
}).then(() => action?.reload()) }).then(() => action?.reload())
} }