From 8cf47abdccf814719364c2bf72a84e0a691c44f9 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 7 May 2026 14:23:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E8=A3=85=E4=BF=AE?= =?UTF-8?q?=E9=AA=8C=E6=94=B6=E6=8C=87=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/routing_inspection/index.tsx | 247 +++++++++--------- .../modals/RenovationAssign.tsx | 6 +- 2 files changed, 131 insertions(+), 122 deletions(-) diff --git a/src/pages/quality/routing_inspection/index.tsx b/src/pages/quality/routing_inspection/index.tsx index cacc305..ce3a4de 100644 --- a/src/pages/quality/routing_inspection/index.tsx +++ b/src/pages/quality/routing_inspection/index.tsx @@ -1,4 +1,4 @@ -import { MyColumns, MyProTableProps } from '@/common'; +import { MyColumns, MyPageContainer, MyProTableProps } from '@/common'; import { Selects } from '@/components/Select'; import { Apis } from '@/gen/Apis'; import { @@ -18,129 +18,140 @@ export const RenovationWorkOrdersStatusEnum = { Closed: { text: '已关闭', color: '#6C757D', value: 'Closed' }, }; -export default function Index({ title = '装修巡检' }) { +export default function Index({ title = '装修验收' }) { return ( - > - {...MyProTableProps.props} - headerTitle={title} - request={async (params, sort) => { - return MyProTableProps.request( + + > + {...MyProTableProps.props} + headerTitle={title} + request={async (params, sort) => { + return MyProTableProps.request( + { + ...params, + type: [ + HouseWorkOrdersTypeEnum.RenovationInspection.value, + HouseWorkOrdersTypeEnum.RenovationAcceptance.value, + ], + }, + sort, + Apis.WorkOrder.HouseWorkOrders.List, + ); + }} + // toolBarRender={(action) => [toolBarRender(action)]} + columns={[ + MyColumns.ID({ search: false }), + Selects?.AssetProjects({ + title: '选择项目', + key: 'asset_projects_id', + hidden: true, + }), + MyColumns.EnumTag({ + title: '处理状态', + dataIndex: 'status', + valueEnum: RenovationWorkOrdersStatusEnum, + }), { - ...params, - type: [ - HouseWorkOrdersTypeEnum.RenovationInspection.value, - HouseWorkOrdersTypeEnum.RenovationAcceptance.value, - ], + title: '项目名称', + dataIndex: 'project_name', + hidden: true, }, - sort, - Apis.WorkOrder.HouseWorkOrders.List, - ); - }} - // toolBarRender={(action) => [toolBarRender(action)]} - columns={[ - MyColumns.ID({ search: false }), - Selects?.AssetProjects({ - title: '选择项目', - key: 'asset_projects_id', - hidden: true, - }), - MyColumns.EnumTag({ - title: '处理状态', - dataIndex: 'status', - valueEnum: RenovationWorkOrdersStatusEnum, - }), - { - title: '项目名称', - dataIndex: 'project_name', - hidden: true, - }, - MyColumns.EnumTag({ - title: '分配状态', - dataIndex: 'assign_status', - valueEnum: HouseWorkOrdersAssignStatusEnum, - }), - MyColumns.EnumTag({ - title: '工单类型', - dataIndex: 'type', - valueEnum: HouseWorkOrdersTypeEnum, - search: false, - }), - // MyColumns.EnumTag({ - // title: '报修位置', - // dataIndex: 'location', - // valueEnum: HouseWorkOrdersLocationEnum, - // search: false, - // }), - { - title: '位置信息', - dataIndex: ['asset_house', 'full_name'], - render: (_, record) => { - return ( - - {record?.asset_house?.full_name - ? record?.asset_house?.full_name - : record?.asset_project?.name} - - ); - }, - search: { - transform: (value) => { - return { house_name: value }; + MyColumns.EnumTag({ + title: '分配状态', + dataIndex: 'assign_status', + valueEnum: HouseWorkOrdersAssignStatusEnum, + }), + MyColumns.EnumTag({ + title: '工单类型', + dataIndex: 'type', + valueEnum: HouseWorkOrdersTypeEnum, + search: false, + }), + // MyColumns.EnumTag({ + // title: '报修位置', + // dataIndex: 'location', + // valueEnum: HouseWorkOrdersLocationEnum, + // search: false, + // }), + { + title: '位置信息', + dataIndex: ['asset_house', 'full_name'], + render: (_, record) => { + return ( + + {record?.asset_house?.full_name + ? record?.asset_house?.full_name + : record?.asset_project?.name} + + ); + }, + search: { + transform: (value) => { + return { house_name: value }; + }, }, }, - }, - // { - // title: '工单描述', - // dataIndex: 'content', - // search: false, - // width: 200, // 关键:固定列宽(若父容器过窄,可设 minWidth: 200 优先保证列宽) - // render: (text) => ( - //
- // {text} - //
- // ), - // }, - MyColumns.EnumTag({ - title: '优先级', - dataIndex: 'level', - valueEnum: HouseWorkOrdersLevelEnum, - search: false, - }), + // { + // title: '工单描述', + // dataIndex: 'content', + // search: false, + // width: 200, // 关键:固定列宽(若父容器过窄,可设 minWidth: 200 优先保证列宽) + // render: (text) => ( + //
+ // {text} + //
+ // ), + // }, + MyColumns.EnumTag({ + title: '优先级', + dataIndex: 'level', + valueEnum: HouseWorkOrdersLevelEnum, + search: false, + }), - { - title: '处理人', - dataIndex: ['assign_employee', 'name'], - search: false, - render: (_, record) => { - return `${record?.assign_employee?.name || ''}-${ - record?.assign_employee?.phone || '' - }`; + { + title: '处理人', + dataIndex: ['assign_employee', 'name'], + search: false, + render: (_, record) => { + return `${record?.assign_employee?.name || ''}-${ + record?.assign_employee?.phone || '' + }`; + }, }, - }, - MyColumns.CreatedAt(), - MyColumns.Option({ - render: (_, item: any, index, action) => ( - - - - - ), - }), - ]} - /> + MyColumns.CreatedAt(), + MyColumns.Option({ + render: (_, item: any, index, action) => ( + + + + + ), + }), + ]} + /> +
); } diff --git a/src/pages/quality/routing_inspection/modals/RenovationAssign.tsx b/src/pages/quality/routing_inspection/modals/RenovationAssign.tsx index 81dc470..0f021a7 100644 --- a/src/pages/quality/routing_inspection/modals/RenovationAssign.tsx +++ b/src/pages/quality/routing_inspection/modals/RenovationAssign.tsx @@ -28,10 +28,8 @@ export default function WorkOrderAssign( -- 2.47.2