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

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/contract/contracts_bi/styleBi.scss
View File

@ -62,7 +62,7 @@
&:hover &_header img {
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 {

5
src/pages/quality/emergency/modals/EventApplyClose.tsx
View File

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

154
src/pages/quality/emergency/teams/index.tsx
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 { ProTable } from '@ant-design/pro-components';
import { Space } from 'antd';
@ -7,76 +12,83 @@ import Update from '../modals/TeamUpdate';
export default function Index({ title = '应急小组' }) {
return (
<ProTable
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
params,
sort,
Apis.Emergency.EmergencyEventTeams.List,
)
}
headerTitle="应急小组"
toolBarRender={(action) => [
<Create key="Create" reload={action?.reload} title="应急小组" />,
]}
columns={[
MyColumns.ID({
search: false,
}),
{
title: '项目',
dataIndex: ['asset_project', 'name'],
search: false,
},
{
title: '名称',
dataIndex: 'name',
},
{
title: '队长',
dataIndex: ['company_employee', 'name'],
search: false,
},
MyColumns.Boolean({
title: '是否启用',
dataIndex: 'is_enabled',
search: false,
}),
{
title: '成员',
search: false,
render: (_, item: any) => {
return (
<Space>
{item?.emergency_team_members?.map(
(res: any, index: number) => {
return (
<div key={`item_${index}`}>{res?.employee_name}</div>
);
},
)}
</Space>
);
<MyPageContainer
title={title}
enableTabs={true}
tabKey="emergency_events_teams"
tabLabel={title}
>
<ProTable
{...MyProTableProps.props}
request={async (params, sort) =>
MyProTableProps.request(
params,
sort,
Apis.Emergency.EmergencyEventTeams.List,
)
}
headerTitle="应急小组"
toolBarRender={(action) => [
<Create key="Create" reload={action?.reload} title="应急小组" />,
]}
columns={[
MyColumns.ID({
search: false,
}),
{
title: '项目',
dataIndex: ['asset_project', 'name'],
search: false,
},
},
MyColumns.UpdatedAt(),
MyColumns.CreatedAt(),
MyColumns.Option({
render: (_, item: any, index, action) => (
<Space key={index}>
<Update item={item} reload={action?.reload} title={title} />
<MyButtons.Delete
onConfirm={() =>
Apis.Emergency.EmergencyEventTeams.Delete({
id: item.id,
}).then(() => action?.reload())
}
/>
</Space>
),
}),
]}
/>
{
title: '名称',
dataIndex: 'name',
},
{
title: '队长',
dataIndex: ['company_employee', 'name'],
search: false,
},
MyColumns.Boolean({
title: '是否启用',
dataIndex: 'is_enabled',
search: false,
}),
{
title: '成员',
search: false,
render: (_, item: any) => {
return (
<Space>
{item?.emergency_team_members?.map(
(res: any, index: number) => {
return (
<div key={`item_${index}`}>{res?.employee_name}</div>
);
},
)}
</Space>
);
},
},
MyColumns.UpdatedAt(),
MyColumns.CreatedAt(),
MyColumns.Option({
render: (_, item: any, index, action) => (
<Space key={index}>
<Update item={item} reload={action?.reload} title={title} />
<MyButtons.Delete
onConfirm={() =>
Apis.Emergency.EmergencyEventTeams.Delete({
id: item.id,
}).then(() => action?.reload())
}
/>
</Space>
),
}),
]}
/>
</MyPageContainer>
);
}