Compare commits

..

2 Commits

Author SHA1 Message Date
zsq
667e7a407a Merge pull request 'fix:更新装修验收指派' (#24) from develop into main
All checks were successful
Build and Push Docker Image / build (push) Successful in 5m1s
Reviewed-on: #24
2026-05-07 14:51:06 +08:00
Your Name
8cf47abdcc fix:更新装修验收指派
All checks were successful
Build and Push Docker Image / build (push) Successful in 5m5s
2026-05-07 14:23:01 +08:00
2 changed files with 131 additions and 122 deletions

View File

@ -1,4 +1,4 @@
import { MyColumns, MyProTableProps } from '@/common'; import { MyColumns, MyPageContainer, MyProTableProps } from '@/common';
import { Selects } from '@/components/Select'; import { Selects } from '@/components/Select';
import { Apis } from '@/gen/Apis'; import { Apis } from '@/gen/Apis';
import { import {
@ -18,8 +18,14 @@ export const RenovationWorkOrdersStatusEnum = {
Closed: { text: '已关闭', color: '#6C757D', value: 'Closed' }, Closed: { text: '已关闭', color: '#6C757D', value: 'Closed' },
}; };
export default function Index({ title = '装修巡检' }) { export default function Index({ title = '装修验收' }) {
return ( return (
<MyPageContainer
title={title}
enableTabs={true}
tabKey="renovation_inspection_list"
tabLabel={title}
>
<ProTable<Record<any, any>> <ProTable<Record<any, any>>
{...MyProTableProps.props} {...MyProTableProps.props}
headerTitle={title} headerTitle={title}
@ -131,7 +137,11 @@ 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}>
<WorkOrderShow item={item} title="详情" reload={action?.reload} /> <WorkOrderShow
item={item}
title="详情"
reload={action?.reload}
/>
<RenovationAssign <RenovationAssign
item={item} item={item}
reload={action?.reload} reload={action?.reload}
@ -142,5 +152,6 @@ export default function Index({ title = '装修巡检' }) {
}), }),
]} ]}
/> />
</MyPageContainer>
); );
} }

View File

@ -28,10 +28,8 @@ export default function WorkOrderAssign(
<MyButtons.Default <MyButtons.Default
title={props.title || '指派'} title={props.title || '指派'}
disabled={ disabled={
!( props?.item.assign_status !== 'Unassigned' &&
props?.item.assign_status === 'Unassigned' &&
props?.item.type === 'RenovationAcceptance' props?.item.type === 'RenovationAcceptance'
)
} }
type="primary" type="primary"
/> />