diff --git a/src/pages/customer/house_registers_audit/index.tsx b/src/pages/customer/house_registers_audit/index.tsx index c312bbb..f6dcdc0 100644 --- a/src/pages/customer/house_registers_audit/index.tsx +++ b/src/pages/customer/house_registers_audit/index.tsx @@ -5,6 +5,7 @@ import { ProTable } from '@ant-design/pro-components'; import { Space } from 'antd'; import { useNavigate } from 'umi'; import Audit from './modals/Audit'; +import Show from './modals/Show'; export default function Index({ title = '登记审核' }) { const navigate = useNavigate(); @@ -89,6 +90,7 @@ export default function Index({ title = '登记审核' }) { render: (_, item: any, index, action) => ( + , ), }), diff --git a/src/pages/customer/house_registers_audit/modals/Show.tsx b/src/pages/customer/house_registers_audit/modals/Show.tsx new file mode 100644 index 0000000..c91fbf0 --- /dev/null +++ b/src/pages/customer/house_registers_audit/modals/Show.tsx @@ -0,0 +1,232 @@ +import { + MyBetaModalFormProps, + MyButtons, + MyColumns, + MyModalFormProps, + MyProTableProps, + renderTextHelper, +} from '@/common'; + +import { + HouseOccupantsCardTypeEnum, + HouseOccupantsResidentialRelationEnum, + HouseRegistersTypeEnum, +} from '@/gen/Enums'; +import { + BetaSchemaForm, + ProCard, + ProDescriptions, + ProTable, +} from '@ant-design/pro-components'; +import { useNavigate } from '@umijs/max'; +import { Form, Image, Space } from 'antd'; +export default function Show(props: MyBetaModalFormProps) { + const [form] = Form.useForm(); + const navigate = useNavigate(); + + return ( + + {...MyModalFormProps.props} + title={props.title} + trigger={} + wrapperCol={{ span: 24 }} + width="800px" + modalProps={{ + bodyStyle: { maxHeight: '70vh', overflowY: 'auto' }, + }} + key={new Date().getTime()} + form={form} + columns={[ + { + // title: '登记信息', + dataIndex: 'info_display', + valueType: 'text', + renderFormItem: () => ( + + + + + + navigate( + `/customer/archive/show/${props?.item?.model_id}`, + ) + } + > + {props?.item?.asset_house?.full_name || '-'} + + + + + + + + {props?.item?.created_at || '-'} + + + + + {props?.item?.customer_info && + props?.item?.customer_info?.length > 0 && ( + + record?.id_card || index} + size="small" + columns={[ + MyColumns.EnumTag({ + title: '关联身份', + dataIndex: 'residential_relation', + valueEnum: HouseOccupantsResidentialRelationEnum, + }), + { + title: '姓名', + dataIndex: 'name', + }, + { + title: '手机号', + dataIndex: 'phone', + }, + MyColumns.EnumTag({ + title: '证件类型', + dataIndex: 'card_type', + valueEnum: HouseOccupantsCardTypeEnum, + }), + { + title: '证件号码', + dataIndex: 'id_card', + }, + { + title: '证件资料', + render: (_, item) => { + return ( + + {item?.card_front_image?.[0] && ( + + )} + {item?.card_back_image?.[0] && ( + + )} + + ); + }, + }, + ]} + /> + + )} + {(props?.item?.type === 'UpdateInfo' || + props?.item?.type === 'UpdatePhone') && ( + + record?.id_card || index} + size="small" + columns={[ + { + title: '姓名', + dataIndex: 'name', + }, + { + title: '手机号', + dataIndex: 'phone', + }, + MyColumns.EnumTag({ + title: '证件类型', + dataIndex: 'card_type', + valueEnum: HouseOccupantsCardTypeEnum, + }), + { + title: '证件号码', + dataIndex: 'id_card', + }, + { + title: '证件资料', + render: (_, item) => { + return ( + + {item?.card_front_image?.[0] && ( + + )} + {item?.card_back_image?.[0] && ( + + )} + + ); + }, + }, + ]} + /> + + )} + {props?.item?.type === 'AddOwner' && + props?.item?.ownership_info && + props?.item?.ownership_info?.length > 0 && ( + + + + {props?.item?.ownership_info?.map( + (res: any, index: number) => ( + + ), + )} + + + + )} + + ), + colProps: { span: 24 }, + }, + ]} + /> + ); +} diff --git a/src/pages/work_order/list/index.tsx b/src/pages/work_order/list/index.tsx index c0fe84d..d2fe698 100644 --- a/src/pages/work_order/list/index.tsx +++ b/src/pages/work_order/list/index.tsx @@ -16,7 +16,7 @@ import { } from '@/gen/Enums'; import { ProTable } from '@ant-design/pro-components'; import { useSearchParams } from '@umijs/max'; -import { Dropdown, Space, Tooltip } from 'antd'; +import { Space, Tooltip } from 'antd'; import WorkOrderAssign from './modals/WorkOrderAssign'; import WorkOrderCreate from './modals/WorkOrderCreate'; import WorkOrderShow from './modals/WorkOrderShow'; @@ -28,72 +28,63 @@ export default function Index({ title = '报修报事' }) { let toolBarRender = (action: any) => { return getCurrentPermissions({ create: ( - { - let obj: any = JSON.parse( - JSON.stringify(HouseWorkOrdersTypeEnum), - ); - - delete obj.EquipmentMaintenance; - delete obj.Emergency; - delete obj.EmergEquipmentMaintenancency; - delete obj.SecurityInspection; - delete obj.Complaint; - delete obj.QualityCheck; - return obj; - }, - }} - /> + ), }); }; let tableRender = (item: any, action: any) => { let permissions = getCurrentPermissions({ - assign: ( - - ), - completed: ( - - ), - }); - - let permissionsSpace = getCurrentPermissions({ - show: { - key: '1', - label: ( - - ), - }, - update: { - key: '2', - label: ( - - ), - }, - delete: { - key: '3', - label: ( - - Apis.WorkOrder.HouseWorkOrders.Delete({ - id: item.id, - }).then(() => action?.reload()) - } + show: , + update: ( + <> + { + let obj: any = JSON.parse( + JSON.stringify(HouseWorkOrdersTypeEnum), + ); + delete obj.RenovationAcceptance; + delete obj.EquipmentMaintenance; + delete obj.RenovationInspection; + delete obj.Emergency; + delete obj.EmergEquipmentMaintenancency; + delete obj.SecurityInspection; + delete obj.Complaint; + delete obj.QualityCheck; + return obj; + }, + }} + reload={action?.reload} + title={title} /> - ), - }, + + ), + assign: ( + <> + + + ), + // completed: ( + // <> + // {item.status === 'Completed' && item.is_visited === 0 && ( + // + // )} + // + // ), + delete: ( + + Apis.WorkOrder.HouseWorkOrders.Delete({ + id: item.id, + }).then(() => action?.reload()) + } + /> + ), }); - let Others = ( - - - - ); - return [...permissions, ...[Others]]; + return [...permissions]; }; return ( diff --git a/src/pages/work_order/list/modals/WorkOrderCreate.tsx b/src/pages/work_order/list/modals/WorkOrderCreate.tsx index 8d17381..36f3aa9 100644 --- a/src/pages/work_order/list/modals/WorkOrderCreate.tsx +++ b/src/pages/work_order/list/modals/WorkOrderCreate.tsx @@ -47,7 +47,11 @@ export default function WorkOrderCreate(props: MyBetaModalFormProps) { title: '工单类型', colProps: { span: 24 }, // valueEnum: HouseWorkOrdersTypeEnum, - valueEnum: props?.item?.typeEnum, + valueEnum: () => { + let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum)); + delete obj.Complaint; + return obj; + }, required: true, }), { diff --git a/src/pages/work_order/list/modals/WorkOrderShow.tsx b/src/pages/work_order/list/modals/WorkOrderShow.tsx index daec315..6d4ef01 100644 --- a/src/pages/work_order/list/modals/WorkOrderShow.tsx +++ b/src/pages/work_order/list/modals/WorkOrderShow.tsx @@ -39,12 +39,7 @@ export default function WorkOrderShow({ return ( <> - + } + trigger={ + + } onOpenChange={(open: any) => { if (open && props.item) { const formValues = { @@ -61,7 +66,11 @@ export default function WorkOrderUpdate( title: '工单类型', colProps: { span: 24 }, // valueEnum: HouseWorkOrdersTypeEnum, - valueEnum: props?.item?.typeEnum, + valueEnum: () => { + let obj: any = JSON.parse(JSON.stringify(HouseWorkOrdersTypeEnum)); + delete obj.Complaint; + return obj; + }, required: true, }), {