feat：仪表房屋导入；

.umirc.ts

@@ -16,8 +16,8 @@ export default defineConfig({
     '/api/': {
       // target: 'http://yt:8003',
       // target: 'http://10.39.13.78:8001/',
-      // target: 'https://test-admin.linyikj.com.cn/',
+      target: 'https://test-admin.linyikj.com.cn/',
-      target: 'https://admin.linyikj.com.cn/',
+      // target: 'https://admin.linyikj.com.cn/',
       // target: 'http://c789629c.natappfree.cc',
 
       changeOrigin: true,

gencode.json

@@ -1,4 +1,4 @@
 {
-  "url": "http://c789629c.natappfree.cc/api/docs/openapi",
+  "url": "http://10.39.13.78:8001/api/docs/openapi",
   "module": "Admin"
 }

src/components/Select.tsx

@@ -593,7 +593,7 @@ export const Selects = {
         });
         res?.data?.map((l: any) => {
           l.label = l.id + ':' + l.name;
-          l.value = l.house_meter_has_houses[0].asset_houses_id;
+          l.value = l.id;
         });
         return res?.data;
       },

src/gen/ApiTypes.d.ts

@@ -5,6 +5,7 @@ declare namespace ApiTypes {
         "title"?: string; // 模糊搜索：名称 
         "status"?: string; // 状态,[enum:ActivitiesStatusEnum] 
         "publish_status"?: string; // 发布状态,[enum:ActivitiesPublishStatusEnum] 
+        "asset_projects_id"?: number; // 项目ID,[ref:asset_projects] 
       };
       type Store = {
         "title": string; // 活动标题 
@@ -1307,7 +1308,7 @@ declare namespace ApiTypes {
   namespace HouseOrder {
     namespace HouseOrderPayments {
       type List = {
-        "house_orders_id": number; // 订单ID 
+        "house_orders_id"?: number; // 订单ID 
         "payment_no"?: string; // 模糊搜索：支付单号 
         "transaction_id"?: string; // 模糊搜索：交易号(微信、支付宝的单号 
         "third_trade_no"?: string; // 第三方交易号(如通联、乐刷) 
@@ -1358,6 +1359,9 @@ declare namespace ApiTypes {
       type Delete = {
         "id": number; // id 
       };
+      type Import = {
+        "upload_file"?: mimes:xlsx,xls; // 上传的时候必填文件 
+      };
     }
     namespace HouseMeterReadings {
       type List = {
@@ -1441,6 +1445,7 @@ declare namespace ApiTypes {
         "asset_projects_id"?: number; // 项目id,[ref:asset_projects] 
         "project_name"?: string; // 模糊搜索：项目名称 
         "charge_standards_id"?: number; // 房屋收费标准id,[ref:house_charge_standards] 
+        "meter_type"?: string; // 仪表类型,[enum:HouseMetersMeterTypeEnum] 
       };
       type Store = {
         "asset_projects_id": number; // 项目id,[ref:asset_projects] 

src/gen/Apis.ts

@@ -773,7 +773,7 @@ export const Apis = {
   },
   HouseOrder: {
     HouseOrderPayments: {
-      List(data: ApiTypes.HouseOrder.HouseOrderPayments.List): Promise<MyResponseType> {
+      List(data?: ApiTypes.HouseOrder.HouseOrderPayments.List): Promise<MyResponseType> {
         return request('admin/house_order/house_order_payments/list', { data });
       },
       Show(data: ApiTypes.HouseOrder.HouseOrderPayments.Show): Promise<MyResponseType> {
@@ -815,6 +815,12 @@ export const Apis = {
       Delete(data: ApiTypes.Meter.HouseMeterHasHouses.Delete): Promise<MyResponseType> {
         return request('admin/meter/house_meter_has_houses/delete', { data });
       },
+      Import(data?: ApiTypes.Meter.HouseMeterHasHouses.Import): Promise<MyResponseType> {
+        return request('admin/meter/house_meter_has_houses/import', { data });
+      },
+      DownloadTemplate(): Promise<MyResponseType> {
+        return request('admin/meter/house_meter_has_houses/download_template', {responseType: 'blob',});
+      },
     },
     HouseMeterReadings: {
       List(data: ApiTypes.Meter.HouseMeterReadings.List): Promise<MyResponseType> {

src/gen/Enums.ts

@@ -154,7 +154,7 @@ export const BannersTypeEnum= {
 
 // 缓存类型
 export const CacheTypeEnum= {
-  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#dc15e2","value":"MobilePhoneVerificationCode"}, 
+  'MobilePhoneVerificationCode': {"text":"手机验证码","color":"#7db989","value":"MobilePhoneVerificationCode"}, 
 };
 
 // CompaniesMerchantTypeEnum

src/pages/asset/activities/index.tsx

@@ -100,13 +100,13 @@ export default function Index({ title = '项目活动' }) {
             render: (_, item: any, index, action) => (
               <Space key={index}>
                 <ActivityShow item={item} />
-                {(!item.end_time || new Date(item.end_time) > new Date()) && (
+                {/* {(!item.end_time || new Date(item.end_time) > new Date()) && (
+                )} */}
                 <ActivityUpdate
                   item={item}
                   reload={action?.reload}
                   // title={title}
                 />
-                )}
                 {/* {(!item.end_time || new Date(item.end_time) > new Date()) && (
                   <MyButtons.Default
                     title={

src/pages/asset/activities/modals/ActivityShow.tsx

@@ -38,7 +38,7 @@ export default function Show(props: MyBetaModalFormProps) {
     <MyModal
       title={props.title || '查看'}
       width={800}
-      onOpen={getShow}
+      onOpen={() => getShow()}
       node={
         <ProCard>
           <Spin spinning={loading}>

src/pages/charge/tasks/modals/TaskShow.tsx

@@ -11,7 +11,7 @@ import { ProTable } from '@ant-design/pro-components';
 import { useNavigate } from '@umijs/max';
 import { Space } from 'antd';
 
-export default function AssetInfo(props: MyBetaModalFormProps) {
+export default function TaskShow(props: MyBetaModalFormProps) {
   const navigate = useNavigate();
   return (
     <MyModal
@@ -32,7 +32,7 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
           columns={[
             MyColumns.ID(),
             {
-              title: '对象',
+              title: '关联房屋',
               dataIndex: 'full_name',
               search: false,
               render: (_, record) => (
@@ -64,6 +64,7 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
                   '0',
                 )}`;
               },
+              search: false,
             },
             {
               title: '计费周期',

src/pages/complaint/components/WorkLogsCreate.tsx

@@ -0,0 +1,82 @@
+import {
+  MyButtons,
+  MyFormItems,
+  MyModalFormProps,
+  rulesHelper,
+} from '@/common';
+import { Apis } from '@/gen/Apis';
+import { HouseWorkOrdersStatusEnum } from '@/gen/Enums';
+import { BetaSchemaForm } from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+
+interface WorkLogsCreateProps {
+  workOrderId: number;
+  reload?: () => void;
+}
+
+export default function WorkLogsCreate({
+  workOrderId,
+  reload,
+}: WorkLogsCreateProps) {
+  const [form] = Form.useForm();
+
+  return (
+    <BetaSchemaForm<ApiTypes.WorkOrder.HouseWorkLogs.Store>
+      {...MyModalFormProps.props}
+      title={`添加处理记录`}
+      wrapperCol={{ span: 24 }}
+      width="600px"
+      trigger={<MyButtons.Create title={`添加处理记录`} />}
+      onOpenChange={(open: any) => {
+        if (open) {
+          form.resetFields(); // 清空表单数据
+        }
+      }}
+      key={new Date().getTime()}
+      form={form}
+      onFinish={async (values) => {
+        try {
+          await Apis.WorkOrder.HouseWorkLogs.Store({
+            ...values,
+            house_work_orders_id: workOrderId,
+          });
+          reload?.();
+          message.success('添加处理记录成功');
+          return true;
+        } catch (error) {
+          message.error('添加处理记录失败');
+          return false;
+        }
+      }}
+      columns={[
+        MyFormItems.EnumRadio({
+          key: 'status',
+          title: '工单状态',
+          colProps: { span: 24 },
+          valueEnum: HouseWorkOrdersStatusEnum,
+          required: true,
+          formItemProps: { ...rulesHelper.text },
+        }),
+        {
+          key: 'description',
+          title: '进度描述',
+          valueType: 'textarea',
+          colProps: { span: 24 },
+          formItemProps: { ...rulesHelper.text },
+          fieldProps: {
+            rows: 4,
+            placeholder: '请输入处理进度描述',
+          },
+        },
+        MyFormItems.UploadImages({
+          key: 'attachments',
+          title: '相关图片',
+          uploadType: 'file',
+          max: 5,
+          colProps: { span: 24 },
+          formItemProps: { required: false },
+        }),
+      ]}
+    />
+  );
+}

src/pages/complaint/components/WorkLogsLIst.tsx

@@ -0,0 +1,143 @@
+import { MyButtons, MyColumns, MyProTableProps } from '@/common';
+import { Apis } from '@/gen/Apis';
+import { HouseWorkOrdersStatusEnum } from '@/gen/Enums';
+import { ProTable } from '@ant-design/pro-components';
+import { Image, Space } from 'antd';
+import { useEffect, useRef } from 'react';
+import WorkLogsCreate from './WorkLogsCreate';
+
+interface WorkLogsListProps {
+  workOrderId: number;
+  reload?: () => void;
+}
+
+export default function WorkLogsList({
+  workOrderId,
+  reload,
+}: WorkLogsListProps) {
+  const actionRef = useRef<any>();
+
+  useEffect(() => {
+    actionRef?.current?.reload();
+  }, [workOrderId]);
+
+  return (
+    <>
+      <ProTable<Record<any, any>>
+        {...MyProTableProps.props}
+        actionRef={actionRef}
+        request={async (params, sort) =>
+          MyProTableProps.request(
+            {
+              ...params,
+              house_work_orders_id: workOrderId,
+            },
+            sort,
+            Apis.WorkOrder.HouseWorkLogs.List,
+          )
+        }
+        toolBarRender={(action) => [
+          <WorkLogsCreate
+            key="CreateWorkLog"
+            workOrderId={workOrderId}
+            reload={() => {
+              action?.reload();
+              reload?.();
+            }}
+          />,
+        ]}
+        search={false}
+        pagination={{
+          pageSize: 10,
+          showSizeChanger: false,
+        }}
+        columns={[
+          MyColumns.ID(),
+          MyColumns.EnumTag({
+            title: '工单状态',
+            dataIndex: 'status',
+            valueEnum: HouseWorkOrdersStatusEnum,
+            search: false,
+          }),
+          {
+            title: '进度描述',
+            dataIndex: 'description',
+            search: false,
+            ellipsis: true,
+          },
+
+          {
+            title: '附件',
+            dataIndex: 'attachments',
+            search: false,
+            render: (_, record) => {
+              if (
+                !Array.isArray(record.attachments) ||
+                record.attachments.length === 0
+              ) {
+                return '无附件';
+              }
+              return (
+                <div style={{ display: 'flex', flexWrap: 'wrap' }}>
+                  {record.attachments.map((item: any, index: number) => {
+                    if (item.type && item.type.includes('image')) {
+                      return (
+                        <Image
+                          key={index}
+                          width={40}
+                          height={30}
+                          style={{
+                            marginRight: 8,
+                            marginBottom: 8,
+                            objectFit: 'cover',
+                          }}
+                        />
+                      );
+                    } else if (item.type && item.type.includes('video')) {
+                      return (
+                        <video
+                          key={index}
+                          width={40}
+                          height={30}
+                          controls
+                          style={{
+                            marginRight: 8,
+                            marginBottom: 8,
+                            objectFit: 'cover',
+                          }}
+                          src={item.url}
+                        />
+                      );
+                    }
+                    return null;
+                  })}
+                </div>
+              );
+            },
+          },
+          {
+            title: '创建时间',
+            dataIndex: 'created_at',
+            valueType: 'dateTime',
+            search: false,
+            width: 160,
+          },
+          MyColumns.UpdatedAt(),
+          MyColumns.Option({
+            render: (_, item: any, index, action) => (
+              <Space key={index}>
+                <MyButtons.Delete
+                  onConfirm={() =>
+                    Apis.WorkOrder.HouseWorkLogs.Delete({
+                      id: item.id,
+                    }).then(() => action?.reload())
+                  }
+                />
+              </Space>
+            ),
+          }),
+        ]}
+      />
+    </>
+  );
+}

src/pages/complaint/index.tsx

@@ -0,0 +1,184 @@
+import {
+  MyButtons,
+  MyColumns,
+  MyPageContainer,
+  MyProTableProps,
+  usePageTabs,
+} from '@/common';
+import { Apis } from '@/gen/Apis';
+import {
+  HouseWorkOrdersAssignStatusEnum,
+  HouseWorkOrdersLevelEnum,
+  HouseWorkOrdersStatusEnum,
+  HouseWorkOrdersTypeEnum,
+} from '@/gen/Enums';
+import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+import { Image, Space } from 'antd';
+import ComplaintAssign from './modals/ComplaintAssign';
+
+import ComplaintShow from './modals/ComplaintShow';
+
+export default function Index({ title = '投诉列表' }) {
+  const navigate = useNavigate();
+
+  // 注册当前页面为标签页
+  usePageTabs({
+    tabKey: 'complaint',
+    tabLabel: title,
+  });
+
+  return (
+    <MyPageContainer
+      title={title}
+      enableTabs={true}
+      tabKey="complaint"
+      tabLabel={title}
+    >
+      <ProTable
+        {...MyProTableProps.props}
+        request={async (params, sort) =>
+          MyProTableProps.request(
+            { ...params, type: HouseWorkOrdersTypeEnum.Complaint.value },
+            sort,
+            Apis.WorkOrder.HouseWorkOrders.List,
+          )
+        }
+        // toolBarRender={(action) => [
+        //   <WorkOrderCreate
+        //     key="Create"
+        //     reload={action?.reload}
+        //     title={title}
+        //   />,
+        // ]}
+        columns={[
+          MyColumns.ID(),
+          MyColumns.EnumTag({
+            title: '状态',
+            dataIndex: 'status',
+            valueEnum: HouseWorkOrdersStatusEnum,
+          }),
+          {
+            title: '描述',
+            dataIndex: 'content',
+            width: 120, // 关键：固定列宽（若父容器过窄，可设 minWidth: 200 优先保证列宽）
+            search: false,
+            render: (text) => (
+              <div
+                style={{
+                  width: '100%', // 继承列宽
+                  // height: '60px', // 设置固定高度，约显示3行文本
+                  overflow: 'hidden', // 超出隐藏
+                  textOverflow: 'ellipsis', // 省略号
+                  display: '-webkit-box',
+                  WebkitBoxOrient: 'vertical',
+                  WebkitLineClamp: 1, // 显示3行
+                }}
+              >
+                {text}
+              </div>
+            ),
+          },
+          {
+            title: '附件',
+            dataIndex: 'attachments',
+            search: false,
+            render: (_, record) => {
+              if (
+                !Array.isArray(record.attachments) ||
+                record.attachments.length === 0
+              ) {
+                return '无附件';
+              }
+              return (
+                <div style={{ display: 'flex', flexWrap: 'wrap' }}>
+                  {record.attachments.map((item: any, index: number) => {
+                    if (item.type && item.type.includes('image')) {
+                      return (
+                        <Image
+                          key={index}
+                          width={40}
+                          height={30}
+                          src={item.url}
+                          style={{
+                            marginRight: 8,
+                            marginBottom: 8,
+                            objectFit: 'cover',
+                          }}
+                        />
+                      );
+                    } else if (item.type && item.type.includes('video')) {
+                      return (
+                        <video
+                          key={index}
+                          width={40}
+                          height={30}
+                          controls
+                          style={{
+                            marginRight: 8,
+                            marginBottom: 8,
+                            objectFit: 'cover',
+                          }}
+                          src={item.url}
+                        />
+                      );
+                    }
+                    return null;
+                  })}
+                </div>
+              );
+            },
+          },
+          MyColumns.EnumTag({
+            title: '分配状态',
+            dataIndex: 'assign_status',
+            valueEnum: HouseWorkOrdersAssignStatusEnum,
+          }),
+          MyColumns.EnumTag({
+            title: '优先级',
+            dataIndex: 'level',
+            valueEnum: HouseWorkOrdersLevelEnum,
+          }),
+          {
+            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) => (
+              <Space key={index}>
+                <ComplaintShow
+                  item={item}
+                  title="详情"
+                  reload={action?.reload}
+                />
+
+                {item.assign_status === 'Unassigned' && (
+                  <ComplaintAssign
+                    item={item}
+                    reload={action?.reload}
+                    title="分配"
+                  />
+                )}
+
+                <MyButtons.Delete
+                  onConfirm={() =>
+                    Apis.WorkOrder.HouseWorkOrders.SoftDelete({
+                      id: item.id,
+                    }).then(() => action?.reload())
+                  }
+                />
+              </Space>
+            ),
+          }),
+        ]}
+      />
+    </MyPageContainer>
+  );
+}

src/pages/complaint/modals/ComplaintAssign.tsx

@@ -0,0 +1,88 @@
+import {
+  MyBetaModalFormProps,
+  MyButtons,
+  MyFormItems,
+  MyModalFormProps,
+  rulesHelper,
+} from '@/common';
+import { Selects } from '@/components/Select';
+import { Apis } from '@/gen/Apis';
+import { HouseWorkOrdersLevelEnum } from '@/gen/Enums';
+import { BetaSchemaForm } from '@ant-design/pro-components';
+import { Form, message } from 'antd';
+
+export default function WorkOrderAssign(
+  props: MyBetaModalFormProps & { item: any },
+) {
+  const [form] = Form.useForm();
+  return (
+    <BetaSchemaForm<ApiTypes.WorkOrder.HouseWorkOrders.Assign>
+      {...MyModalFormProps.props}
+      title={`派发工单`}
+      wrapperCol={{ span: 24 }}
+      width="500px"
+      trigger={<MyButtons.Edit title={`派发`} />}
+      key={new Date().getTime()}
+      form={form}
+      request={async () => {
+        const res = await Apis.WorkOrder.HouseWorkOrders.Show({
+          id: props.item.id,
+        });
+        return {
+          title: res.data.title,
+          assign_employee_id: res.data.assign_employee_id,
+        };
+      }}
+      onFinish={async (values) =>
+        Apis.WorkOrder.HouseWorkOrders.Assign({
+          ...values,
+          id: props.item.id,
+        })
+          .then(() => {
+            props.reload?.();
+            message.success('指派工单成功');
+            return true;
+          })
+          .catch(() => false)
+      }
+      columns={[
+        {
+          key: 'content',
+          title: '工单描述',
+          colProps: { span: 24 },
+          readonly: true,
+          fieldProps: {
+            disabled: true,
+          },
+        },
+        MyFormItems.EnumRadio({
+          key: 'level',
+          title: '优先级',
+          colProps: { span: 24 },
+          valueEnum: HouseWorkOrdersLevelEnum,
+          required: true,
+        }),
+        Selects?.Employees({
+          title: '选择处理人',
+          key: 'assign_employees_id',
+          colProps: { span: 24 },
+          formItemProps: { ...rulesHelper.text },
+          params: {
+            companies_id: props.item.companies_id,
+          },
+          required: true,
+        }),
+        {
+          key: 'assign_remark',
+          title: '指派备注',
+          valueType: 'textarea',
+          colProps: { span: 24 },
+          fieldProps: {
+            rows: 3,
+            placeholder: '请输入指派备注（可选）',
+          },
+        },
+      ]}
+    />
+  );
+}

src/pages/complaint/modals/ComplaintShow.tsx

@@ -0,0 +1,251 @@
+import { MyButtons } from '@/common';
+import { Apis } from '@/gen/Apis';
+import {
+  HouseWorkOrdersAssignStatusEnum,
+  HouseWorkOrdersLevelEnum,
+  HouseWorkOrdersStatusEnum,
+} from '@/gen/Enums';
+import { ProDescriptions } from '@ant-design/pro-components';
+import { Image, Modal, Space, Tag } from 'antd';
+import { useState } from 'react';
+import WorkLogsList from '../components/WorkLogsLIst';
+import WorkOrderAssign from './ComplaintAssign';
+
+interface WorkOrderShowProps {
+  item: any;
+  title?: string;
+  reload?: () => void;
+}
+
+export default function ComplaintShow({
+  item,
+  title = '投诉详情',
+  reload,
+}: WorkOrderShowProps) {
+  const [open, setOpen] = useState(false);
+  const [data, setData] = useState<any>(null);
+
+  const handleOpen = async () => {
+    try {
+      const res = await Apis.WorkOrder.HouseWorkOrders.Show({ id: item.id });
+      setData(res.data);
+      setOpen(true);
+    } catch (error) {
+      console.error('获取投诉详情失败:', error);
+    }
+  };
+
+  return (
+    <>
+      <MyButtons.Default onClick={handleOpen} title={title} />
+      <Modal
+        title={title}
+        open={open}
+        onCancel={() => setOpen(false)}
+        footer={null}
+        width={800}
+      >
+        {data && (
+          <>
+            <ProDescriptions
+              column={2}
+              dataSource={data}
+              columns={[
+                // {
+                //   title: '工单类型',
+                //   dataIndex: 'type',
+                //   span: 1,
+                //   render: (_, record) => (
+                //     <Tag color="blue">
+                //       {HouseWorkOrdersTypeEnum[
+                //         record.type as keyof typeof HouseWorkOrdersTypeEnum
+                //       ]?.text || record.type}
+                //     </Tag>
+                //   ),
+                // },
+                // {
+                //   title: '报修位置',
+                //   dataIndex: 'location',
+                //   span: 1,
+                //   render: (_, record) => {
+                //     const locationConfig =
+                //       HouseWorkOrdersLocationEnum[
+                //         record.location as keyof typeof HouseWorkOrdersLocationEnum
+                //       ];
+
+                //     return <Tag>{locationConfig?.text || record.location}</Tag>;
+                //   },
+                // },
+
+                {
+                  title: 'ID',
+                  dataIndex: 'id',
+                  span: 1,
+                },
+
+                {
+                  title: '投诉描述',
+                  dataIndex: 'content',
+                  span: 2,
+                },
+
+                {
+                  title: '投诉状态',
+                  dataIndex: 'status',
+                  span: 1,
+                  render: (_, record) => {
+                    const statusConfig =
+                      HouseWorkOrdersStatusEnum[
+                        record.status as keyof typeof HouseWorkOrdersStatusEnum
+                      ];
+                    const color =
+                      record.status === 'Completed'
+                        ? 'green'
+                        : record.status === 'InProgress'
+                        ? 'blue'
+                        : 'default';
+                    return (
+                      <Tag color={color}>
+                        {statusConfig?.text || record.status}
+                      </Tag>
+                    );
+                  },
+                },
+                {
+                  title: '分配状态',
+                  dataIndex: 'assign_status',
+                  span: 1,
+                  render: (_, record) => {
+                    const assignConfig =
+                      HouseWorkOrdersAssignStatusEnum[
+                        record.assign_status as keyof typeof HouseWorkOrdersAssignStatusEnum
+                      ];
+                    const color =
+                      record.assign_status === 'Assigned' ? 'green' : 'orange';
+                    return (
+                      <Tag color={color}>
+                        {assignConfig?.text || record.assign_status}
+                      </Tag>
+                    );
+                  },
+                },
+                {
+                  title: '优先级',
+                  dataIndex: 'level',
+                  span: 1,
+                  render: (_, record) => {
+                    const levelConfig =
+                      HouseWorkOrdersLevelEnum[
+                        record.level as keyof typeof HouseWorkOrdersLevelEnum
+                      ];
+                    return <Tag>{levelConfig?.text || record.level}</Tag>;
+                  },
+                },
+                {
+                  title: '处理人',
+                  dataIndex: 'assign_employee_name',
+                  span: 1,
+                  render: (_, record) => {
+                    const assigneeInfo = record?.assign_employee
+                      ? `${record.assign_employee.name || ''}-${
+                          record.assign_employee.phone || ''
+                        }`
+                      : '未分配';
+                    return (
+                      <Space>
+                        <span>{assigneeInfo}</span>
+                        <WorkOrderAssign
+                          item={item}
+                          reload={handleOpen}
+                          title="重新分配"
+                        />
+                      </Space>
+                    );
+                  },
+                },
+
+                {
+                  title: '创建时间',
+                  dataIndex: 'created_at',
+                  span: 1,
+                  valueType: 'dateTime',
+                },
+                {
+                  title: '更新时间',
+                  dataIndex: 'updated_at',
+                  span: 1,
+                  valueType: 'dateTime',
+                },
+                {
+                  title: '相关附件',
+                  dataIndex: 'attachments',
+                  span: 2,
+                  render: (_, record) => {
+                    // 检查attachments是否为数组且有数据
+                    if (
+                      !Array.isArray(record.attachments) ||
+                      record.attachments.length === 0
+                    ) {
+                      return '无附件';
+                    }
+                    return (
+                      <div
+                        style={{
+                          display: 'flex',
+                          flexWrap: 'wrap',
+                          marginRight: 10,
+                        }}
+                      >
+                        {record.attachments.map((item: any, index: number) => {
+                          if (item.type && item.type.includes('image')) {
+                            return (
+                              <Image
+                                key={index}
+                                width={120}
+                                height={90}
+                                src={item.url}
+                                style={{
+                                  marginRight: 8,
+                                  marginBottom: 8,
+                                  objectFit: 'cover',
+                                }}
+                              />
+                            );
+                          } else if (item.type && item.type.includes('video')) {
+                            return (
+                              <video
+                                key={index}
+                                width={120}
+                                height={90}
+                                controls
+                                style={{
+                                  marginRight: 8,
+                                  marginBottom: 8,
+                                  objectFit: 'cover',
+                                }}
+                                src={item.url}
+                              />
+                            );
+                          }
+                          return null;
+                        })}
+                      </div>
+                    );
+                  },
+                },
+              ]}
+            />
+            {/* <Divider orientation="left">处理记录</Divider> */}
+            <WorkLogsList
+              workOrderId={data.id}
+              reload={() => {
+                handleOpen();
+                reload?.();
+              }}
+            />
+          </>
+        )}
+      </Modal>
+    </>
+  );
+}

src/pages/meter/list/index.tsx

@@ -44,13 +44,22 @@ export default function Index({ title = '仪表管理' }) {
         toolBarRender={(action) => [
           <MyImportModal
             key="ImportHouse"
-            title="批量导入"
+            title="导入仪表"
             type="danger"
             size="middle"
             templateApi={Apis.Meter.HouseMeters.DownloadTemplate}
             importApi={Apis.Meter.HouseMeters.Import}
             reload={action?.reload}
           />,
+          <MyImportModal
+            key="ImportHouse"
+            title="导入关联房屋"
+            type="danger"
+            size="middle"
+            templateApi={Apis.Meter.HouseMeterHasHouses.DownloadTemplate}
+            importApi={Apis.Meter.HouseMeterHasHouses.Import}
+            reload={action?.reload}
+          />,
           <CompanyCreate key="Create" reload={action?.reload} title={title} />,
         ]}
         columns={[

src/pages/meter/readings/show/$id.tsx

@@ -7,6 +7,7 @@ import { useEffect, useState } from 'react';
 import MeteInfo from '../components/MeteInfo';
 import HasHouse from '../table/HasHouse';
 import ReadingLIst from '../table/ReadingLIst';
+import Tasks from '../table/Tasks';
 
 export default function Show({ title = '仪表详情' }) {
   const { id } = useParams<{ id: string }>();
@@ -58,6 +59,12 @@ export default function Show({ title = '仪表详情' }) {
       closable: false,
       children: <HasHouse item={{ ...data, id: id }} />,
     },
+    {
+      label: '仪表任务',
+      key: '3',
+      closable: false,
+      children: <Tasks item={{ ...data, id: id }} />,
+    },
   ];
 
   return (

src/pages/meter/readings/table/HasHouse.tsx

@@ -10,7 +10,6 @@ import { ProTable } from '@ant-design/pro-components';
 import { Space } from 'antd';
 import MeterHasHouse from '../../list/modals/MeterHasHouse';
 import MeterHasOne from '../../list/modals/MeterHasOne';
-import NormalReading from '../modals/NormalReading';
 
 export default function Index(props: MyBetaModalFormProps) {
   return (
@@ -25,12 +24,6 @@ export default function Index(props: MyBetaModalFormProps) {
           )
         }
         toolBarRender={(action) => [
-          <NormalReading
-            key="Create"
-            reload={action?.reload}
-            item={props?.item}
-            title="抄表"
-          />,
           ...(props?.item?.meter_type ===
           HouseMetersMeterTypeEnum.HouseMeter.value
             ? [

src/pages/meter/readings/table/Tasks.tsx

@@ -0,0 +1,111 @@
+import {
+  MyBetaModalFormProps,
+  MyButtons,
+  MyColumns,
+  MyProTableProps,
+} from '@/common';
+import { Apis } from '@/gen/Apis';
+import { HouseChargeTaskDetailsStatusEnum } from '@/gen/Enums';
+import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+import { Space } from 'antd';
+
+export default function Index(props: MyBetaModalFormProps) {
+  const navigate = useNavigate();
+  return (
+    <>
+      <ProTable
+        {...MyProTableProps.props}
+        request={async (params, sort) =>
+          MyProTableProps.request(
+            { ...params, id: props?.item?.id },
+            sort,
+            Apis.Meter.HouseMeterTaskDetails.List,
+          )
+        }
+        // toolBarRender={(action) => [
+        //   <NormalReading
+        //     key="Create"
+        //     reload={action?.reload}
+        //     item={props?.item}
+        //     title="抄表"
+        //   />,
+        //   <ResetReading
+        //     key="Reset"
+        //     reload={action?.reload}
+        //     item={props?.item}
+        //     title="重置"
+        //   />,
+        // ]}
+        // search={false}
+        // options={false}
+        columns={[
+          MyColumns.ID(),
+          {
+            title: '仪表名称',
+            dataIndex: ['meter_data', 'name'],
+            search: false,
+          },
+          {
+            title: '关联房屋',
+            dataIndex: 'full_name',
+            search: false,
+            render: (_, record) => (
+              <MyButtons.View
+                title={record.full_name}
+                type="link"
+                onClick={() => {
+                  navigate(`/bills/summary/show/${record.asset_houses_id}`);
+                }}
+              />
+            ),
+          },
+          MyColumns.EnumTag({
+            title: '状态',
+            dataIndex: 'status',
+            valueEnum: HouseChargeTaskDetailsStatusEnum,
+          }),
+
+          {
+            title: '收费标准',
+            dataIndex: ['charge_standard', 'name'],
+            render: (_, record) => {
+              return `【${record.charge_standard.id}】${record.charge_standard.name}`;
+            },
+            search: false,
+          },
+          {
+            title: '账单月份',
+            render: (_, record) => {
+              return `${record.year}-${String(record.month).padStart(2, '0')}`;
+            },
+            search: false,
+          },
+          {
+            title: '完成时间',
+            dataIndex: 'processed_time',
+            search: false,
+          },
+          MyColumns.Option({
+            render: (_, item: any, index, action) => (
+              <Space key={index}>
+                <MyButtons.Default
+                  title="重新执行"
+                  type="link"
+                  color="primary"
+                  isConfirm
+                  description="确认执行此任务吗？"
+                  onConfirm={() =>
+                    Apis.HouseCharage.HouseChargeTaskDetails.CreateHouseBill({
+                      id: item.id,
+                    }).then(() => action?.reload())
+                  }
+                />
+              </Space>
+            ),
+          }),
+        ]}
+      />
+    </>
+  );
+}

src/pages/meter/tasks/index.tsx

@@ -95,7 +95,6 @@ export default function Index({ title = '仪表账单' }) {
             render: (_, item: any, index, action) => (
               <Space key={index}>
                 <TaskShow item={item} title="查看" reload={action?.reload} />
-
                 <MyButtons.Default
                   title={
                     item.status ===

src/pages/meter/tasks/modals/TaskShow.tsx

@@ -1,10 +1,18 @@
-import { MyBetaModalFormProps, MyColumns, MyProTableProps } from '@/common';
+import {
+  MyBetaModalFormProps,
+  MyButtons,
+  MyColumns,
+  MyProTableProps,
+} from '@/common';
 import { MyModal } from '@/components/MyModal';
 import { Apis } from '@/gen/Apis';
 import { HouseChargeTaskDetailsStatusEnum } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+import { Space } from 'antd';
 
-export default function AssetInfo(props: MyBetaModalFormProps) {
+export default function TaskShow(props: MyBetaModalFormProps) {
+  const navigate = useNavigate();
   return (
     <MyModal
       title={props.title || '查看'}
@@ -20,12 +28,27 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
               Apis.Meter.HouseMeterTaskDetails.List,
             )
           }
+          options={false}
           columns={[
             MyColumns.ID(),
             {
-              title: '对象',
+              title: '仪表名称',
+              dataIndex: ['meter_data', 'name'],
+              search: false,
+            },
+            {
+              title: '关联房屋',
               dataIndex: 'full_name',
               search: false,
+              render: (_, record) => (
+                <MyButtons.View
+                  title={record.full_name}
+                  type="link"
+                  onClick={() => {
+                    navigate(`/bills/summary/show/${record.asset_houses_id}`);
+                  }}
+                />
+              ),
             },
             MyColumns.EnumTag({
               title: '状态',
@@ -35,7 +58,10 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
 
             {
               title: '收费标准',
-              dataIndex: ['house_charge_task', 'house_charge_standard', 'name'],
+              dataIndex: ['charge_standard', 'name'],
+              render: (_, record) => {
+                return `【${record.charge_standard.id}】${record.charge_standard.name}`;
+              },
               search: false,
             },
             {
@@ -46,14 +72,6 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
                   '0',
                 )}`;
               },
-            },
-            {
-              title: '计费周期',
-              render: (_, record) => {
-                return `${record.house_charge_task.start_date} 至 ${String(
-                  record.house_charge_task.end_date,
-                ).padStart(2, '0')}`;
-              },
               search: false,
             },
             {
@@ -61,6 +79,24 @@ export default function AssetInfo(props: MyBetaModalFormProps) {
               dataIndex: 'processed_time',
               search: false,
             },
+            MyColumns.Option({
+              render: (_, item: any, index, action) => (
+                <Space key={index}>
+                  <MyButtons.Default
+                    title="重新执行"
+                    type="link"
+                    color="primary"
+                    isConfirm
+                    description="确认执行此任务吗？"
+                    onConfirm={() =>
+                      Apis.HouseCharage.HouseChargeTaskDetails.CreateHouseBill({
+                        id: item.id,
+                      }).then(() => action?.reload())
+                    }
+                  />
+                </Space>
+              ),
+            }),
           ]}
         />
       }

src/pages/order/list/index.tsx

@@ -1,4 +1,5 @@
 import {
+  MyButtons,
   MyColumns,
   MyPageContainer,
   MyProTableProps,
@@ -10,8 +11,10 @@ import {
   HouseOrdersPaymentMethodEnum,
 } from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
+import { Space } from 'antd';
+import Payments from './modals/Payments';
 
-export default function Index({ title = '支付明细' }) {
+export default function Index({ title = '支付订单' }) {
   // 注册当前页面为标签页
   usePageTabs({
     tabKey: 'house_order',
@@ -44,10 +47,10 @@ export default function Index({ title = '支付明细' }) {
         //     importApi={Apis.Bill.HouseBills.Import}
         //     reload={action?.reload}
         //   />,
-        //   <BillCreate key="Create" reload={action?.reload} title={title} />,
         // ]}
         columns={[
-          // MyColumns.ID(),
+          MyColumns.ID(),
+
           {
             title: '订单号',
             dataIndex: 'order_code',
@@ -63,32 +66,22 @@ export default function Index({ title = '支付明细' }) {
             dataIndex: 'order_status',
             valueEnum: HouseOrdersOrderStatusEnum,
           }),
-
-          // {
-          //   title: '支付单号',
-          //   dataIndex: 'payment_no',
-          //   search: false,
-          // },
           {
             title: '应收金额',
+            dataIndex: 'amount',
+            search: false,
+          },
+          {
+            title: '实收金额',
             dataIndex: 'actual_paid_amount',
             search: false,
           },
           {
-            title: '滞纳金',
+            title: '退款金额',
-            dataIndex: 'late_fee',
-            search: false,
-          },
-          {
-            title: '退款总金额',
             dataIndex: 'refund_amount',
             search: false,
           },
-          {
+
-            title: '实缴金额',
-            dataIndex: 'actual_paid_amount',
-            search: false,
-          },
           {
             title: '收款账号',
             dataIndex: ['house_order_items', 'receipt_account'],
@@ -114,20 +107,20 @@ export default function Index({ title = '支付明细' }) {
           },
 
           // MyColumns.CreatedAt(),
-          // MyColumns.Option({
+          MyColumns.Option({
-          //   render: (_, item: any, index, action) => (
+            render: (_, item: any, index, action) => (
-          //     <Space key={index}>
+              <Space key={index}>
-          //       <BillUpdate item={item} reload={action?.reload} title={title} />
+                <Payments item={item} title="查看" reload={action?.reload} />
-          //       <MyButtons.Delete
+                <MyButtons.Delete
-          //         onConfirm={() =>
+                  onConfirm={() =>
-          //           Apis.Common.Admins.Delete({ id: item.id }).then(() =>
+                    Apis.Common.Admins.Delete({ id: item.id }).then(() =>
-          //             action?.reload(),
+                      action?.reload(),
-          //           )
+                    )
-          //         }
+                  }
-          //       />
+                />
-          //     </Space>
+              </Space>
-          //   ),
+            ),
-          // }),
+          }),
         ]}
       />
     </MyPageContainer>

src/pages/order/list/modals/Payments.tsx

@@ -0,0 +1,79 @@
+import { MyBetaModalFormProps, MyColumns, MyProTableProps } from '@/common';
+import { MyModal } from '@/components/MyModal';
+import { Apis } from '@/gen/Apis';
+import {
+  HouseOrdersOrderStatusEnum,
+  HouseOrdersPaymentMethodEnum,
+} from '@/gen/Enums';
+import { ProTable } from '@ant-design/pro-components';
+import { useNavigate } from '@umijs/max';
+
+export default function TaskShow(props: MyBetaModalFormProps) {
+  const navigate = useNavigate();
+  return (
+    <MyModal
+      title={props.title || '查看'}
+      type={props.item?.type || 'primary'}
+      width="1000px"
+      node={
+        <ProTable
+          {...MyProTableProps.props}
+          request={async (params, sort) =>
+            MyProTableProps.request(
+              { ...params, house_orders_id: props?.item?.id },
+              sort,
+              Apis.HouseOrder.HouseOrderPayments.List,
+            )
+          }
+          // options={false}
+          columns={[
+            MyColumns.ID(),
+            MyColumns.EnumTag({
+              title: '支付状态',
+              dataIndex: 'payment_status',
+              valueEnum: HouseOrdersOrderStatusEnum,
+            }),
+            MyColumns.EnumTag({
+              title: '支付方式',
+              dataIndex: 'payment_method',
+              valueEnum: HouseOrdersPaymentMethodEnum,
+            }),
+            {
+              title: '账单金额',
+              dataIndex: 'amount',
+              render: (value: any) => `${value / 100}元`,
+              search: false,
+            },
+            {
+              title: '实际金额',
+              dataIndex: 'actual_amount',
+              render: (value: any) => `${value / 100}元`,
+              search: false,
+            },
+
+            {
+              title: '支付人',
+              render: (record: any) =>
+                `${record?.customer?.name || ''}${
+                  record?.customer?.phone || ''
+                }`,
+
+              search: false,
+            },
+            {
+              title: '备注',
+              dataIndex: 'remark',
+              search: false,
+            },
+            {
+              title: '支付单号',
+              dataIndex: 'payment_no',
+              search: false,
+            },
+            MyColumns.UpdatedAt(),
+          ]}
+        />
+      }
+    />
+  );
+}

src/pages/order/pay/index.tsx

@@ -5,6 +5,10 @@ import {
   usePageTabs,
 } from '@/common';
 import { Apis } from '@/gen/Apis';
+import {
+  HouseOrdersOrderStatusEnum,
+  HouseOrdersPaymentMethodEnum,
+} from '@/gen/Enums';
 import { ProTable } from '@ant-design/pro-components';
 
 export default function Index({ title = '支付明细' }) {
@@ -18,7 +22,7 @@ export default function Index({ title = '支付明细' }) {
     <MyPageContainer
       title={title}
       enableTabs={true}
-      tabKey="house_order_payments"
+      tabKey="house_order"
       tabLabel={title}
     >
       <ProTable
@@ -40,49 +44,55 @@ export default function Index({ title = '支付明细' }) {
         //     importApi={Apis.Bill.HouseBills.Import}
         //     reload={action?.reload}
         //   />,
-        //   <BillCreate key="Create" reload={action?.reload} title={title} />,
         // ]}
         columns={[
           MyColumns.ID(),
           {
-            title: '房屋',
+            title: '支付订单',
-            dataIndex: ['asset_house', 'full_name'],
+            dataIndex: 'house_orders_id',
-            search: {
+            search: false,
-              transform: (value) => {
-                return { full_name: value };
           },
+          MyColumns.EnumTag({
+            title: '支付状态',
+            dataIndex: 'payment_status',
+            valueEnum: HouseOrdersOrderStatusEnum,
+          }),
+          MyColumns.EnumTag({
+            title: '支付方式',
+            dataIndex: 'payment_method',
+            valueEnum: HouseOrdersPaymentMethodEnum,
+          }),
+          {
+            title: '账单金额',
+            dataIndex: 'amount',
+            render: (value: any) => `${value / 100}元`,
+            search: false,
           },
+          {
+            title: '实际金额',
+            dataIndex: 'actual_amount',
+            render: (value: any) => `${value / 100}元`,
+            search: false,
+          },
+
+          {
+            title: '支付人',
+            render: (record: any) =>
+              `${record?.customer?.name || ''}${record?.customer?.phone || ''}`,
+
+            search: false,
+          },
+          {
+            title: '备注',
+            dataIndex: 'remark',
+            search: false,
           },
           {
             title: '支付单号',
             dataIndex: 'payment_no',
             search: false,
           },
-          {
+          MyColumns.UpdatedAt(),
-            title: '交易单号',
-            dataIndex: 'transaction_id',
-            search: false,
-          },
-          {
-            title: '第三方交易号',
-            dataIndex: 'hird_trade_no',
-            search: false,
-          },
-          MyColumns.CreatedAt(),
-          // MyColumns.Option({
-          //   render: (_, item: any, index, action) => (
-          //     <Space key={index}>
-          //       <BillUpdate item={item} reload={action?.reload} title={title} />
-          //       <MyButtons.Delete
-          //         onConfirm={() =>
-          //           Apis.Common.Admins.Delete({ id: item.id }).then(() =>
-          //             action?.reload(),
-          //           )
-          //         }
-          //       />
-          //     </Space>
-          //   ),
-          // }),
         ]}
       />
     </MyPageContainer>