diff --git a/.umirc.ts b/.umirc.ts index 347788d..190286d 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -18,8 +18,8 @@ export default defineConfig({ proxy: { '/api/': { target: 'http://10.39.13.78:8001/', - // target: 'https://gcadmin-test.linyikj.com.cn', - // target: 'http://guocaiservice.com', + // target: 'https://test-admin.linyikj.com.cn/', + // target: 'https://admin.linyikj.com.cn/', changeOrigin: true, pathRewrite: { '^': '' }, }, diff --git a/src/gen/ApiTypes.d.ts b/src/gen/ApiTypes.d.ts index 225271c..4ec876a 100644 --- a/src/gen/ApiTypes.d.ts +++ b/src/gen/ApiTypes.d.ts @@ -342,12 +342,21 @@ declare namespace ApiTypes { "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] "asset_projects_id"?: number; // 资产项目id,[ref:asset_projects] "full_name"?: string; // 模糊搜索:房屋名称 + "project_name"?: string; // 模糊搜索:项目名称 "bill_status"?: string[]; // 账单状态,[enum:HouseBillsBillStatusEnum] + "year"?: number; // 账单年份 + "month"?: number; // 账单月份 + "type"?: string; // 账单类型,[enum:HouseBillsTypeEnum] + "has_refunding"?: boolean; // 是否有退款中:false-无,true-有 }; type SummaryBillList = { - "full_name"?: string; // 模糊搜索:房屋名称 - "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "project_name"?: string; // 模糊搜索:项目名称 "asset_projects_id"?: number; // 资产项目id,[ref:asset_projects] + "asset_buildings_id"?: number; // 资产楼栋id,[ref:asset_buildings] + "asset_units_id"?: number; // 资产单元id,[ref:asset_units] + "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "full_name"?: string; // 模糊搜索:房屋名称 + "has_overdue"?: boolean; // 是否欠费:true-欠费, false-清欠 }; type Store = { "asset_houses_id": number; // 资产房屋id,[ref:asset_houses] @@ -386,6 +395,18 @@ declare namespace ApiTypes { type Delete = { "id": number; // id }; + type Export = { + "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "full_name"?: string; // 模糊搜索:房屋名称 + "bill_status"?: string[]; // 账单状态,[enum:HouseBillsBillStatusEnum] + "asset_projects_id"?: number; // 资产项目id,[ref:asset_projects] + "project_name"?: string; // 模糊搜索:项目名称 + "year"?: number; // 账单年份 + "month"?: number; // 账单月份 + "type"?: string; // 账单类型,[enum:HouseBillsTypeEnum] + "current"?: number; // 页码 + "download_type": string; // 下载类型:page 当前页(含查询条件),query 所有页(含查询条件),all所有记录 + }; } } namespace Collection { @@ -790,6 +811,400 @@ declare namespace ApiTypes { }; } } + namespace HouseOrder { + namespace HouseOrderPayments { + type List = { + "house_orders_id"?: number; // 订单ID + "payment_no"?: string; // 模糊搜索:支付单号 + "transaction_id"?: string; // 模糊搜索:交易号(微信、支付宝的单号 + "third_trade_no"?: string; // 第三方交易号(如通联、乐刷) + "accept_serial_number"?: string; // 模糊搜索:流水号 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseOrderRefunds { + type List = { + "house_orders_id"?: number; // 订单id + "refund_status"?: string; // 退款状态 + "payment_method"?: string; // 支付方式 + "refund_no"?: string; // 退款编号 + "apply_employees_id"?: number; // 申请员工id + "date_range"?: string[]; // 日期范围 [start_date, end_date] + }; + type Store = { + "house_orders_id": number; // 房屋物业费账单id,[ref:house_orders] + "refund_amount": number; // 退款金额(元,前端提交) + "refund_reason"?: string; // 退款原因 + }; + type Update = { + "id": number; // id + "house_orders_id": number; // 房屋物业费账单id,[ref:house_orders] + "refund_amount": number; // 退款金额(元,前端提交) + "refund_reason"?: string; // 退款原因 + }; + type Show = { + "id": number; // id + }; + type Audit = { + "id": number; // 退款记录id + "approved": boolean; // 是否通过审核 + "audit_remark"?: string; // 审核备注 + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseOrders { + type List = { + "id"?: number; // id + "order_code"?: string; // 模糊搜索:订单编号 + "payment_no"?: string; // 支付编号 + "asset_projects_id"?: number; // 项目ID + "full_name"?: string; // 模糊搜索:房屋名称 + "creator"?: string; // 创建人 + "creator_phone"?: string; // 创建人电话 + "audit_status"?: string; // 审核状态,[enum:HouseOrdersAuditStatusEnum] + "auditor"?: string; // 审核人 + "auditor_phone"?: string; // 审核人电话 + "is_serial_number"?: boolean; // 是否有流水号 + "accept_name"?: string; // 收款账户名称 + "accept_bank"?: string; // 收款银行名称 + "accept_account"?: string; // 收款账户 + "accept_serial_number"?: string; // 收款流水号 + "payment_method"?: string; // 支付方式,[enum:HouseOrdersPaymentMethodEnum] + "payment_methods"?: string[]; // 支付方式,[enum:HouseOrdersPaymentMethodEnum] + "paid_time"?: string[]; // 支付时间范围 + }; + type Store = { + "payment_method": string; // 支付方式,[enum:HouseOrdersPaymentMethodEnum] + "total_paid_amount": number; // 支付金额 + "paid_time": Date; // 支付时间 + "accept_name"?: string; // 收款账户名称 + "accept_bank"?: string; // 收款银行名称 + "accept_account"?: string; // 收款账户 + "accept_serial_number"?: string; // 收款流水号 + "fee"?: number; // 手续费 + "bill_ids": string[]; // 账单数组 [{id, amount}] + "remark"?: string; // 备注 + }; + type Update = { + "id": number; // 订单ID + "payment_method": string; // 支付方式,[enum:HouseOrdersPaymentMethodEnum] + "total_paid_amount": number; // 支付金额 + "paid_time": Date; // 支付时间 + "accept_name"?: string; // 收款账户名称 + "accept_bank"?: string; // 收款银行名称 + "accept_account"?: string; // 收款账户 + "accept_serial_number"?: string; // 收款流水号 + "fee"?: number; // 手续费 + "bill_ids": string[]; // 账单数组 [{id, amount}] + "remark"?: string; // 备注 + }; + type Audit = { + "id": number; // id + "audit_status": string; // 状态,[enum:HouseOrdersAuditStatusEnum] + "auditor_remark"?: string; // 审核备注 + "payment_method": string; // 支付方式,[enum:HouseOrdersPaymentMethodEnum] + "paid_time": Date; // 支付时间 + "accept_name"?: string; // 收款账户名称 + "accept_bank"?: string; // 收款银行名称 + "accept_account"?: string; // 收款账户 + "accept_serial_number"?: string; // 收款流水号 + "fee"?: number; // 手续费 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + type Export = { + "id"?: number; // id + "order_code"?: string; // 模糊搜索:名称 + "payment_no"?: string; // 支付编号 + "full_name"?: string; // 模糊搜索:房屋名称 + "creator"?: string; // 创建人 + "creator_phone"?: string; // 创建人电话 + "audit_status"?: string; // 审核状态,[enum:HouseOrdersAuditStatusEnum] + "auditor"?: string; // 审核人 + "auditor_phone"?: string; // 审核人电话 + "is_serial_number"?: boolean; // 是否有流水号 + "current"?: number; // 页码 + "download_type": string; // 下载类型:page 当前页(含查询条件),query 所有页(含查询条件),all所有记录 + }; + type UpdateSerialNumber = { + "id": number; // id + "serial_number": string; // 流水号 + }; + type BatchUpdateSerialNumber = { + "ids": string[]; // 订单ID数组 + "serial_number": string; // 流水号 + }; + type GetPayCode = { + "amount": number; // 金额 + "discount_amount"?: number; // 优惠金额 + "late_fee"?: number; // 滞纳金 + "total_payable_amount": number; // 应付金额 + "bill_ids": string[]; // 账单id + }; + } + namespace HousePrepaymentLogs { + type List = { + "house_prepayments_id"?: number; // 房屋预付缴费id,[ref:house_prepayments] + "asset_houses_id"?: number; // 房屋id,[ref:asset_houses] + "house_prepayment_payments_id"?: number; // 房屋预付缴费支付记录id,[ref:house_prepayment_payments] + "full_name"?: string; // 房屋名称 + }; + type Deduct = { + "asset_houses_id": number; // 房屋id,[ref:asset_houses] + "bills_id": string[]; // 账单id,[ref:house_bills] + "amount": number; // 扣款金额 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HousePrepaymentPayments { + type List = { + "house_prepayments_id"?: number; // 房屋预付id,[ref:house_prepayments] + "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "full_name"?: string; // 模糊搜索:房屋名称 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HousePrepaymentRefunds { + type List = { + "house_prepayments_id"?: number; // 预缴id + "house_prepayment_payments_id"?: number; // 预缴支付id + "refund_status"?: string; // 退款状态 + "payment_method"?: string; // 支付方式 + "refund_no"?: string; // 退款编号 + "apply_employees_id"?: number; // 申请员工id + "date_range"?: string[]; // 日期范围 [start_date, end_date] + }; + type Store = { + "house_prepayment_payments_id": number; // 房屋预缴支付记录id,[ref:house_prepayment_payments] + "refund_amount": number; // 退款金额(元,前端提交) + "refund_reason"?: string; // 退款原因 + }; + type Update = { + "id": number; // id + "house_prepayments_id": number; // 房屋预缴id,[ref:house_prepayments] + "refund_amount": number; // 退款金额(元,前端提交) + "refund_reason"?: string; // 退款原因 + }; + type Show = { + "id": number; // id + }; + type Audit = { + "id": number; // 退款记录id + "approved": boolean; // 是否通过审核 + "audit_remark"?: string; // 审核备注 + }; + type Delete = { + "id": number; // id + }; + } + namespace HousePrepayments { + type List = { + "full_name"?: string; // 模糊搜索:房屋名称 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + } + namespace Meter { + namespace HouseMeterHasHouses { + type List = { + "house_meters_id"?: number; // 房屋仪表id,[ref:house_meters] + "name"?: string; // 模糊搜索:名称 + "full_name"?: string; // 模糊搜索:房屋全称 + }; + type StoreOrUpdate = { + "house_meters_id": number; // 房屋仪表id,[ref:house_meters] + "asset_houses_ids": string[]; // 房屋id,[ref:asset_houses] + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseMeterReadings { + type List = { + "house_meters_id": number; // 仪表id,[ref:house_meters] + "operation_type"?: string; // 操作类型,[enum:HouseMeterReadingsOperationTypeEnum] + }; + type Store = { + "house_meters_id": number; // 仪表id,[ref:house_meters] + "operation_type": string; // 操作类型,[enum:HouseMeterReadingsOperationTypeEnum] + "current_reading": number; // 本次读数 + "reading_time": Date; // 抄表时间 + "company_employees_id": number; // 抄表人id,[ref:company_employees] + "remark"?: string; // 备注 + }; + type Update = { + "id": number; // id + "house_meters_id": number; // 仪表id,[ref:house_meters] + "operation_type": string; // 操作类型,[enum:HouseMeterReadingsOperationTypeEnum] + "previous_reading": number; // 上次读数 + "current_reading": number; // 本次读数 + "usage_amount": number; // 用量 + "loss_amount"?: number; // 损耗 + "reading_time": Date; // 抄表时间 + "company_employees_id": number; // 抄表人id,[ref:company_employees] + "remark"?: string; // 备注 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseMeterTaskDetails { + type List = { + "house_meter_task_id"?: number; // 仪表任务id,[ref:house_meter_tasks] + "house_meters_id"?: number; // 仪表id,[ref:house_meters] + "full_name"?: string; // 房屋全称 + "meter_name"?: string; // 仪表名称 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + type CreateMeterBill = { + "id": number; // 仪表任务明细id + }; + } + namespace HouseMeterTasks { + type List = { + "name"?: string; // 模糊搜索:名称 + }; + type Store = { + "asset_projects_id": number; // 资产项目id,[ref:asset_projects] + "generation_method": string; // 生成方式,[enum:HouseMeterTasksGenerationMethodEnum] + "month": string; // 月份 + "start_date": Date; // 收费开始日期 + "end_date": Date; // 收费截止日期 + "data": string[]; // 任务数据(如果是楼栋则是楼栋ID,如果是单元则是单元ID,如果是仪表则是仪表ID) + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + type ExecuteMeterTasks = { + "id": number; // id + }; + } + namespace HouseMeters { + type List = { + "name"?: string; // 模糊搜索:名称 + "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] + "charge_standards_id"?: number; // 房屋收费标准id,[ref:house_charge_standards] + "name": string; // 名称 + "meter_type": string; // 仪表类型,[enum:HouseMetersMeterTypeEnum] + "usage_type": string; // 使用类型,[enum:HouseMetersUsageTypeEnum] + "multiple"?: number; // 倍率 + "status"?: number; // 是否启用:0:禁用,1:启用 + "initial_value"?: number; // 初始抄表读数 + "initial_time"?: Date; // 初始抄表时间 + "latest_value"?: number; // 最新抄表读数 + "latest_time"?: Date; // 最新抄表时间 + "remark"?: string; // 备注 + }; + type Update = { + "id": number; // id + "asset_projects_id": number; // 项目id,[ref:asset_projects] + "charge_standards_id"?: number; // 房屋收费标准id,[ref:house_charge_standards] + "name": string; // 名称 + "meter_type": string; // 仪表类型,[enum:HouseMetersMeterTypeEnum] + "usage_type": string; // 使用类型,[enum:HouseMetersUsageTypeEnum] + "multiple"?: number; // 倍率 + "status"?: number; // 是否启用:0:禁用,1:启用 + "initial_value"?: number; // 初始抄表读数 + "initial_time"?: Date; // 初始抄表时间 + "latest_value"?: number; // 最新抄表读数 + "latest_time"?: Date; // 最新抄表时间 + "remark"?: string; // 备注 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + } + namespace Msg { + namespace MsgPropertyAnnouncements { + type List = { + "title"?: string; // 模糊搜索:标题 + "asset_projects_id"?: number; // 项目id,[ref:asset_projects] + "project_name"?: string; // 模糊搜索:项目名称 + "is_publish"?: number; // 是否发布 + }; + type Store = { + "asset_projects_id": number; // 项目id,[ref:asset_projects] + "title": string; // 标题 + "content": string; // 内容 + "publish_type": string; // 发布类型,[MsgPropertyAnnouncementsPublishTypeEnum] + "schedule_publish_at"?: Date; // 计划发布时间 + "is_publish"?: boolean; // 是否发布 + "publish_at"?: Date; // 发布时间 + "sort"?: number; // 排序 + }; + type Update = { + "id": number; // id + "asset_projects_id": number; // 项目id,[ref:asset_projects] + "title": string; // 标题 + "content": string; // 内容 + "publish_type": string; // 发布类型,[MsgPropertyAnnouncementsPublishTypeEnum] + "schedule_publish_at"?: Date; // 计划发布时间 + "is_publish"?: boolean; // 是否发布 + "publish_at"?: Date; // 发布时间 + "sort"?: number; // 排序 + }; + type Show = { + "id": number; // id + }; + type IsPublish = { + "id": number; // id + "is_publish": boolean; // 是否发布 + }; + type Delete = { + "id": number; // id + }; + } + } namespace Permission { namespace Roles { type List = { @@ -814,4 +1229,88 @@ declare namespace ApiTypes { }; } } + namespace WorkOrder { + namespace HouseWorkLogs { + type List = { + "house_work_orders_id": number; // 工单id,[ref:house_work_orders] + }; + type Store = { + "house_work_orders_id": number; // 工单id,[ref:house_work_orders] + "status": string; // 工单状态,[enum:HouseWorkOrdersStatusEnum] + "description"?: string; // 进度描述 + "attachments"?: string[]; // 附件 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseWorkOrderPayments { + type List = { + "house_work_orders_id"?: number; // 工单id + "name"?: string; // 模糊搜索:名称 + }; + type Show = { + "id": number; // id + }; + type Delete = { + "id": number; // id + }; + } + namespace HouseWorkOrders { + type List = { + "house_name"?: string; // 模糊搜索:房屋名称 + "type"?: string[]; // 工单类型,[enum:HouseWorkOrdersTypeEnum] + "level"?: string; // 工单优先级,[enum:HouseWorkOrdersLevelEnum] + "status"?: string; // 工单状态,[enum:HouseWorkOrdersStatusEnum] + "assign_status"?: string; // 工单分配状态,[enum:HouseWorkOrdersAssignStatusEnum] + "reporter_name"?: string; // 模糊搜索:上报人姓名 + "reporter_phone"?: string; // 模糊搜索:上报人手机 + }; + type Store = { + "type": string; // 工单类型,[enum:HouseWorkOrdersTypeEnum] + "level"?: string; // 优先级,[enum:HouseWorkOrdersLevelEnum] + "complaint_type"?: string; // 投诉类型[enum:HouseWorkOrdersComplaintTypeEnum] + "location"?: string; // 报修位置[enum:HouseWorkOrdersLocationEnum] + "content": string; // 工单内容 + "reporter_name"?: string; // 上报人名称 + "reporter_phone"?: string; // 上报人手机 + "attachments"?: string[]; // 工单附件 + "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "asset_projects_id"?: number; // 资产项目id,[ref:asset_projects] + }; + type Update = { + "id": number; // id + "type": string; // 工单类型,[enum:HouseWorkOrdersTypeEnum] + "level"?: string; // 优先级,[enum:HouseWorkOrdersLevelEnum] + "content": string; // 工单内容 + "reporter_name"?: string; // 上报人名称 + "reporter_phone"?: string; // 上报人手机 + "contact_phone"?: string; // 联系人电话 + "attachments"?: string[]; // 工单附件 + "asset_houses_id"?: number; // 资产房屋id,[ref:asset_houses] + "asset_projects_id"?: number; // 资产项目id,[ref:asset_projects] + }; + type Show = { + "id": number; // id + }; + type Assign = { + "id": number; // id + "assign_employees_id": number; // 处理人id,[ref:company_employees] + "assign_remark"?: string; // 分派说明 + "predict_complete_at"?: Date; // 预计完成时间 + "level"?: string; // 优先级,[enum:HouseWorkOrdersLevelEnum] + }; + type Visited = { + "id": number; // id + "visited_remark"?: string; // 访问说明 + "visited_attachment"?: string[]; // 访问附件 + }; + type Delete = { + "id": number; // id + }; + } + } } diff --git a/src/gen/Apis.ts b/src/gen/Apis.ts index a22692e..64b2c9d 100644 --- a/src/gen/Apis.ts +++ b/src/gen/Apis.ts @@ -176,6 +176,9 @@ export const Apis = { Delete(data: ApiTypes.Bill.HouseBills.Delete): Promise { return request('company/bill/house_bills/delete', { data }); }, + Export(data: ApiTypes.Bill.HouseBills.Export): Promise { + return request('company/bill/house_bills/export', { responseType: 'blob',data }); + }, }, }, Collection: { @@ -447,6 +450,230 @@ export const Apis = { }, }, }, + HouseOrder: { + HouseOrderPayments: { + List(data?: ApiTypes.HouseOrder.HouseOrderPayments.List): Promise { + return request('company/house_order/house_order_payments/list', { data }); + }, + Show(data: ApiTypes.HouseOrder.HouseOrderPayments.Show): Promise { + return request('company/house_order/house_order_payments/show', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HouseOrderPayments.Delete): Promise { + return request('company/house_order/house_order_payments/delete', { data }); + }, + }, + HouseOrderRefunds: { + List(data?: ApiTypes.HouseOrder.HouseOrderRefunds.List): Promise { + return request('company/house_order/house_order_refunds/list', { data }); + }, + Store(data: ApiTypes.HouseOrder.HouseOrderRefunds.Store): Promise { + return request('company/house_order/house_order_refunds/store', { data }); + }, + Update(data: ApiTypes.HouseOrder.HouseOrderRefunds.Update): Promise { + return request('company/house_order/house_order_refunds/update', { data }); + }, + Show(data: ApiTypes.HouseOrder.HouseOrderRefunds.Show): Promise { + return request('company/house_order/house_order_refunds/show', { data }); + }, + Audit(data: ApiTypes.HouseOrder.HouseOrderRefunds.Audit): Promise { + return request('company/house_order/house_order_refunds/audit', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HouseOrderRefunds.Delete): Promise { + return request('company/house_order/house_order_refunds/delete', { data }); + }, + }, + HouseOrders: { + List(data?: ApiTypes.HouseOrder.HouseOrders.List): Promise { + return request('company/house_order/house_orders/list', { data }); + }, + Store(data: ApiTypes.HouseOrder.HouseOrders.Store): Promise { + return request('company/house_order/house_orders/store', { data }); + }, + Update(data: ApiTypes.HouseOrder.HouseOrders.Update): Promise { + return request('company/house_order/house_orders/update', { data }); + }, + Audit(data: ApiTypes.HouseOrder.HouseOrders.Audit): Promise { + return request('company/house_order/house_orders/audit', { data }); + }, + Show(data: ApiTypes.HouseOrder.HouseOrders.Show): Promise { + return request('company/house_order/house_orders/show', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HouseOrders.Delete): Promise { + return request('company/house_order/house_orders/delete', { data }); + }, + Export(data: ApiTypes.HouseOrder.HouseOrders.Export): Promise { + return request('company/house_order/house_orders/export', { responseType: 'blob',data }); + }, + UpdateSerialNumber(data: ApiTypes.HouseOrder.HouseOrders.UpdateSerialNumber): Promise { + return request('company/house_order/house_orders/update_serial_number', { data }); + }, + BatchUpdateSerialNumber(data: ApiTypes.HouseOrder.HouseOrders.BatchUpdateSerialNumber): Promise { + return request('company/house_order/house_orders/batch_update_serial_number', { data }); + }, + GetPayCode(data: ApiTypes.HouseOrder.HouseOrders.GetPayCode): Promise { + return request('company/house_order/house_orders/get_pay_code', { data }); + }, + }, + HousePrepaymentLogs: { + List(data?: ApiTypes.HouseOrder.HousePrepaymentLogs.List): Promise { + return request('company/house_order/house_prepayment_logs/list', { data }); + }, + Deduct(data: ApiTypes.HouseOrder.HousePrepaymentLogs.Deduct): Promise { + return request('company/house_order/house_prepayment_logs/deduct', { data }); + }, + Show(data: ApiTypes.HouseOrder.HousePrepaymentLogs.Show): Promise { + return request('company/house_order/house_prepayment_logs/show', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HousePrepaymentLogs.Delete): Promise { + return request('company/house_order/house_prepayment_logs/delete', { data }); + }, + }, + HousePrepaymentPayments: { + List(data?: ApiTypes.HouseOrder.HousePrepaymentPayments.List): Promise { + return request('company/house_order/house_prepayment_payments/list', { data }); + }, + Show(data: ApiTypes.HouseOrder.HousePrepaymentPayments.Show): Promise { + return request('company/house_order/house_prepayment_payments/show', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HousePrepaymentPayments.Delete): Promise { + return request('company/house_order/house_prepayment_payments/delete', { data }); + }, + }, + HousePrepaymentRefunds: { + List(data?: ApiTypes.HouseOrder.HousePrepaymentRefunds.List): Promise { + return request('company/house_order/house_prepayment_refunds/list', { data }); + }, + Store(data: ApiTypes.HouseOrder.HousePrepaymentRefunds.Store): Promise { + return request('company/house_order/house_prepayment_refunds/store', { data }); + }, + Update(data: ApiTypes.HouseOrder.HousePrepaymentRefunds.Update): Promise { + return request('company/house_order/house_prepayment_refunds/update', { data }); + }, + Show(data: ApiTypes.HouseOrder.HousePrepaymentRefunds.Show): Promise { + return request('company/house_order/house_prepayment_refunds/show', { data }); + }, + Audit(data: ApiTypes.HouseOrder.HousePrepaymentRefunds.Audit): Promise { + return request('company/house_order/house_prepayment_refunds/audit', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HousePrepaymentRefunds.Delete): Promise { + return request('company/house_order/house_prepayment_refunds/delete', { data }); + }, + }, + HousePrepayments: { + List(data?: ApiTypes.HouseOrder.HousePrepayments.List): Promise { + return request('company/house_order/house_prepayments/list', { data }); + }, + Show(data: ApiTypes.HouseOrder.HousePrepayments.Show): Promise { + return request('company/house_order/house_prepayments/show', { data }); + }, + Delete(data: ApiTypes.HouseOrder.HousePrepayments.Delete): Promise { + return request('company/house_order/house_prepayments/delete', { data }); + }, + }, + }, + Meter: { + HouseMeterHasHouses: { + List(data?: ApiTypes.Meter.HouseMeterHasHouses.List): Promise { + return request('company/meter/house_meter_has_houses/list', { data }); + }, + StoreOrUpdate(data: ApiTypes.Meter.HouseMeterHasHouses.StoreOrUpdate): Promise { + return request('company/meter/house_meter_has_houses/store_or_update', { data }); + }, + Show(data: ApiTypes.Meter.HouseMeterHasHouses.Show): Promise { + return request('company/meter/house_meter_has_houses/show', { data }); + }, + Delete(data: ApiTypes.Meter.HouseMeterHasHouses.Delete): Promise { + return request('company/meter/house_meter_has_houses/delete', { data }); + }, + }, + HouseMeterReadings: { + List(data: ApiTypes.Meter.HouseMeterReadings.List): Promise { + return request('company/meter/house_meter_readings/list', { data }); + }, + Store(data: ApiTypes.Meter.HouseMeterReadings.Store): Promise { + return request('company/meter/house_meter_readings/store', { data }); + }, + Update(data: ApiTypes.Meter.HouseMeterReadings.Update): Promise { + return request('company/meter/house_meter_readings/update', { data }); + }, + Show(data: ApiTypes.Meter.HouseMeterReadings.Show): Promise { + return request('company/meter/house_meter_readings/show', { data }); + }, + Delete(data: ApiTypes.Meter.HouseMeterReadings.Delete): Promise { + return request('company/meter/house_meter_readings/delete', { data }); + }, + }, + HouseMeterTaskDetails: { + List(data?: ApiTypes.Meter.HouseMeterTaskDetails.List): Promise { + return request('company/meter/house_meter_task_details/list', { data }); + }, + Show(data: ApiTypes.Meter.HouseMeterTaskDetails.Show): Promise { + return request('company/meter/house_meter_task_details/show', { data }); + }, + Delete(data: ApiTypes.Meter.HouseMeterTaskDetails.Delete): Promise { + return request('company/meter/house_meter_task_details/delete', { data }); + }, + CreateMeterBill(data: ApiTypes.Meter.HouseMeterTaskDetails.CreateMeterBill): Promise { + return request('company/meter/house_meter_task_details/create_meter_bill', { data }); + }, + }, + HouseMeterTasks: { + List(data?: ApiTypes.Meter.HouseMeterTasks.List): Promise { + return request('company/meter/house_meter_tasks/list', { data }); + }, + Store(data: ApiTypes.Meter.HouseMeterTasks.Store): Promise { + return request('company/meter/house_meter_tasks/store', { data }); + }, + Show(data: ApiTypes.Meter.HouseMeterTasks.Show): Promise { + return request('company/meter/house_meter_tasks/show', { data }); + }, + Delete(data: ApiTypes.Meter.HouseMeterTasks.Delete): Promise { + return request('company/meter/house_meter_tasks/delete', { data }); + }, + ExecuteMeterTasks(data: ApiTypes.Meter.HouseMeterTasks.ExecuteMeterTasks): Promise { + return request('company/meter/house_meter_tasks/execute_meter_tasks', { data }); + }, + }, + HouseMeters: { + List(data?: ApiTypes.Meter.HouseMeters.List): Promise { + return request('company/meter/house_meters/list', { data }); + }, + Store(data: ApiTypes.Meter.HouseMeters.Store): Promise { + return request('company/meter/house_meters/store', { data }); + }, + Update(data: ApiTypes.Meter.HouseMeters.Update): Promise { + return request('company/meter/house_meters/update', { data }); + }, + Show(data: ApiTypes.Meter.HouseMeters.Show): Promise { + return request('company/meter/house_meters/show', { data }); + }, + Delete(data: ApiTypes.Meter.HouseMeters.Delete): Promise { + return request('company/meter/house_meters/delete', { data }); + }, + }, + }, + Msg: { + MsgPropertyAnnouncements: { + List(data?: ApiTypes.Msg.MsgPropertyAnnouncements.List): Promise { + return request('company/msg/msg_property_announcements/list', { data }); + }, + Store(data: ApiTypes.Msg.MsgPropertyAnnouncements.Store): Promise { + return request('company/msg/msg_property_announcements/store', { data }); + }, + Update(data: ApiTypes.Msg.MsgPropertyAnnouncements.Update): Promise { + return request('company/msg/msg_property_announcements/update', { data }); + }, + Show(data: ApiTypes.Msg.MsgPropertyAnnouncements.Show): Promise { + return request('company/msg/msg_property_announcements/show', { data }); + }, + IsPublish(data: ApiTypes.Msg.MsgPropertyAnnouncements.IsPublish): Promise { + return request('company/msg/msg_property_announcements/is_publish', { data }); + }, + Delete(data: ApiTypes.Msg.MsgPropertyAnnouncements.Delete): Promise { + return request('company/msg/msg_property_announcements/delete', { data }); + }, + }, + }, Permission: { Roles: { List(data?: ApiTypes.Permission.Roles.List): Promise { @@ -475,4 +702,54 @@ export const Apis = { }, }, }, + WorkOrder: { + HouseWorkLogs: { + List(data: ApiTypes.WorkOrder.HouseWorkLogs.List): Promise { + return request('company/work_order/house_work_logs/list', { data }); + }, + Store(data: ApiTypes.WorkOrder.HouseWorkLogs.Store): Promise { + return request('company/work_order/house_work_logs/store', { data }); + }, + Show(data: ApiTypes.WorkOrder.HouseWorkLogs.Show): Promise { + return request('company/work_order/house_work_logs/show', { data }); + }, + Delete(data: ApiTypes.WorkOrder.HouseWorkLogs.Delete): Promise { + return request('company/work_order/house_work_logs/delete', { data }); + }, + }, + HouseWorkOrderPayments: { + List(data?: ApiTypes.WorkOrder.HouseWorkOrderPayments.List): Promise { + return request('company/work_order/house_work_order_payments/list', { data }); + }, + Show(data: ApiTypes.WorkOrder.HouseWorkOrderPayments.Show): Promise { + return request('company/work_order/house_work_order_payments/show', { data }); + }, + Delete(data: ApiTypes.WorkOrder.HouseWorkOrderPayments.Delete): Promise { + return request('company/work_order/house_work_order_payments/delete', { data }); + }, + }, + HouseWorkOrders: { + List(data?: ApiTypes.WorkOrder.HouseWorkOrders.List): Promise { + return request('company/work_order/house_work_orders/list', { data }); + }, + Store(data: ApiTypes.WorkOrder.HouseWorkOrders.Store): Promise { + return request('company/work_order/house_work_orders/store', { data }); + }, + Update(data: ApiTypes.WorkOrder.HouseWorkOrders.Update): Promise { + return request('company/work_order/house_work_orders/update', { data }); + }, + Show(data: ApiTypes.WorkOrder.HouseWorkOrders.Show): Promise { + return request('company/work_order/house_work_orders/show', { data }); + }, + Assign(data: ApiTypes.WorkOrder.HouseWorkOrders.Assign): Promise { + return request('company/work_order/house_work_orders/assign', { data }); + }, + Visited(data: ApiTypes.WorkOrder.HouseWorkOrders.Visited): Promise { + return request('company/work_order/house_work_orders/visited', { data }); + }, + Delete(data: ApiTypes.WorkOrder.HouseWorkOrders.Delete): Promise { + return request('company/work_order/house_work_orders/delete', { data }); + }, + }, + }, } \ No newline at end of file diff --git a/src/gen/Enums.ts b/src/gen/Enums.ts index 40d72b1..6c240c6 100644 --- a/src/gen/Enums.ts +++ b/src/gen/Enums.ts @@ -39,6 +39,7 @@ export const ApprovalRecordsStatusEnum = { Pending: { text: '待审批', color: '#ff9800', value: 'Pending' }, Approved: { text: '同意', color: '#4caf50', value: 'Approved' }, Rejected: { text: '拒绝', color: '#f44336', value: 'Rejected' }, + Transferred: { text: '转交', color: '#9c27b0', value: 'Transferred' }, }; // ApprovalTemplateNodesApproveTypeEnum @@ -559,7 +560,7 @@ export const BillsStatusEnum = { export const CacheTypeEnum = { MobilePhoneVerificationCode: { text: '手机验证码', - color: '#bf79b1', + color: '#4ef9dd', value: 'MobilePhoneVerificationCode', }, }; @@ -1014,6 +1015,7 @@ export const HouseBillsTypeEnum = { color: '#ec4899', value: 'SharedElectricityFee', }, + CarPortFee: { text: '车位费', color: '#f59e0b', value: 'CarPortFee' }, }; // HouseChargeStandardsApportionmentMethodEnum @@ -1080,6 +1082,7 @@ export const HouseChargeStandardsStatusEnum = { export const HouseChargeStandardsTypeEnum = { House: { text: '房屋', color: '#3b82f6', value: 'House' }, Meter: { text: '仪表', color: '#10b981', value: 'Meter' }, + CarPort: { text: '车位', color: '#f59e0b', value: 'CarPort' }, }; // HouseChargeTaskDetailsStatusEnum @@ -1089,6 +1092,12 @@ export const HouseChargeTaskDetailsStatusEnum = { Failed: { text: '失败', color: '#ef4444', value: 'Failed' }, }; +// HouseChargeTaskDetailsTargetTypeEnum +export const HouseChargeTaskDetailsTargetTypeEnum = { + House: { text: '房屋', color: '#3b82f6', value: 'House' }, + CarPort: { text: '车位', color: '#f59e0b', value: 'CarPort' }, +}; + // HouseChargeTasksStatusEnum export const HouseChargeTasksStatusEnum = { Pending: { text: '待执行', color: '#f59e0b', value: 'Pending' }, diff --git a/src/pages/asset/asset_list/modals/AssetInfo.tsx b/src/pages/asset/asset_list/modals/AssetInfo.tsx index e4ea359..b704f91 100644 --- a/src/pages/asset/asset_list/modals/AssetInfo.tsx +++ b/src/pages/asset/asset_list/modals/AssetInfo.tsx @@ -10,29 +10,29 @@ import { } from '@/gen/Enums'; import { ProCard, ProDescriptions } from '@ant-design/pro-components'; import { Space, Spin } from 'antd'; -import { useEffect, useState } from 'react'; +import { useState } from 'react'; export default function AssetInfo(props: MyBetaModalFormProps) { const [loading, setLoading] = useState(true); const [data, setData] = useState({}); - useEffect(() => { - if (props?.item?.id) { - setLoading(true); - Apis.Asset.AssetProjects.Show({ id: props.item.id }) - .then((res) => { - setData(res?.data || {}); - }) - .finally(() => { - setLoading(false); - }); - } - }, [props?.item?.id]); return ( { + if (props?.item?.id) { + setLoading(true); + Apis.Asset.AssetProjects.Show({ id: props.item.id }) + .then((res) => { + setData(res?.data || {}); + }) + .finally(() => { + setLoading(false); + }); + } + }} node={ diff --git a/src/pages/bills/summary/index.tsx b/src/pages/bills/summary/index.tsx index be2a166..389f346 100644 --- a/src/pages/bills/summary/index.tsx +++ b/src/pages/bills/summary/index.tsx @@ -26,28 +26,6 @@ export default function Index({ title = '房屋账单' }) { getSummaryBillList({ page: 1 }); }, []); - // 选择楼栋的回调函数 - // const handleBuildingSelect = useCallback((building: SelectedBuilding) => { - // setSelectedBuilding(building); - // // 保存到本地缓存 - // localStorage.setItem('selectedBuilding', JSON.stringify(building)); - // }, []); - - // 从本地缓存恢复选中的楼栋信息 - // useEffect(() => { - // const cachedBuilding = localStorage.getItem('selectedBuilding'); - // if (cachedBuilding) { - // try { - // const building = JSON.parse(cachedBuilding) as SelectedBuilding; - // setSelectedBuilding(building); - // // 恢复后重新获取账单列表 - // getSummaryBillList(building); - // } catch (error) { - // console.error('Failed to parse cached building:', error); - // } - // } - // }, []); - return (