Merge pull request 'develop' (#17) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 5m42s

Reviewed-on: #17
This commit is contained in:
zsq 2026-04-27 17:46:37 +08:00
commit 024a456879
3 changed files with 88 additions and 73 deletions

View File

@ -62,7 +62,7 @@
&:hover &_header img { &:hover &_header img {
transform: scale(1.1) rotate(3deg); transform: scale(1.1) rotate(3deg);
filter: drop-shadow(0 4px 8px rgba(247, 122, 58, 0.2)); // filter: drop-shadow(0 4px 8px rgba(247, 122, 58, 0.2));
} }
&_label { &_label {

View File

@ -16,7 +16,10 @@ export default function ApplyClose(
trigger={ trigger={
<MyButtons.Default <MyButtons.Default
title="关闭" title="关闭"
disabled={props.item.status !== 'InProgress'} disabled={
props.item.status !== 'InProgress' &&
props.item.status !== 'PendingFollowUp'
}
type="primary" type="primary"
/> />
} }

View File

@ -1,4 +1,9 @@
import { MyButtons, MyColumns, MyProTableProps } from '@/common'; import {
MyButtons,
MyColumns,
MyPageContainer,
MyProTableProps,
} from '@/common';
import { Apis } from '@/gen/Apis'; import { Apis } from '@/gen/Apis';
import { ProTable } from '@ant-design/pro-components'; import { ProTable } from '@ant-design/pro-components';
import { Space } from 'antd'; import { Space } from 'antd';
@ -7,6 +12,12 @@ import Update from '../modals/TeamUpdate';
export default function Index({ title = '应急小组' }) { export default function Index({ title = '应急小组' }) {
return ( return (
<MyPageContainer
title={title}
enableTabs={true}
tabKey="emergency_events_teams"
tabLabel={title}
>
<ProTable <ProTable
{...MyProTableProps.props} {...MyProTableProps.props}
request={async (params, sort) => request={async (params, sort) =>
@ -78,5 +89,6 @@ export default function Index({ title = '应急小组' }) {
}), }),
]} ]}
/> />
</MyPageContainer>
); );
} }